瀏覽代碼

修改统计量

wangyangyang 4 年之前
父節點
當前提交
32fed854a5

+ 2 - 2
sms_water/src/main/java/com/huaxu/controller/MonitorInfoController.java

@@ -64,8 +64,8 @@ public class MonitorInfoController {
             return  null;
         devices.addAll(deviceService.selectList(deviceDto));
         //取前一个小时的时间
-        //LocalDateTime dateTime = LocalDateTime.now().plusDays(-1);
-        LocalDateTime dateTime = LocalDateTime.now();
+        LocalDateTime dateTime = LocalDateTime.now().plusDays(-1);
+        //LocalDateTime dateTime = LocalDateTime.now();
         for (DeviceDto item : devices) {
             //设备的几个参数值
             SceneDeviceAttributeDto sceneDeviceAttributeDto = new SceneDeviceAttributeDto();

+ 1 - 1
sms_water/src/main/resources/mapper/MonitorInfoMapper.xml

@@ -102,7 +102,7 @@
         FROM sms_device_parm a
         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID
         INNER JOIN sms_day_report c on a.ATTRIBUTE_ID=c.ATTRIBUTE_ID and a.DEVICE_ID=c.DEVICE_ID
-        INNER JOIN (select b.PARM_TYPE,min(d.collect_date) collect_date
+        INNER JOIN (select b.PARM_TYPE,max(d.collect_date) collect_date
         from sms_day_report d
         INNER JOIN sms_device_parm b on d.ATTRIBUTE_ID=b.ID
         where d.DEVICE_ID = #{report.deviceId}