修改今日累计流量

sms_water/src/main/java/com/huaxu/service/impl/OnlineMonitorImpl.java

@@ -96,8 +96,6 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                     Double d2= monitorDataCollectDto.getSceneTypeName().equals("水源")?(o2.getIntakeWaterUsage()==null?0d:o2.getIntakeWaterUsage()):(o2.getYieldWaterUsage()==null?0d:o2.getYieldWaterUsage());
                     if(d1>d2){
                         return -1;
-                    }else if(d1.equals(d1)) {
-                        return 0;
                     }
                     return 0;
                 }
@@ -251,6 +249,19 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
 
         List<MonitorDataCollectDto> result=onlineMonitorMapper.statsDeviceParm(onlineDataDto);
         GetCalMonitorData(result,result);
+        //去掉没有数据的值
+        result.removeIf(r->r.getYieldWaterUsage() == null);
+        //按水量倒序排序
+        result.sort(new Comparator<MonitorDataCollectDto>() {
+            @Override
+            public int compare(MonitorDataCollectDto o1, MonitorDataCollectDto o2) {
+                if(o1.getYieldWaterUsage()!=null&&o2.getYieldWaterUsage()!=null&&
+                        o1.getYieldWaterUsage()>o2.getYieldWaterUsage()){
+                    return -1;
+                }
+                return 0;
+            }
+        });
         return result;
     }
     /**

sms_water/src/main/resources/mapper/OnlineMonitorMapper.xml

@@ -207,7 +207,7 @@
     <!--查询地图参数数据-->
     <select id="selectMapParam" resultMap="monitorDataMap">
         select
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>,if (t7.alarm_count>0, 1, 0) scene_state
         from sms_scene t1
         <include refid="sceneDeviceJoins"/>
         <include refid="sceneAlarmJoins"/>