相机树开发

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

@@ -62,4 +62,8 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
 
     private List<Long> ids;
     private String cameraCode;
+    /**
+     * 相机状态(1在线2离线)
+     */
+    private Integer isDisable;
 }

business-service/src/main/java/com/ozs/service/mapper/BaseCameraManagementMapper.java

@@ -30,5 +30,5 @@ public interface BaseCameraManagementMapper extends BaseMapper<BaseCameraManagem
 
     List<DeviceStateResp> deviceStatePage(DeviceStateResp deviceStateResp);
 
-    List<AlarmCountSortVo> alarmCountSort();
+    List<AlarmCountSortVo> alarmCountSort(MsgAlarmVo msgAlarmVo);
 }

business-service/src/main/java/com/ozs/service/mapper/BaseRailwayManagementMapper.java

@@ -2,6 +2,7 @@ package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.service.entity.BaseRailwayManagement;
+import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.CameraStateList;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -23,5 +24,5 @@ public interface BaseRailwayManagementMapper extends BaseMapper<BaseRailwayManag
 
     List<BaseRailwayManagement> listRailway();
 
-    List<CameraStateList> cameraStateList();
+    List<CameraStateList> cameraStateList(BaseCameraManagementVo baseCameraManagementVo);
 }

business-service/src/main/java/com/ozs/service/service/BaseCameraManagementService.java

@@ -48,9 +48,9 @@ public interface BaseCameraManagementService extends IService<BaseCameraManageme
 
     List<DeviceStateResp> deviceStateRespList(DeviceStateResp deviceStateResp);
 
-    AjaxResult cameraStateTotal();
+    AjaxResult cameraStateTotal(BaseCameraManagementVo baseCameraManagementVo);
 
-    AjaxResult cameraStateList();
+    AjaxResult cameraStateList(BaseCameraManagementVo baseCameraManagementVo);
 
     AjaxResult updateStateAll(Integer state);
 }

business-service/src/main/java/com/ozs/service/service/MsgAlarmService.java

