Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -35,4 +35,6 @@ public interface MsgAlarmMapper extends BaseMapper<MsgAlarm> {
     List<AlarmStatisticMonthDto> listDtoMonth(@Param("railwayCode") String railwayCode, @Param("startMonth") Integer startMonth, @Param("endMonth") Integer endMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
 
     Map selectCameraCode(@Param("cameraCode") String cameraCode);
+
+    MsgAlarm selectByCameraCode(@Param("cameraCode") String cameraCode);
 }

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

@@ -3,6 +3,9 @@ package com.ozs.service.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.service.entity.MsgWebPush;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Author : sunhh
@@ -10,4 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface MsgWebPushMapper extends BaseMapper<MsgWebPush> {
+    Integer webAlarmNum(@Param("userId") String userId);
+
+    List<MsgWebPush> webAlarm(@Param("userId") String userId);
 }

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

@@ -31,4 +31,11 @@ public interface MsgAlarmService extends IService<MsgAlarm> {
 
     //web数据统计 报警月统计数据导出
     List<AlarmStatisticMonthDto> exportExcelMonth(AlarmStatisticResVo alarmStatisticResVo, String userId) throws Exception;
+
+    /**
+     * 通过相机编码查询未解除预警信息
+     * @param cameraCode
+     * @return
+     */
+    MsgAlarm selectByCameraCode(String cameraCode);
 }

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

@@ -4,10 +4,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.MsgAppPush;
 import com.ozs.service.entity.MsgWebPush;
 
+import java.util.Map;
+
 /**
  * @Author : sunhh
  * @create 2023/3/15 14:33
  */
 public interface MsgWebPushService extends IService<MsgWebPush> {
     int read(MsgWebPush msgWebPush);
+
+    Map webAlarm(String userId);
 }

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

@@ -94,4 +94,9 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
         return listDto;
     }
 
+    @Override
+    public MsgAlarm selectByCameraCode(String cameraCode) {
+        return msgAlarmMapper.selectByCameraCode(cameraCode);
+    }
+
 }

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

@@ -7,6 +7,10 @@ import com.ozs.service.service.MsgWebPushService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author : sunhh
  * @create 2023/3/15 14:34
@@ -22,4 +26,14 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
         msgWebPush.setStatus(2);
         return msgWebPushMapper.updateById(msgWebPush);
     }
+
+    @Override
+    public Map webAlarm(String userId) {
+        Map<String, Object> webAlarmMap = new HashMap<>();
+        Integer webAlarmNum = msgWebPushMapper.webAlarmNum(userId);
+        List<MsgWebPush> webAlarm = msgWebPushMapper.webAlarm(userId);
+        webAlarmMap.put("webAlarmNum", webAlarmNum);
+        webAlarmMap.put("webAlarm", webAlarm);
+        return webAlarmMap;
+    }
 }

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

@@ -220,10 +220,13 @@
             and YEAR(a.alarm_time) = YEAR(SYSDATE())
         </where>
         group by a.alarm_id,MONTH(a.alarm_time)
-
     </select>
 
     <select id="selectCameraCode" parameterType="java.lang.String" resultType="java.util.Map">
         select is_lock isLock, max(alarm_time) from msg_alarm where camera_code = #{cameraCode}
     </select>
+
+    <select id="selectByCameraCode" parameterType="java.lang.String" resultType="com.ozs.service.entity.MsgAlarm">
+        select *, max(alarm_time) from msg_alarm where camera_code = #{cameraCode}
+    </select>
 </mapper>

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

@@ -77,6 +77,6 @@
 
 
     <select id="appAlarmNum" parameterType="java.lang.String" resultType="java.lang.Integer">
-        select count(*) from msg_app_push where status = 0 and receive_by = #{userId}
+        select count(*) from msg_app_push where status = 1 and receive_by = #{userId}
     </select>
 </mapper>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ozs.service.mapper.MsgWebPushMapper">
+
+    <select id="webAlarmNum" parameterType="java.lang.String" resultType="java.lang.Integer">
+        select count(*) from msg_web_push where status = 1 and receive_by = #{userId}
+    </select>
+
+    <select id="webAlarm" parameterType="java.lang.String" resultType="com.ozs.service.entity.MsgWebPush">
+        select * from msg_web_push where status = 1 and receive_by = #{userId}
+    </select>
+</mapper>

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

@@ -104,6 +104,34 @@ public class BaseCameraManagementController extends BaseController {
         return AjaxResult.success(baseCameraManagements);
     }
 
+    @PostMapping(value = "/homeGetInfo")
+    @ApiOperation("根据相机ID、是否解除 获取相机信息、未解除信息")
+    public AjaxResult homeGetInfo(@PathVariable Long id, @PathVariable Integer isLock, @PathVariable String cameraCode) {
+        // isLock  报警是否解除 1已解除2未解除
+        if (!StringUtils.isEmpty(isLock) && isLock == 1) {
+            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+            LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+                queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+            }
+            BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+            baseCameraManagement.setDeptName(sysDept.getDeptName());
+            baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
+            String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+            baseCameraManagement.setInstallMiles(mils);
+            String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+            baseCameraManagement.setEndMiles(end);
+            String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+            baseCameraManagement.setBeginMiles(begin);
+            return AjaxResult.success(baseCameraManagement);
+        } else if (!StringUtils.isEmpty(isLock) && isLock == 2) {
+            MsgAlarm msgAlarm = msgAlarmService.selectByCameraCode(cameraCode);
+            return AjaxResult.success(msgAlarm);
+        }
+        return null;
+    }
+
     /**
      * 相机台账管理分页
      *

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

@@ -48,6 +48,7 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -77,6 +78,17 @@ public class MsgAlarmController extends BaseController {
     @Autowired
     private MsgWebPushService msgWebPushService;
 
+    /**
+     * web报警未读消息个数+未读消息列表
+     */
+    @GetMapping("/webAlarm")
+    @ApiOperation("app报警推送次数")
+    public AjaxResult webAlarmNum() {
+        String userId = getUserId();
+        Map webAlarm = msgWebPushService.webAlarm(userId);
+        return AjaxResult.success(webAlarm);
+    }
+
     /**
      * web消息已读
      */