代码修改

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

@@ -135,6 +135,16 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      */
     private String remark;
 
+    /**
+     * 解除报警类型1真实报警2误报警
+     */
+    private Integer releasedType;
+
+    /**
+     * 解除原因
+     */
+    private String releasedReason;
+
     /**
      * 线路名称
      */

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

@@ -75,22 +75,22 @@ public class BaseCameraManagementVos implements Serializable {
     private String deptName;
 
     /**
-     * 监控相机安装里程位置字符串形式
+     * 监控相机安装里程位置
      */
     @Excel(name = "监控相机安装里程位置")
-    private String installMiles;
+    private Integer installMile;
 
     /**
-     * 监控范围开始里程位置字符串形式
+     * 监控范围开始里程位置
      */
     @Excel(name = "监控范围开始里程位置")
-    private String beginMiles;
+    private Integer beginMile;
 
     /**
-     * 监控范围结束里程位置字符串形式
+     * 监控范围结束里程位置
      */
     @Excel(name = "监控范围结束里程位置")
-    private String endMiles;
+    private Integer endMile;
 
     /**
      *线路名称

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

@@ -1,6 +1,7 @@
 package com.ozs.service.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
@@ -101,4 +102,28 @@ public class MsgAlarmResp implements Serializable {
      * 所属工务段编码(单位名称)
      */
     private String deptName;
+
+    /**
+     * 解除报警类型1真实报警2误报警
+     */
+    private Integer releasedType;
+
+    /**
+     * 解除原因
+     */
+    private String releasedReason;
+
+    /**
+     * 报警病害属性（可以给出泥石流的框定范围）
+     */
+    private String alarmAttr;
+
+    /**
+     * 报警内容
+     */
+    private String content;
+    /**
+     * 解除人真实姓名
+     */
+    private String releasedByName;
 }

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

@@ -88,4 +88,9 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      * 监控范围结束里程位置字符串形式
      */
     private String endMiles;
+
+    /**
+     * 解除报警类型1真实报警2误报警
+     */
+    private Integer releasedType;
 }

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

@@ -46,6 +46,7 @@ import java.util.*;
  */
 @Service
 public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManagementMapper, BaseCameraManagement> implements BaseCameraManagementService {
+    public static final String PATTERN = "^[0-9]*$";
     @Autowired
     protected Validator validator;
     @Autowired
@@ -103,21 +104,28 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
                         }
                         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
                         if (!ObjectUtils.isEmpty(baseRailwayManagement)) {
-                            accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
-                            Integer mils = AppendUtils.stringSplit(accountManagement.getInstallMiles());
-                            accountManagement.setInstallMile(mils);
-                            Integer end = AppendUtils.stringSplit(accountManagement.getEndMiles());
-                            accountManagement.setEndMile(end);
-                            Integer begin = AppendUtils.stringSplit(accountManagement.getBeginMiles());
-                            accountManagement.setBeginMile(begin);
-                            baseCameraManagementMapper.insert(accountManagement);
-                            BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
-                            baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
-                            baseDeviceDynamicManagement.setUpdateBy(userId);
-                            baseDeviceDynamicManagement.setCreateBy(userId);
-                            baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
-                            successNum++;
-                            successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+                            if (!accountManagement.getBeginMile().toString().matches(PATTERN) || !accountManagement.getInstallMile().toString().matches(PATTERN) || !accountManagement.getEndMile().toString().matches(PATTERN)) {
+                                failureNum++;
+                                failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,里程位置填写格式不正确,请填写数字");
+                            } else {
+                                accountManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
+                                accountManagement.setInstallMile(accountManagement.getInstallMile() * 1000);
+                                accountManagement.setEndMile(accountManagement.getEndMile() * 1000);
+                                accountManagement.setBeginMile(accountManagement.getBeginMile() * 1000);
+                                if (accountManagement.getBeginMile() < accountManagement.getEndMile()) {
+                                    baseCameraManagementMapper.insert(accountManagement);
+                                    BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
+                                    baseDeviceDynamicManagement.setCameraCode(accountManagement.getCameraCode());
+                                    baseDeviceDynamicManagement.setUpdateBy(userId);
+                                    baseDeviceDynamicManagement.setCreateBy(userId);
+                                    baseDeviceDynamicManagementMapper.insert(baseDeviceDynamicManagement);
+                                    successNum++;
+                                    successMsg.append(successNum + "、相机编码 " + accountManagement.getCameraCode() + " 导入成功");
+                                } else {
+                                    failureNum++;
+                                    failureMsg.append(failureNum + "、相机编码为: " + accountManagement.getCameraCode() + "的数据,监控范围开始里程位置不能大于监控范围结束里程位置");
+                                }
+                            }
                         } else {
                             failureNum++;
                             String msg = failureNum + "、相机所属线路名称 " + accountManagement.getRailwayName() + "不存在， 导入失败：";

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

@@ -198,7 +198,8 @@
         a.image_url AS imageUrl,
         a.released_by AS releasedBy,
         a.is_lock AS isLock,
-        a.released_time AS releasedTime
+        a.released_time AS releasedTime,
+        a.released_type AS releasedType
         FROM
         msg_alarm AS a  join
         base_camera_management AS b on a.camera_code=b.camera_code
@@ -241,6 +242,9 @@
             <if test="lineDir != null and lineDir != 0">
                 and a.line_dir =#{lineDir}
             </if>
+            <if test="releasedType != null and releasedType != 0">
+                and a.released_type =#{releasedType}
+            </if>
             <if test="beginAlarmTime != null and beginAlarmTime != ''">
                 and date_format(a.alarm_time,'%Y-%m-%d %H:%i:%S') &gt;= date_format(#{beginAlarmTime},'%Y-%m-%d %H:%i:%S')
             </if>

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

@@ -79,7 +79,7 @@ import java.util.stream.Stream;
 @RequestMapping("/service/baseCameraManagement")
 @Slf4j
 public class BaseCameraManagementController extends BaseController {
-    public static final String PATTERN = "(^K|^k)([0-9]+)\\+([0-9]{1,3})$";
+    public static final String PATTERN = "^[0-9]*$";
     @Resource
     BaseCameraManagementService baseCameraManagementService;
     @Resource
@@ -180,22 +180,18 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
         baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
-        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMiles())) {
-            if (!baseCameraManagementVo.getBeginMiles().matches(PATTERN)) {
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
+            if (!baseCameraManagementVo.getBeginMile().toString().matches(PATTERN)) {
                 return error("监控范围开始里程位置填写格式不正确");
-            } else {
-                int begin = AppendUtils.stringSplit(baseCameraManagementVo.getBeginMiles());
-                baseCameraManagementVo.setBeginMile(begin);
             }
         }
-        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMiles())) {
-            if (!baseCameraManagementVo.getEndMiles().matches(PATTERN)) {
+        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMile())) {
+            if (!baseCameraManagementVo.getEndMile().toString().matches(PATTERN)) {
                 return error("监控范围结束里程位置填写格式不正确");
-            } else {
-                int end = AppendUtils.stringSplit(baseCameraManagementVo.getEndMiles());
-                baseCameraManagementVo.setEndMile(end);
             }
         }
