二供排行修改

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

@@ -517,18 +517,23 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
             for (SecDataCollectDto value : map.values()) {
                 secDataCollectDtos.add(value);
             }
+
             //按水量倒序排序 如果是水源按照取水量排序，其他按照供水量
-            secDataCollectDtos.sort(new Comparator<SecDataCollectDto>() {
-                @Override
-                public int compare(SecDataCollectDto o1, SecDataCollectDto o2) {
-                    Double d1= monitorDataCollectDto.getSceneTypeName().equals("水源")?(o1.getYieldWaterUsage()==null?0d:o1.getYieldWaterUsage()):(o1.getYieldWaterUsage()==null?0d:o1.getYieldWaterUsage());
-                    Double d2= monitorDataCollectDto.getSceneTypeName().equals("水源")?(o2.getYieldWaterUsage()==null?0d:o2.getYieldWaterUsage()):(o2.getYieldWaterUsage()==null?0d:o2.getYieldWaterUsage());
-                    if(d1>d2){
-                        return -1;
-                    }
-                    return 0;
-                }
-            });
+
+            secDataCollectDtos.sort(Comparator.comparing(SecDataCollectDto::getYieldWaterUsage,Comparator.nullsFirst(Double::compareTo)).reversed());
+
+//            //按水量倒序排序 如果是水源按照取水量排序，其他按照供水量
+//            secDataCollectDtos.sort(new Comparator<SecDataCollectDto>() {
+//                @Override
+//                public int compare(SecDataCollectDto o1, SecDataCollectDto o2) {
+//                    Double d1= monitorDataCollectDto.getSceneTypeName().equals("水源")?(o1.getYieldWaterUsage()==null?0d:o1.getYieldWaterUsage()):(o1.getYieldWaterUsage()==null?0d:o1.getYieldWaterUsage());
+//                    Double d2= monitorDataCollectDto.getSceneTypeName().equals("水源")?(o2.getYieldWaterUsage()==null?0d:o2.getYieldWaterUsage()):(o2.getYieldWaterUsage()==null?0d:o2.getYieldWaterUsage());
+//                    if(d1>d2){
+//                        return -1;
+//                    }
+//                    return 0;
+//                }
+//            });
         }
         return secDataCollectDtos;
     }