相机树开发

business-service/src/main/java/com/ozs/service/entity/vo/UpdateDeviceSn.java

@@ -9,7 +9,7 @@ import lombok.Data;
  */
 @Data
 public class UpdateDeviceSn {
-    private String Name;
+    private String name;
     private Integer type;
     private String md5;
     private String url;
@@ -18,10 +18,10 @@ public class UpdateDeviceSn {
 
     @JsonProperty("Name")
     public String getName() {
-        return Name;
+        return name;
     }
 
     public void setName(String name) {
-        Name = name;
+        this.name = name;
     }
 }

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraManagementServiceImpl.java

@@ -373,6 +373,9 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             int pu = list.size() - count;
             map.put("highCount", count);
             map.put("puCount", pu);
+        }else {
+            map.put("highCount", 0);
+            map.put("puCount", 0);
         }
         if (!ObjectUtils.isEmpty(alarmList)) {
             //获取所有异常的相机
@@ -390,6 +393,9 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             int puUnresolvedCount = alarmList.size() - unresolvedCount;
             map.put("highStateCount", unresolvedCount);
             map.put("puStateCount", puUnresolvedCount);
+        }else {
+            map.put("highStateCount", 0);
+            map.put("puStateCount", 0);
         }
         return AjaxResult.success(map);
     }

business-service/src/main/java/com/ozs/service/service/impl/BaseDeviceDynamicManagementServiceImpl.java

@@ -55,15 +55,19 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 }
 
                 // 线路
-                CameraTree build = CameraTree.builder()
+                CameraTree.CameraTreeBuilder builder  = CameraTree.builder()
                         .code(o.getRailwayCode())
                         .name(o.getLineNumber()+o.getRailwayName())
                         .railwayName(o.getRailwayName())
                         .number(Integer.valueOf(o.getLineNumber()))
                         .flay(true)
                         .publicWorksSection(o.getPublicWorksSection())
-                        .children(new ArrayList<>())
-                        .build();
+                        .children(new ArrayList<>());
+                if (o.getLineNumber() != null && !o.getLineNumber().isEmpty()) {
+                    builder.number(Integer.valueOf(o.getLineNumber()));
+                }
+
+                CameraTree build = builder.build();
                 if (!cameraTree.getChildren().stream()
                         .map(CameraTree::getCode)
                         .collect(Collectors.toList())

business-service/src/main/java/com/ozs/service/service/impl/MsgAlarmServiceImpl.java

@@ -229,13 +229,13 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
 
     @Override
     public AjaxResult alarmStatistics() {
-        int count;
-        int unresolvedCount;
+        int count=0;
+        int unresolvedCount=0;
         //找出所有报警数据
         List<MsgAlarm> list = this.list();
         //未解除的报警
         List<MsgAlarm> alarmList = this.list(new LambdaQueryWrapper<MsgAlarm>()
-                .eq(MsgAlarm::getIsLock, 1));
+                .eq(MsgAlarm::getIsLock, 2));
         HashMap<String, Integer> map = new HashMap<>();
         if (!ObjectUtils.isEmpty(list)) {
             //获取所有报警的相机编码
@@ -253,10 +253,13 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
             int pu = list.size() - count;
             map.put("highAlarmCount", count);
             map.put("puAlarmCount", pu);
+        }else {
+            map.put("highAlarmCount", 0);
+            map.put("puAlarmCount", 0);
         }
         if (!ObjectUtils.isEmpty(alarmList)) {
             //获取所有报警的相机编码
-            //找出所有已解除报警数据 1=高铁的数量
+            //找出所有未解除报警数据 1=高铁的数量
             unresolvedCount = (int) alarmList.stream()
                     .map(base -> baseCameraManagementMapper.selectOne(new LambdaQueryWrapper<BaseCameraManagement>()
                             .eq(BaseCameraManagement::getCameraCode, base.getCameraCode())))
@@ -270,6 +273,9 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
             int puUnresolvedCount = alarmList.size() - unresolvedCount;
             map.put("highUnresolvedCount", unresolvedCount);
             map.put("puUnresolvedCount", puUnresolvedCount);
+        }else {
+            map.put("highUnresolvedCount", 0);
+            map.put("puUnresolvedCount", 0);
         }
         return AjaxResult.success(map);
     }

business-service/src/main/resources/mapper/service/BaseCameraManagementMapper.xml

@@ -198,7 +198,7 @@
                 </trim>
             </if>
         </where>
-        ORDER BY
+        ORDER BY man.is_disable DESC,
         man.electricity
     </select>
     <select id="alarmCountSort" resultType="com.ozs.service.entity.vo.AlarmCountSortVo">

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -765,15 +765,23 @@ public class BaseCameraManagementController extends BaseController {
         children.sort(new Comparator<CameraTree>() {
             @Override
             public int compare(CameraTree o1, CameraTree o2) {
-                int mileageDiff = o1.getNumber() - o2.getNumber();
-                if (mileageDiff == 0) {
+                if (ObjectUtils.isEmpty(o1.getNumber())&& ObjectUtils.isEmpty(o2.getNumber())) {
+                    int mileageDiff = o1.getNumber() - o2.getNumber();
+                    if (mileageDiff == 0) {
+                        String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getRailwayName());
+                        String substring1 = name1.substring(0, 1);
+                        String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getRailwayName());
+                        String substring2 = name2.substring(0, 1);
+                        return substring1.compareTo(substring2);
+                    } else {
+                        return mileageDiff;
+                    }
+                }else {
                     String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getRailwayName());
                     String substring1 = name1.substring(0, 1);
                     String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getRailwayName());
                     String substring2 = name2.substring(0, 1);
                     return substring1.compareTo(substring2);
-                } else {
-                    return mileageDiff;
                 }
             }
         });