+        baseCameraManagementVo.setBeginMile(baseCameraManagementVo.getBeginMile() * 1000);
+        baseCameraManagementVo.setEndMile(baseCameraManagementVo.getEndMile() * 1000);
         IPage<BaseCameraManagement> page = baseCameraManagementService.queryPage(baseCameraManagementVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
@@ -293,24 +289,24 @@ public class BaseCameraManagementController extends BaseController {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("设备动态管理表该相机编码已存在,不能重复添加");
         }
-        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("监控范围开始里程位置填写格式不正确");
         }
-        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("监控相机安装里程位置填写格式不正确");
         }
-        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("监控范围结束里程位置填写格式不正确");
         }
-        int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
-        baseCameraManagement.setBeginMile(miles);
-        int install = AppendUtils.stringSplit(baseCameraManagement.getInstallMiles());
-        baseCameraManagement.setInstallMile(install);
-        int end = AppendUtils.stringSplit(baseCameraManagement.getEndMiles());
-        baseCameraManagement.setEndMile(end);
+        baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile() * 1000);
+        baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile() * 1000);
+        baseCameraManagement.setEndMile(baseCameraManagement.getEndMile() * 1000);
+        if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
+            return error("监控范围开始里程位置不能大于监控范围结束里程位置");
+        }
         baseCameraManagement.setCreateBy(getUserId());
         baseCameraManagement.setUpdateBy(getUserId());
         BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
@@ -350,21 +346,18 @@ public class BaseCameraManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
-        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getBeginMile().toString().matches(PATTERN)) {
             return error("监控范围开始里程位置填写格式不正确");
         }
-        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getInstallMile().toString().matches(PATTERN)) {
             return error("监控相机安装里程位置填写格式不正确");
         }
-        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
+        if (!baseCameraManagement.getEndMile().toString().matches(PATTERN)) {
             return error("监控范围结束里程位置填写格式不正确");
         }
-        int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
-        baseCameraManagement.setBeginMile(miles);
-        int install = AppendUtils.stringSplit(baseCameraManagement.getInstallMiles());
-        baseCameraManagement.setInstallMile(install);
-        int end = AppendUtils.stringSplit(baseCameraManagement.getEndMiles());
-        baseCameraManagement.setEndMile(end);
+        baseCameraManagement.setBeginMile(baseCameraManagement.getBeginMile() * 1000);
+        baseCameraManagement.setInstallMile(baseCameraManagement.getInstallMile() * 1000);
+        baseCameraManagement.setEndMile(baseCameraManagement.getEndMile() * 1000);
         baseCameraManagement.setUpdateBy(getUserId());
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
         BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