@@ -21,7 +21,6 @@ import java.util.Set;
  * @since 2023-02-22
  */
 public interface MsgAlarmService extends IService<MsgAlarm> {
-    //web数据统计 报警数据详情
     IPage<AlarmStatisticVo> list(AlarmStatisticResVo alarmStatisticResVo);
 
     IPage listToPage(List list, int pageNum, int pageSize);
@@ -34,6 +33,7 @@ public interface MsgAlarmService extends IService<MsgAlarm> {
 
     //报警数据详情导出数据集合
     List<AlarmStatisticDto> exportExcel(AlarmStatisticResVo alarmStatisticResVo);
+
     /**
      * 通过相机编码查询未解除预警信息
      *
@@ -62,7 +62,7 @@ public interface MsgAlarmService extends IService<MsgAlarm> {
 
     BaseCameraManagement getBaseCameraManagementByCamereCode(String camereCode);
 
-    AjaxResult alarmStatistics();
+    AjaxResult alarmStatistics(MsgAlarmVo msgAlarmVo1);
 
-    AjaxResult alarmCountSort();
+    AjaxResult alarmCountSort(MsgAlarmVo msgAlarmVo);
 }

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

@@ -351,14 +351,14 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     }
 
     @Override
-    public AjaxResult cameraStateTotal() {
+    public AjaxResult cameraStateTotal(BaseCameraManagementVo baseCameraManagementVo) {
         int count;
         int unresolvedCount;
         //找出所有相机数据
-        List<BaseCameraManagement> list = this.list();
+        List<BaseCameraManagement> list =baseCameraManagementMapper.selectCameraManagementList(baseCameraManagementVo);
         //异常的相机
-        List<BaseDeviceDynamicManagement> alarmList = baseDeviceDynamicManagementMapper.selectList(new LambdaQueryWrapper<BaseDeviceDynamicManagement>()
-                .eq(BaseDeviceDynamicManagement::getIsDisable, 2));
+        baseCameraManagementVo.setIsDisable(2);
+        List<BaseCameraManagement> alarmList = baseCameraManagementMapper.selectCameraManagementList(baseCameraManagementVo);
         HashMap<String, Integer> map = new HashMap<>();
         if (!ObjectUtils.isEmpty(list)) {
             //找出所有相机数据
@@ -401,8 +401,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     }
 
     @Override
-    public AjaxResult cameraStateList() {
-        return AjaxResult.success(baseRailwayManagementMapper.cameraStateList());
+    public AjaxResult cameraStateList(BaseCameraManagementVo baseCameraManagementVo) {
+        return AjaxResult.success(baseRailwayManagementMapper.cameraStateList(baseCameraManagementVo));
     }
 
     @Override

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

@@ -17,6 +17,7 @@ import com.ozs.service.mapper.MsgAlarmMapper;
 import com.ozs.service.service.MsgAlarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.service.service.RedisService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
  * @since 2023-02-22
  */
 @Service
+@Slf4j
 public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> implements MsgAlarmService {
     @Autowired
     private MsgAlarmMapper msgAlarmMapper;
@@ -228,14 +230,14 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
     }
 
     @Override
-    public AjaxResult alarmStatistics() {
-        int count=0;
-        int unresolvedCount=0;
+    public AjaxResult alarmStatistics(MsgAlarmVo msgAlarmVo1) {
+        int count = 0;
+        int unresolvedCount = 0;
         //找出所有报警数据
-        List<MsgAlarm> list = this.list();
+        List<MsgAlarm> list = msgAlarmMapper.selectMsgAlarmList(msgAlarmVo1);
         //未解除的报警
-        List<MsgAlarm> alarmList = this.list(new LambdaQueryWrapper<MsgAlarm>()
-                .eq(MsgAlarm::getIsLock, 2));
+        msgAlarmVo1.setIsLock(2);
+        List<MsgAlarm> alarmList = msgAlarmMapper.selectMsgAlarmList(msgAlarmVo1);
         HashMap<String, Integer> map = new HashMap<>();
         if (!ObjectUtils.isEmpty(list)) {
             //获取所有报警的相机编码
@@ -253,7 +255,7 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
             int pu = list.size() - count;
             map.put("highAlarmCount", count);
             map.put("puAlarmCount", pu);
-        }else {
+        } else {
             map.put("highAlarmCount", 0);
             map.put("puAlarmCount", 0);
         }
@@ -273,7 +275,7 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
             int puUnresolvedCount = alarmList.size() - unresolvedCount;
             map.put("highUnresolvedCount", unresolvedCount);
             map.put("puUnresolvedCount", puUnresolvedCount);
-        }else {
+        } else {
             map.put("highUnresolvedCount", 0);
             map.put("puUnresolvedCount", 0);
         }
@@ -281,7 +283,7 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
     }
 
     @Override
-    public AjaxResult alarmCountSort() {
-        return AjaxResult.success(baseCameraManagementMapper.alarmCountSort());
+    public AjaxResult alarmCountSort(MsgAlarmVo msgAlarmVo) {
+        return AjaxResult.success(baseCameraManagementMapper.alarmCountSort(msgAlarmVo));
     }
 }

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

@@ -37,6 +37,9 @@
             <if test="railwayCode != null and railwayCode != ''">
                 and a.railway_code=#{railwayCode}
             </if>
+            <if test="isDisable != null and isDisable != 0">
+                and man.is_disable=#{isDisable}
+            </if>
             <if test="cameraCode != null and cameraCode != ''">
                 and a.camera_code like concat('%', #{cameraCode}, '%')
             </if>
@@ -196,6 +199,31 @@
     <select id="alarmCountSort" resultType="com.ozs.service.entity.vo.AlarmCountSortVo">
         SELECT COUNT(m.camera_code) AS cameraCount,c.camera_code AS cameraCode,c.measure_point_name AS measurePointName
         FROM msg_alarm  m JOIN base_camera_management  c ON m.camera_code=c.camera_code
+        <where>
+            <if test="ids != null and ids.size>0">
+                and a.id in
+                <foreach item="items" collection="ids" separator="," open="(" close=")" index="">
+                    #{items}
+                </foreach>
+            </if>
+            <if test="!dsFlay">
+                and
+                <trim prefix="(" prefixOverrides="or" suffix=")">
+                    <if test="dsUserId != null and dsUserId != ''">
+                        or a.create_by=#{dsUserId}
+                    </if>
+                    <if test="dsDeptId != null and dsDeptId != 0">
+                        or b.dept_id=#{dsDeptId}
+                    </if>
+                    <if test="dsDeptIds != null">
+                        or b.dept_id in
+                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
+                            #{item}
+                        </foreach>
+                    </if>
+                </trim>
+            </if>
+        </where>
         GROUP BY m.camera_code
         ORDER BY cameraCount DESC
     </select>

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

@@ -14,19 +14,44 @@
         group by c.railway_code, a.dept_id
     </select>
     <select id="cameraStateList" resultType="com.ozs.service.entity.vo.CameraStateList">
-    SELECT
-    s.dept_name AS deptName,
-    COUNT(c.dept_id) AS totalCameraCount,
-    COUNT(CASE
-    WHEN b.is_disable = 2  THEN 1
-    END) AS filteredCameraCount
-    FROM
-    base_camera_management c
-    JOIN
-    sys_dept s ON c.dept_id = s.dept_id
-    LEFT JOIN
-    base_device_dynamic_management b ON c.camera_code = b.camera_code
-    GROUP BY
-    c.dept_id, s.dept_name;
+        SELECT
+        s.dept_name AS deptName,
+        COUNT(c.dept_id) AS totalCameraCount,
+        COUNT(CASE
+        WHEN b.is_disable = 2 THEN 1
+        END) AS filteredCameraCount
+        FROM
+        base_camera_management c
+        JOIN
+        sys_dept s ON c.dept_id = s.dept_id
+        LEFT JOIN
+        base_device_dynamic_management b ON c.camera_code = b.camera_code
+        <where>
+            <if test="ids != null and ids.size>0">
+                and a.id in
+                <foreach item="items" collection="ids" separator="," open="(" close=")" index="">
+                    #{items}
+                </foreach>
+            </if>
+            <if test="!dsFlay">
+                and
+                <trim prefix="(" prefixOverrides="or" suffix=")">
+                    <if test="dsUserId != null and dsUserId != ''">
+                        or a.create_by=#{dsUserId}
+                    </if>
+                    <if test="dsDeptId != null and dsDeptId != 0">
+                        or a.dept_id=#{dsDeptId}
+                    </if>
+                    <if test="dsDeptIds != null">
+                        or a.dept_id in
+                        <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
+                            #{item}
+                        </foreach>
+                    </if>
+                </trim>
+            </if>
+        </where>
+        GROUP BY
+        c.dept_id, s.dept_name;
     </select>
 </mapper>

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

@@ -143,7 +143,7 @@ public class BaseCameraManagementController extends BaseController {
             BaseDeviceDynamicManagement deviceDynamicManagement = baseDeviceDynamicManagementService.getOne(new LambdaQueryWrapper<BaseDeviceDynamicManagement>()
                     .eq(BaseDeviceDynamicManagement::getCameraCode, cameraCode));
             baseCameraManagement.setIsDisable(deviceDynamicManagement.getIsDisable());
-            baseCameraManagement.setElectricity(deviceDynamicManagement.getElectricity()+"%");
+            baseCameraManagement.setElectricity(deviceDynamicManagement.getElectricity() + "%");
             List<MqLog> list = mqLogService.list(new LambdaQueryWrapper<MqLog>()
                     .eq(MqLog::getCameraCode, cameraCode));
             if (!ObjectUtils.isEmpty(list)) {
@@ -194,7 +194,7 @@ public class BaseCameraManagementController extends BaseController {
             BaseDeviceDynamicManagement deviceDynamicManagement = baseDeviceDynamicManagementService.getOne(new LambdaQueryWrapper<BaseDeviceDynamicManagement>()
                     .eq(BaseDeviceDynamicManagement::getCameraCode, cameraCode));
             msgAlarmResp.setIsDisable(deviceDynamicManagement.getIsDisable());
-            msgAlarmResp.setElectricity(deviceDynamicManagement.getElectricity()+"%");
+            msgAlarmResp.setElectricity(deviceDynamicManagement.getElectricity() + "%");
             List<MqLog> list = mqLogService.list(new LambdaQueryWrapper<MqLog>()
                     .eq(MqLog::getCameraCode, cameraCode));
             if (!ObjectUtils.isEmpty(list)) {
@@ -765,7 +765,7 @@ public class BaseCameraManagementController extends BaseController {
         children.sort(new Comparator<CameraTree>() {
             @Override
             public int compare(CameraTree o1, CameraTree o2) {
-                if (ObjectUtils.isEmpty(o1.getNumber())&& ObjectUtils.isEmpty(o2.getNumber())) {
+                if (!ObjectUtils.isEmpty(o1.getNumber()) && !ObjectUtils.isEmpty(o2.getNumber())) {
                     int mileageDiff = o1.getNumber() - o2.getNumber();
                     if (mileageDiff == 0) {
                         String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getRailwayName());
@@ -776,7 +776,7 @@ public class BaseCameraManagementController extends BaseController {
                     } else {
                         return mileageDiff;
                     }
-                }else {
+                } else {
                     String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getRailwayName());
                     String substring1 = name1.substring(0, 1);
                     String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getRailwayName());
@@ -1157,7 +1157,9 @@ public class BaseCameraManagementController extends BaseController {
      */
     @GetMapping("cameraStateTotal")
     public AjaxResult cameraStateTotal() {
-     return baseCameraManagementService.cameraStateTotal();
+        BaseCameraManagementVo baseCameraManagementVo = new BaseCameraManagementVo();
+        BaseCameraManagementVo baseCameraManagementVos = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
+        return baseCameraManagementService.cameraStateTotal(baseCameraManagementVos);
     }
 
     /**
@@ -1166,7 +1168,9 @@ public class BaseCameraManagementController extends BaseController {
      */
     @GetMapping("cameraStateList")
     public AjaxResult cameraStateList() {
-        return baseCameraManagementService.cameraStateList();
+        BaseCameraManagementVo baseCameraManagementVo = new BaseCameraManagementVo();
+        BaseCameraManagementVo baseCameraManagementVos = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
+        return baseCameraManagementService.cameraStateList(baseCameraManagementVos);
     }
 
 

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

@@ -823,13 +823,17 @@ public class MsgAlarmController extends BaseController {
     @GetMapping(value = "/alarmStatistics")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult alarmStatistics() {
-      return   msgAlarmService.alarmStatistics();
+        MsgAlarmVo msgAlarmVo1 = new MsgAlarmVo();
+        MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo1);
+      return   msgAlarmService.alarmStatistics(msgAlarmVo);
     }
 
     @GetMapping(value = "/alarmCountSort")
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult alarmCountSort() {
-        return   msgAlarmService.alarmCountSort();
+        MsgAlarmVo msgAlarmVo1 = new MsgAlarmVo();
+        MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo1);
+        return   msgAlarmService.alarmCountSort(msgAlarmVo);
     }
 
 }