相机树开发

business-service/src/main/java/com/ozs/service/entity/CameraTree.java

@@ -18,6 +18,7 @@ public class CameraTree implements Serializable,Comparable<CameraTree> {
     private static final long serialVersionUID = 1L;
     String code;
     String name;
+    String railwayName;
     boolean flay;
     Integer mileage;
     Integer number;

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

@@ -1,9 +1,11 @@
 package com.ozs.service.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -152,4 +154,10 @@ public class MsgAlarmResp implements Serializable {
 
     private String cameraSn;
 
+    private Integer isDisable;
+
+    private LocalDateTime heartTime;
+
+    private Integer electricity;
+
 }

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

@@ -58,6 +58,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 CameraTree build = CameraTree.builder()
                         .code(o.getRailwayCode())
                         .name(o.getLineNumber()+o.getRailwayName())
+                        .railwayName(o.getRailwayName())
                         .number(Integer.valueOf(o.getLineNumber()))
                         .flay(true)
                         .publicWorksSection(o.getPublicWorksSection())
@@ -74,6 +75,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 CameraTree build3 = CameraTree.builder()
                         .code(o.getRailwayCode())
                         .name(o.getLineNumber()+o.getRailwayName())
+                        .railwayName(o.getRailwayName())
                         .number(Integer.valueOf(o.getLineNumber()))
                         .flay(true)
                         .publicWorksSection(o.getPublicWorksSection())

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

@@ -11,7 +11,7 @@
 			a.install_mile AS installMile, 
 			a.id AS id,
 			a.dept_id,
-		    a.line_number AS lineNumber,
+		    l.line_number AS lineNumber,
 			d.dept_name as publicWorksSection
 		FROM base_camera_management AS a
 		    inner join sys_dept as d on a.dept_id = d.dept_id

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

@@ -99,7 +99,7 @@ public class BaseCameraManagementController extends BaseController {
     @Autowired
     private CameraUtil cameraUtil;
     @Autowired
-    private MqLogService  mqLogService;
+    private MqLogService mqLogService;
 
 
     /**
@@ -142,14 +142,12 @@ public class BaseCameraManagementController extends BaseController {
             }
             BaseDeviceDynamicManagement deviceDynamicManagement = baseDeviceDynamicManagementService.getOne(new LambdaQueryWrapper<BaseDeviceDynamicManagement>()
                     .eq(BaseDeviceDynamicManagement::getCameraCode, cameraCode));
-            if (deviceDynamicManagement.getIsDisable()==2) {
-                baseCameraManagement.setIsDisable(deviceDynamicManagement.getIsDisable());
-                baseCameraManagement.setElectricity(deviceDynamicManagement.getElectricity());
-                List<MqLog> list = mqLogService.list(new LambdaQueryWrapper<MqLog>()
-                        .eq(MqLog::getCameraCode, cameraCode));
-                if (!ObjectUtils.isEmpty(list)) {
-                    baseCameraManagement.setHeartTime(list.get(0).getCreateTime());
-                }
+            baseCameraManagement.setIsDisable(deviceDynamicManagement.getIsDisable());
+            baseCameraManagement.setElectricity(deviceDynamicManagement.getElectricity());
+            List<MqLog> list = mqLogService.list(new LambdaQueryWrapper<MqLog>()
+                    .eq(MqLog::getCameraCode, cameraCode));
+            if (!ObjectUtils.isEmpty(list)) {
+                baseCameraManagement.setHeartTime(list.get(0).getCreateTime());
             }
             // 将字符串转换为浮点数
             double installLatitude = Double.parseDouble(baseCameraManagement.getInstallLatitude());
@@ -193,6 +191,15 @@ public class BaseCameraManagementController extends BaseController {
             String[] split = msgAlarm.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
             msgAlarmResp.setImageUrls(objects);
+            BaseDeviceDynamicManagement deviceDynamicManagement = baseDeviceDynamicManagementService.getOne(new LambdaQueryWrapper<BaseDeviceDynamicManagement>()
+                    .eq(BaseDeviceDynamicManagement::getCameraCode, cameraCode));
+            msgAlarmResp.setIsDisable(deviceDynamicManagement.getIsDisable());
+            msgAlarmResp.setElectricity(deviceDynamicManagement.getElectricity());
+            List<MqLog> list = mqLogService.list(new LambdaQueryWrapper<MqLog>()
+                    .eq(MqLog::getCameraCode, cameraCode));
+            if (!ObjectUtils.isEmpty(list)) {
+                msgAlarmResp.setHeartTime(list.get(0).getCreateTime());
+            }
             return AjaxResult.success(msgAlarmResp);
         }
         return null;
@@ -758,14 +765,14 @@ public class BaseCameraManagementController extends BaseController {
         children.sort(new Comparator<CameraTree>() {
             @Override
             public int compare(CameraTree o1, CameraTree o2) {
-                int mileageDiff  = o1.getNumber() - o2.getNumber();
+                int mileageDiff = o1.getNumber() - o2.getNumber();
                 if (mileageDiff == 0) {
-                    String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getName());
+                    String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getRailwayName());
                     String substring1 = name1.substring(0, 1);
-                    String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getName());
+                    String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getRailwayName());
                     String substring2 = name2.substring(0, 1);
                     return substring1.compareTo(substring2);
-                }else {
+                } else {
                     return mileageDiff;
                 }
             }
@@ -787,7 +794,7 @@ public class BaseCameraManagementController extends BaseController {
                 cameraTreeList.sort(new Comparator<CameraTree>() {
                     @Override
                     public int compare(CameraTree o1, CameraTree o2) {
-                        int mileageDiff  = o1.getMileage() - o2.getMileage();
+                        int mileageDiff = o1.getMileage() - o2.getMileage();
                         // 如果里程相同，则比较方向
                         if (mileageDiff == 0) {
                             String[] split1 = o1.getName().split("-");
@@ -993,9 +1000,9 @@ public class BaseCameraManagementController extends BaseController {
         }
         String recordUrl = CameraUtil.getRecordUrl(one.getCameraCode(), one.getChannel(), vo.getStartTime(), vo.getEntTime());
         if (recordUrl.contains("当前相机暂无回放视频")) {
-            return  AjaxResult.error(recordUrl);
-        }else {
-            return AjaxResult.success("ok",recordUrl);
+            return AjaxResult.error(recordUrl);
+        } else {
+            return AjaxResult.success("ok", recordUrl);
         }
     }
 
@@ -1027,27 +1034,29 @@ public class BaseCameraManagementController extends BaseController {
 
     /**
      * 夜视
+     *
      * @param deviceStateResp
      * @return
      */
     @GetMapping("/nightVision/{code}/{mode}")
-    public AjaxResult nightVision(@PathVariable String code,Integer mode){
+    public AjaxResult nightVision(@PathVariable String code, Integer mode) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(new LambdaQueryWrapper<BaseCameraManagement>()
                 .eq(BaseCameraManagement::getCameraCode, code));
-        PublishClient.configFrameRate(baseCameraManagement,mode);
+        PublishClient.configFrameRate(baseCameraManagement, mode);
         return success();
     }
 
     /**
      * 切换帧率
+     *
      * @param code
      * @return
      */
     @GetMapping("/switchFrameRate")
-    public AjaxResult switchFrameRate(@RequestParam("code") String code,@RequestParam("fps") String fps){
+    public AjaxResult switchFrameRate(@RequestParam("code") String code, @RequestParam("fps") String fps) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(new LambdaQueryWrapper<BaseCameraManagement>()
                 .eq(BaseCameraManagement::getCameraCode, code));
-        PublishClient.confidenceCoefficient(baseCameraManagement,fps);
+        PublishClient.confidenceCoefficient(baseCameraManagement, fps);
         return success();
     }
 
@@ -1104,18 +1113,18 @@ public class BaseCameraManagementController extends BaseController {
         LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(BaseDeviceDynamicManagement::getIsDisable, 2);
         List<BaseDeviceDynamicManagement> isDisable = baseDeviceDynamicManagementService.list(wrapper);
-        List<BaseDeviceDynamicManagement> collect = isDisable.stream().filter(f -> f.getFacilityState()==2).collect(Collectors.toList());
+        List<BaseDeviceDynamicManagement> collect = isDisable.stream().filter(f -> f.getFacilityState() == 2).collect(Collectors.toList());
         map.put("isDisable", collect.size());
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.le(BaseDeviceDynamicManagement::getElectricity, 10);
         List<BaseDeviceDynamicManagement> electricity = baseDeviceDynamicManagementService.list(queryWrapper);
 
-        List<BaseDeviceDynamicManagement> collect1 = electricity.stream().filter(f -> f.getElectricityState()==2).collect(Collectors.toList());
+        List<BaseDeviceDynamicManagement> collect1 = electricity.stream().filter(f -> f.getElectricityState() == 2).collect(Collectors.toList());
 
 
         map.put("electricity", collect1.size());
         map.put("count", isDisable.size() + electricity.size());
-        map.put("readCount", collect.size()+collect1.size());
+        map.put("readCount", collect.size() + collect1.size());
         return AjaxResult.success(map);
     }
 
@@ -1128,9 +1137,9 @@ public class BaseCameraManagementController extends BaseController {
         BaseDeviceDynamicManagement dynamicManagement = new BaseDeviceDynamicManagement();
         LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
         wrapper.in(BaseDeviceDynamicManagement::getCameraCode, list);
-        if (deviceStateRespList.get(0).getCategory()==1){
+        if (deviceStateRespList.get(0).getCategory() == 1) {
             dynamicManagement.setElectricityState(1);
-        }else {
+        } else {
             dynamicManagement.setFacilityState(1);
         }
         boolean update = baseDeviceDynamicManagementService.update(dynamicManagement, wrapper);
@@ -1149,15 +1158,17 @@ public class BaseCameraManagementController extends BaseController {
 
     /**
      * 首页设备状态
+     *
      * @return
      */
     @GetMapping("cameraStateTotal")
     public AjaxResult cameraStateTotal() {
-     return baseCameraManagementService.cameraStateTotal();
+        return baseCameraManagementService.cameraStateTotal();
     }
 
     /**
      * 首页设备状态列表
+     *
      * @return
      */
     @GetMapping("cameraStateList")
@@ -1168,6 +1179,7 @@ public class BaseCameraManagementController extends BaseController {
 
     /**
      * 批量修改相机已读未读状态
+     *
      * @return
      */
     @GetMapping("updateStateAll/{state}")