@@ -757,10 +750,19 @@ public class BaseCameraManagementController extends BaseController {
             List<MsgAlarm> list = msgAlarmService.list(wrapper1);
             if (list.size() > 0) {
                 MsgAlarm msgAlarm = list.get(0);
+                if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
+                    BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
+                    msgAlarm.setReleasedByName(user.getNickName());
+                }
                 msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
                 msgAlarmResp.setIsLock(msgAlarm.getIsLock());
                 msgAlarmResp.setReleasedTime(msgAlarm.getReleasedTime());
                 msgAlarmResp.setAlarmTime(msgAlarm.getAlarmTime());
+                msgAlarmResp.setReleasedType(msgAlarm.getReleasedType());
+                msgAlarmResp.setReleasedReason(msgAlarm.getReleasedReason());
+                msgAlarmResp.setAlarmAttr(msgAlarm.getAlarmAttr());
+                msgAlarmResp.setContent(msgAlarm.getContent());
+                msgAlarmResp.setReleasedByName(msgAlarm.getReleasedByName());
                 if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
                     String[] split = msgAlarm.getImageUrl().split(";");
                     ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));

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

@@ -43,7 +43,9 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -163,28 +165,25 @@ public class MsgAlarmController extends BaseController {
     @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
         msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
-        if (!ObjectUtils.isEmpty(msgAlarmVo.getAlarmMiles())) {
-            if (!msgAlarmVo.getAlarmMiles().matches(PATTERN)) {
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getAlarmMile())) {
+            if (!msgAlarmVo.getAlarmMile().toString().matches(PATTERN)) {
                 return error("里程位置填写格式不正确!");
             } else {
-                int miles = AppendUtils.stringSplit(msgAlarmVo.getAlarmMiles());
-                msgAlarmVo.setAlarmMile(miles);
+                msgAlarmVo.setAlarmMile(msgAlarmVo.getAlarmMile()*1000);
             }
         }
-        if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginMiles())) {
-            if (!msgAlarmVo.getBeginMiles().matches(PATTERN)) {
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginMile())) {
+            if (!msgAlarmVo.getBeginMile().toString().matches(PATTERN)) {
                 return error("监控范围开始里程位置填写格式不正确");
             } else {
-                int begin = AppendUtils.stringSplit(msgAlarmVo.getBeginMiles());
-                msgAlarmVo.setBeginMile(begin);
+                msgAlarmVo.setBeginMile(msgAlarmVo.getBeginMile()*1000);
             }
         }
-        if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMiles())) {
-            if (!msgAlarmVo.getEndMiles().matches(PATTERN)) {
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMile())) {
+            if (!msgAlarmVo.getEndMile().toString().matches(PATTERN)) {
                 return error("监控范围结束里程位置填写格式不正确");
             } else {
-                int end = AppendUtils.stringSplit(msgAlarmVo.getEndMiles());
-                msgAlarmVo.setEndMile(end);
+                msgAlarmVo.setEndMile(msgAlarmVo.getEndMile()*1000);
             }
         }
         IPage<MsgAlarm> page = msgAlarmService.queryPage(msgAlarmVo);
@@ -250,6 +249,10 @@ public class MsgAlarmController extends BaseController {
             String[] split = msgAlarm.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
             msgAlarm.setImageUrls(objects);
+            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
+                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
+                msgAlarm.setReleasedByName(user.getNickName());
+            }
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
@@ -286,6 +289,10 @@ public class MsgAlarmController extends BaseController {
             String[] split = msgAlarm.getImageUrl().split(";");
             ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
             msgAlarm.setImageUrls(objects);
+            if (StringUtils.isNotEmpty(msgAlarm.getReleasedBy())) {
+                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
+                msgAlarm.setReleasedByName(user.getNickName());
+            }
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
@@ -304,15 +311,19 @@ public class MsgAlarmController extends BaseController {
         }
     }
 
-    @PutMapping(value = "/{id}")
+    @PutMapping(value = "/updateIsLock")
     @ApiOperation("根据报警信息ID解除报警")
     @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)
-    public AjaxResult updateIsLock(@PathVariable Long id) {
+    public AjaxResult updateIsLock(@RequestHeader(value = "id") Long id,
+                                   @RequestParam(value = "releasedType") Integer releasedType,
+                                   @RequestParam(value = "releasedReason") String releasedReason) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         msgAlarm.setIsLock(1);
         msgAlarm.setUpdateBy(getUserId());
         msgAlarm.setReleasedBy(getUserId());
         msgAlarm.setReleasedTime(new Date());
+        msgAlarm.setReleasedReason(releasedReason);
+        msgAlarm.setReleasedType(releasedType);
         return AjaxResult.success(msgAlarmService.updateById(msgAlarm));
     }