diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java index d70cf5f..1eb49fa 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java @@ -98,7 +98,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS @Override public AjaxResult sel8WnDu(String modelId) { - List dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), modelId, sdf.format(new Date())); + List dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), modelId, sdf3.format(new Date())); return AjaxResult.success(dataResList); } @@ -174,7 +174,7 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS for (PsdcThermometerHtdata scr1 : tempList) { Double evIn = scr1.getThermometerValue() / count; listTemp.add(Double.parseDouble(df.format(evIn))); - times.add(scr1.getUpdateTime()); + times.add(scr1.getUpdateTime().split(" ")[1].substring(0,5)); } houseTemp = houseTemp / count; return houseTemp;