hwj_system
/
scmy
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

111

Browse Source
master
林颖晨 2 years ago
parent 107b29f3eb
commit 9b51b10d6e
1 changed files with 16 additions and 16 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 32
      psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java

32
psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java
Unescape View File

@ -25,17 +25,17 @@ import java.util.*;
public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataService { public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataService {
@Resource @Resource
PsdcThermometerRtdataMapper mapper1; PsdcThermometerRtdataMapper psdcThermometerRtdataMapper;
@Resource @Resource
PsdcThermometerHtdataMapper mapper2; PsdcThermometerHtdataMapper psdcThermometerHtdataMapper;
@Resource @Resource
PsdcElectricHtdataMapper mapper3; PsdcElectricHtdataMapper psdcElectricHtdataMapper;
@Resource @Resource
PsdcDeviceMapper mapper4; PsdcDeviceMapper psdcDeviceMapper;
@Resource @Resource
PsdcDevicePowerHdata96Mapper mapper5; PsdcDevicePowerHdata96Mapper psdcDevicePowerHdata96Mapper;
@Resource @Resource
PsdcElectricRtdataMapper mapper6; PsdcElectricRtdataMapper psdcElectricRtdataMapper;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyyMMdd");
@ -44,18 +44,18 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
public AjaxResult selTodayThermometer() { public AjaxResult selTodayThermometer() {
long userId = SecurityUtils.getUserId(); long userId = SecurityUtils.getUserId();
List<Integer> devList = mapper4.selMyWorkDevices(2, userId); List<Integer> devList = psdcDeviceMapper.selMyWorkDevices(2, userId);
Date date = new Date(); Date date = new Date();
List<PsdcThermometerDataRes> ary = new ArrayList(); List<PsdcThermometerDataRes> ary = new ArrayList();
for (Integer d : devList) { for (Integer d : devList) {
PsdcThermometerDataRes dataRes = mapper1.queryById(d); PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(d);
List<Double> listIn = mapper2.selTodayThermometer("thermometer_value_in", d, sdf.format(date)); List<Double> listIn = psdcThermometerHtdataMapper.selTodayThermometer("thermometer_value_in", d, sdf.format(date));
List<Double> listOut = mapper2.selTodayThermometer("thermometer_value_out", d, sdf.format(date)); List<Double> listOut = psdcThermometerHtdataMapper.selTodayThermometer("thermometer_value_out", d, sdf.format(date));
List<Double> listTemp = mapper2.selTodayThermometer("thermometer_value", d, sdf.format(date)); List<Double> listTemp = psdcThermometerHtdataMapper.selTodayThermometer("thermometer_value", d, sdf.format(date));
List<String> times = mapper2.selTodayThermometer2(d, sdf.format(date)); List<String> times = psdcThermometerHtdataMapper.selTodayThermometer2(d, sdf.format(date));
Double useEnergy = mapper3.selTodayUseEnergy(d, sdf.format(date)); Double useEnergy = psdcElectricHtdataMapper.selTodayUseEnergy(d, sdf.format(date));
dataRes.setTimeList(times); dataRes.setTimeList(times);
dataRes.setTempTodayList(listTemp); dataRes.setTempTodayList(listTemp);
dataRes.setTempInTodayList(listIn); dataRes.setTempInTodayList(listIn);
@ -70,15 +70,15 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
@Override @Override
public AjaxResult sel8WnDu() { public AjaxResult sel8WnDu() {
List<PsdcThermometerDataRes> dataResList = mapper1.selWenDu(1); List<PsdcThermometerDataRes> dataResList = psdcThermometerRtdataMapper.selWenDu(1);
return AjaxResult.success(dataResList); return AjaxResult.success(dataResList);
} }
@Override @Override
public AjaxResult selTotalElectricityInfo() { public AjaxResult selTotalElectricityInfo() {
long userId = SecurityUtils.getUserId(); long userId = SecurityUtils.getUserId();
PsdcDevicePowerHdata96 hdata96 = mapper5.queryById(userId, 13, sdf2.format(new Date())); PsdcDevicePowerHdata96 hdata96 = psdcDevicePowerHdata96Mapper.queryById(userId, 13, sdf2.format(new Date()));
PsdcDevicePowerRes rtdata = mapper6.queryById(13); PsdcDevicePowerRes rtdata = psdcElectricRtdataMapper.queryById(13);
rtdata.setTodayUsePowers(hdata96); rtdata.setTodayUsePowers(hdata96);
return AjaxResult.success(rtdata); return AjaxResult.success(rtdata);
} }

Write Preview
Loading…
Cancel
Save