|
|
|
@ -122,6 +122,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS |
|
|
|
|
List<PsdcThermometerDataRes> dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), 16); |
|
|
|
|
for (PsdcThermometerDataRes dec : dataResList ){ |
|
|
|
|
PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(dec.getDeviceId(), sdf.format(date)); |
|
|
|
|
if (null != dataRes){ |
|
|
|
|
List<PsdcThermometerHtdata> htdata = psdcThermometerHtdataMapper.selTodayThermometer(dec.getDeviceId(), tb, te); |
|
|
|
|
|
|
|
|
|
List<Double> listTemp = new ArrayList(); // 今天历史温度集合
|
|
|
|
@ -145,6 +146,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS |
|
|
|
|
map3.put("times", times); |
|
|
|
|
ary.add(map3); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ary; |
|
|
|
|