报警信息表修改

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

@@ -69,6 +69,12 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     @Excel(name = "报警内容")
     private String content;
 
+    /**
+     * 报警级别
+     */
+    @Excel(name = "报警级别")
+    private Integer alarmLevel;
+
     /**
      * 报警置信度（百分比）
      */
@@ -80,21 +86,11 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private Integer lineDir;
 
     /**
-     * 报警病害类型（目前只有1泥石流，后续可扩展使用）
+     * 报警病害类型（1泥石流2异物侵线 3断轨监测）
      */
     private Integer alarmType;
-
-    /**
-     * 报警病害属性（可以给出泥石流的框定范围）
-     */
-    @Excel(name = "报警病害属性")
-    private String alarmAttr;
-
-    /**
-     * 报警图片地址
-     */
-    @Excel(name = "报警图片地址")
-    private String imageUrl;
+    
+    
 
     /**
      * 解除人
@@ -111,7 +107,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 报警是否解除 1已解除2未解除
      */
-    private Integer isLock;
+    private Integer isRelease;
 
     /**
      * 创建人
@@ -142,22 +138,10 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private String remark;
 
     /**
-     * 解除报警类型1真实报警2误报警
-     */
-    private Integer releasedType;
-
-    /**
-     * 解除原因
+     * 解除内容
      */
-    @Excel(name = "解除原因")
-    private String releasedReason;
-
-    /**
-     * 解除报警类型名称   1真实报警2误报警
-     */
-    @TableField(exist = false)
-    @Excel(name = "解除报警类型")
-    private String releasedTypeName;
+    @Excel(name = "解除内容")
+    private String releaseContent;
 
     /**
      * 线路名称
@@ -235,5 +219,5 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      */
     @Excel(name = "报警是否解除")
     @TableField(exist = false)
-    private String  isLockName;
+    private String  isReleaseName;
 }

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

@@ -2,6 +2,7 @@ package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.ozs.common.annotation.Excel;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -59,11 +60,7 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
      * 报警病害类型（目前只有1泥石流，后续可扩展使用）
      */
     private Integer alarmType;
-
-    /**
-     * 报警病害属性（可以给出泥石流的框定范围）
-     */
-    private String alarmAttr;
+    
 
     /**
      * 报警图片地址
@@ -94,4 +91,9 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
      * 备注
      */
     private String remark;
+
+    /**
+     * 报警级别
+     */
+    private Integer alarmLevel;
 }

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

@@ -71,11 +71,7 @@ public class AlarmStatisticDto {
     @Excel(name = "报警类型")
     private String alarmTypeValue;
 
-    /**
-     * 报警病害属性（可以给出泥石流的框定范围）
-     */
-    @Excel(name = "报警病害属性")
-    private String alarmAttr;
+    
 
     /**
      * 报警图片地址
@@ -101,23 +97,6 @@ public class AlarmStatisticDto {
     @Excel(name = "解除时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date releasedTime;
 
-    /**
-     * 解除原因
-     */
-    @Excel(name = "解除原因")
-    private String releasedReason;
-
-    /**
-     * 解除报警类型1真实报警2误报警
-     */
-    private Integer releasedType;
-
-    /**
-     * 解除报警类型名称   1真实报警2误报警
-     */
-    @Excel(name = "解除报警类型")
-    private String releasedTypeName;
-
     /**
      * 线路名称
      */
@@ -135,17 +114,26 @@ public class AlarmStatisticDto {
     /**
      * 报警是否解除 1已解除2未解除
      */
-    private Integer isLock;
+    private Integer isRelease;
 
     /**
      * 报警是否解除 1已解除2未解除
      */
     @Excel(name = "报警是否解除")
-    private String isLockName;
+    private String isReleaseName;
 
     /**
      * 备注
      */
     @Excel(name = "备注")
     private String remark;
+
+    /**
+     * 报警级别
+     */
+    private Integer alarmLevel;
+    /**
+     * 解除内容
+     */
+    private String releaseContent;
 }

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

@@ -1,6 +1,7 @@
 package com.ozs.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.common.annotation.Excel;
 import lombok.Data;
 
 import java.util.Date;
@@ -42,21 +43,10 @@ public class AlarmStatisticVo {
      * 备注
      */
     private String remark;
+    
 
-    /**
-     * 解除原因
-     */
-    private String releasedReason;
-
-    /**
-     * 解除报警类型1真实报警2误报警
-     */
-    private Integer releasedType;
-
-    /**
-     * 解除报警类型名称   1真实报警2误报警
-     */
-    private String releasedTypeName;
+  
+   
 
     /**
      * 报警里程位置
@@ -92,10 +82,7 @@ public class AlarmStatisticVo {
      */
     private String alarmTypeName;
 
-    /**
-     * 报警病害属性（可以给出泥石流的框定范围）
-     */
-    private String alarmAttr;
+    
 
     /**
      * 报警图片地址
@@ -120,10 +107,19 @@ public class AlarmStatisticVo {
     /**
      * 报警是否解除 1已解除2未解除
      */
-    private Integer isLock;
+    private Integer isRelease;
 
     /**
      * 报警是否解除 1已解除2未解除
      */
-    private String isLockName;
+    private String isReleaseName;
+    /**
+     * 报警级别
+     */
+    private Integer alarmLevel;
+
+    /**
+     * 解除内容
+     */
+    private String releaseContent;
 }

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

@@ -148,5 +148,5 @@ public class BaseCameraManagementHomeVo extends BaseEntity implements Serializab
     /**
      * 报警是否解除 1已解除2未解除
      */
-    private Integer isLock;
+    private Integer isRelease;
 }

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

@@ -25,5 +25,5 @@ public class HistoricalAlarmVo implements Serializable {
     /**
      * 报警是否解除 1已解除2未解除
      */
-    private Integer isLock;
+    private Integer isRelease;
 }

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

@@ -66,7 +66,7 @@ public class MsgAlarmResp implements Serializable {
     /**
      * 报警是否解除 1已解除2未解除
      */
-    private Integer isLock;
+    private Integer isRelease;
 
     /**
      * 解除时间
@@ -92,22 +92,7 @@ public class MsgAlarmResp implements Serializable {
      * 所属工务段编码(单位名称)
      */
     private String deptName;
-
-    /**
-     * 解除报警类型1真实报警2误报警
-     */
-    private Integer releasedType;
-
-    /**
-     * 解除原因
-     */
-    private String releasedReason;
-
-    /**
-     * 报警病害属性（可以给出泥石流的框定范围）
-     */
-    private String alarmAttr;
-
+    
     /**
      * 报警内容
      */

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

@@ -61,7 +61,7 @@ public class MsgAlarmVo extends PageVo implements Serializable {
     /**
      * 报警是否解除 1已解除2未解除
      */
-    private Integer isLock;
+    private Integer isRelease;
 
     /**
      * 用户userID
@@ -87,8 +87,5 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      */
     private String endMiles;
 
-    /**
-     * 解除报警类型1真实报警2误报警
-     */
-    private Integer releasedType;
+   
 }

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

@@ -48,10 +48,7 @@ public class MsgAppPushVo extends PageVo implements Serializable {
      */
     private Integer alarmType;
 
-    /**
-     * 报警病害属性（可以给出泥石流的框定范围）
-     */
-    private String alarmAttr;
+   
 
     /**
      * 报警图片地址

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

@@ -193,8 +193,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.selectCameraManagementList(baseCameraManagementVo);
         List<BaseCameraManagementHomeVo> allListVo = BeanUtils.entityListToVOList(baseCameraManagementList, BaseCameraManagementHomeVo.class);
         for (BaseCameraManagementHomeVo baseCameraManagementHomeVo : allListVo) {
-            Integer isLock = msgAlarmMapper.selectCameraCode(baseCameraManagementHomeVo.getCameraCode());
-            baseCameraManagementHomeVo.setIsLock(isLock != null ? isLock : 1);
+            Integer isRelease = msgAlarmMapper.selectCameraCode(baseCameraManagementHomeVo.getCameraCode());
+            baseCameraManagementHomeVo.setIsRelease(isRelease != null ? isRelease : 1);
         }
         return allListVo;
     }

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

@@ -8,18 +8,17 @@
         <result column="camera_code" property="cameraCode"/>
         <result column="alarm_time" property="alarmTime"/>
         <result column="remark" property="remark"/>
-        <result column="released_reason" property="releasedReason"/>
-        <result column="released_type" property="releasedType"/>
         <result column="alarm_mile" property="alarmMile"/>
         <result column="content" property="content"/>
         <result column="alarm_confidence" property="alarmConfidence"/>
         <result column="line_dir" property="lineDir"/>
+        <result column="alarm_level" property="alarmLevel"/>
         <result column="alarm_type" property="alarmType"/>
-        <result column="alarm_attr" property="alarmAttr"/>
         <result column="image_url" property="imageUrl"/>
         <result column="released_by" property="releasedBy"/>
         <result column="released_time" property="releasedTime"/>
-        <result column="is_lock" property="isLock"/>
+        <result column="is_release" property="isRelease"/>
+        <result column="release_content" property="releaseContent"/>
     </resultMap>
 
     <select id="list" resultMap="AlarmStatisticVoResult">
@@ -40,6 +39,8 @@
         a.released_type,
         c.railway_name,
         a.remark,
+        a.alarm_level,
+        a.release_content,
         a.is_lock
         FROM
         msg_alarm AS a inner join
@@ -80,15 +81,14 @@
         <result column="alarmConfidence" property="alarmConfidence"/>
         <result column="lineDir" property="lineDir"/>
         <result column="alarmType" property="alarmType"/>
-        <result column="alarmAttr" property="alarmAttr"/>
         <result column="imageUrl" property="imageUrl"/>
         <result column="releasedBy" property="releasedBy"/>
         <result column="releasedTime" property="releasedTime"/>
-        <result column="releasedReason" property="releasedReason"/>
-        <result column="releasedType" property="releasedType"/>
         <result column="railwayName" property="railwayName"/>
         <result column="remark" property="remark"/>
-        <result column="isLock" property="isLock"/>
+        <result column="isRelease" property="isRelease"/>
+        <result column="alarm_level" property="alarmLevel"/>
+        <result column="release_content" property="releaseContent"/>
     </resultMap>
     <select id="listDto" resultMap="AlarmStatisticDtoResult">
         SELECT
@@ -100,15 +100,14 @@
         a.alarm_confidence AS alarmConfidence,
         a.line_dir AS lineDir,
         a.alarm_type AS alarmType,
-        a.alarm_attr AS alarmAttr,
         a.image_url AS imageUrl,
         a.released_by AS releasedBy,
         a.released_time AS releasedTime,
-        a.released_reason AS releasedReason,
-        a.released_type AS releasedType,
         c.railway_name AS railwayName,
+        a.alarm_level AS alarmLevel,
         a.remark AS remark,
-        a.is_lock AS isLock
+        a.is_release AS isRelease,
+        a.release_content AS releaseContent
         FROM
         msg_alarm AS a inner join
         base_camera_management AS b on a.camera_code=b.camera_code left join
@@ -234,14 +233,13 @@
         a.id  AS id,
         a.content AS content,
         a.alarm_confidence AS alarmConfidence,
-        a.alarm_attr AS alarmAttr,
         a.image_url AS imageUrl,
         a.released_by AS releasedBy,
-        a.is_lock AS isLock,
+        a.is_release AS isRelease,
         a.released_time AS releasedTime,
-        a.released_type AS releasedType,
-        a.released_reason AS releasedReason,
-        a.remark AS remark
+        a.alarm_level AS alarmLevel,
+        a.remark AS remark,
+        a.release_content AS releaseContent
         FROM
         msg_alarm AS a  join
         base_camera_management AS b on a.camera_code=b.camera_code
@@ -278,15 +276,12 @@
             <if test="alarmMile != null and alarmMile != 0">
                 and a.alarm_mile=#{alarmMile}
             </if>
-            <if test="isLock != null and isLock != 0">
-                and a.is_lock=#{isLock}
+            <if test="isRelease != null and isRelease != 0">
+                and a.is_release=#{isRelease}
             </if>
             <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>

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

@@ -16,7 +16,6 @@
         <result column="railwayType" property="railwayType"/>
         <result column="alarmMile" property="alarmMile"/>
         <result column="alarmType" property="alarmType"/>
-        <result column="alarmAttr" property="alarmAttr"/>
         <result column="imageUrl" property="imageUrl"/>
         <association property="baseCameraManagement" javaType="com.ozs.entity.BaseCameraManagement">
             <id column="id" property="id"/>
@@ -37,8 +36,6 @@
         a.line_dir AS lineDir,
         a.alarm_mile AS alarmMile,
         a.alarm_type AS alarmType,
-        a.alarm_attr AS alarmAttr,
-        a.image_url AS imageUrl,
         m.status,
         m.create_by,
         m.create_time,

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

@@ -40,8 +40,8 @@
             <if test="endAlarmTime != null and endAlarmTime != ''">
                 and b.alarm_time &lt;= #{endAlarmTime}
             </if>
-            <if test="isLock != null and isLock != ''">
-                and b.is_lock = #{isLock}
+            <if test="isRelease != null and isRelease != ''">
+                and b.is_release = #{isRelease}
             </if>
             <if test="railwayCode != null and railwayCode != ''">
                 and c.railway_code = #{railwayCode}

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

@@ -94,11 +94,11 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("根据相机ID、是否解除 获取相机信息、未解除信息")
     @Log(title = "相机台账管理", businessType = BusinessType.SELECT)
     public AjaxResult homeGetInfo(@RequestBody BaseCameraManagementHomeVo baseCameraManagementHomeVo) {
-        Integer isLock = baseCameraManagementHomeVo.getIsLock();
+        Integer isRelease = baseCameraManagementHomeVo.getIsRelease();
         Long id = baseCameraManagementHomeVo.getId();
         String cameraCode = baseCameraManagementHomeVo.getCameraCode();
-        // isLock  报警是否解除 1已解除2未解除
-        if (!StringUtils.isEmpty(isLock) && isLock == 1 && !StringUtils.isEmpty(id)) {
+        // isRelease  报警是否解除 1已解除2未解除
+        if (!StringUtils.isEmpty(isRelease) && isRelease == 1 && !StringUtils.isEmpty(id)) {
             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
             LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
             if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
@@ -115,7 +115,7 @@ public class BaseCameraManagementController extends BaseController {
             String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
             baseCameraManagement.setBeginMiles(begin);
             return AjaxResult.success(baseCameraManagement);
-        } else if (!StringUtils.isEmpty(isLock) && isLock == 2 && !StringUtils.isEmpty(cameraCode)) {
+        } else if (!StringUtils.isEmpty(isRelease) && isRelease == 2 && !StringUtils.isEmpty(cameraCode)) {
             MsgAlarm msgAlarm = msgAlarmService.selectByCameraCode(cameraCode);
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
             if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
@@ -138,9 +138,9 @@ public class BaseCameraManagementController extends BaseController {
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
-            String[] split = msgAlarm.getImageUrl().split(";");
-            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-            msgAlarmResp.setImageUrls(objects);
+//            String[] split = msgAlarm.getImageUrl().split(";");
+//            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
+//            msgAlarmResp.setImageUrls(objects);
             return AjaxResult.success(msgAlarmResp);
         }
         return null;
@@ -417,7 +417,7 @@ public class BaseCameraManagementController extends BaseController {
             list.add(1);
         } else {
             MsgAlarm msgAlarm = list1.get(0);
-            list.add(msgAlarm.getIsLock());
+            list.add(msgAlarm.getIsRelease());
         }
         return AjaxResult.success(list);
     }
@@ -729,20 +729,17 @@ public class BaseCameraManagementController extends BaseController {
                     msgAlarm.setReleasedByName(user.getNickName());
                 }
                 msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
-                msgAlarmResp.setIsLock(msgAlarm.getIsLock());
+                msgAlarmResp.setIsRelease(msgAlarm.getIsRelease());
                 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));
-                    log.info("publish--------" + objects);
-                    msgAlarmResp.setImageUrls(objects);
-                }
+//                if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
+//                    String[] split = msgAlarm.getImageUrl().split(";");
+//                    ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
+//                    log.info("publish--------" + objects);
+//                    msgAlarmResp.setImageUrls(objects);
+//                }
             }
             BeanUtils.copyProperties(baseCameraManagement, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());

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

@@ -158,9 +158,9 @@ public class MsgAlarmController extends BaseController {
 
         if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
             List<MsgAlarm> dto1 = page.getRecords().stream().map(o -> {
-                String[] split = o.getImageUrl().split(";");
-                ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-                o.setImageUrls(objects);
+//                String[] split = o.getImageUrl().split(";");
+//                ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
+//                o.setImageUrls(objects);
                 LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
                 if (!ObjectUtils.isEmpty(o.getCameraCode())) {
                     cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
@@ -187,9 +187,6 @@ public class MsgAlarmController extends BaseController {
                     wrapper.eq(MsgAlarmFrequency::getAlarmId, o.getAlarmId());
                 }
                 o.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
-                if (!ObjectUtils.isEmpty(o.getReleasedType())) {
-                    o.setReleasedTypeName(o.getReleasedType() == 1 ? "真实报警" : "误报警");
-                }
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);
@@ -218,9 +215,9 @@ public class MsgAlarmController extends BaseController {
         }
         List<MsgAlarm> msgAlarmList = msgAlarmService.msgAlarmList(msgAlarmVo);
         for (MsgAlarm msgAlarm : msgAlarmList) {
-            String[] split = msgAlarm.getImageUrl().split(";");
-            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-            msgAlarm.setImageUrls(objects);
+//            String[] split = msgAlarm.getImageUrl().split(";");
+//            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
+//            msgAlarm.setImageUrls(objects);
             LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
             if (!ObjectUtils.isEmpty(msgAlarm.getCameraCode())) {
                 cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
@@ -247,11 +244,8 @@ public class MsgAlarmController extends BaseController {
                 wrapper.eq(MsgAlarmFrequency::getAlarmId, msgAlarm.getAlarmId());
             }
             msgAlarm.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
-            if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
-                msgAlarm.setReleasedTypeName(msgAlarm.getReleasedType() == 1 ? "真实报警" : "误报警");
-            }
             msgAlarm.setLineDirName(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
-            msgAlarm.setIsLockName(msgAlarm.getIsLock() == 1 ? "已解除" : "未解除");
+            msgAlarm.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : "未解除");
             msgAlarm.setAlarmTypeName("泥石流");
         }
         ExcelUtil<MsgAlarm> util = new ExcelUtil<>(MsgAlarm.class);
@@ -275,9 +269,9 @@ public class MsgAlarmController extends BaseController {
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-            String[] split = msgAlarm.getImageUrl().split(";");
-            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-            msgAlarm.setImageUrls(objects);
+//            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());
@@ -315,9 +309,9 @@ public class MsgAlarmController extends BaseController {
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-            String[] split = msgAlarm.getImageUrl().split(";");
-            ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
-            msgAlarm.setImageUrls(objects);
+//            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());
@@ -340,23 +334,15 @@ public class MsgAlarmController extends BaseController {
         }
     }
 
-    @PutMapping(value = "/updateIsLock")
+    @PutMapping(value = "/updateIsRelease")
     @ApiOperation("根据报警信息ID解除报警")
     @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)
-    public AjaxResult updateIsLock(@RequestParam(value = "id") Long id,
-                                   @RequestParam(value = "releasedType",required = false) Integer releasedType,
-                                   @RequestParam(value = "releasedReason",required = false) String releasedReason) {
+    public AjaxResult updateIsRelease(@RequestParam(value = "id") Long id) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
-        msgAlarm.setIsLock(1);
+        msgAlarm.setIsRelease(1);
         msgAlarm.setUpdateBy(getUserId());
         msgAlarm.setReleasedBy(getUserId());
         msgAlarm.setReleasedTime(new Date());
-        if (!ObjectUtils.isEmpty(msgAlarm.getReleasedReason())) {
-            msgAlarm.setReleasedReason(releasedReason);
-        }
-        if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
-            msgAlarm.setReleasedType(releasedType);
-        }
         return AjaxResult.success(msgAlarmService.updateById(msgAlarm));
     }
 
@@ -416,17 +402,15 @@ public class MsgAlarmController extends BaseController {
                     BaseUser buser = baseUserService.getUser(l.getReleasedBy());
                     l.setReleasedByName(buser.getNickName());
                 }
-                if (!ObjectUtils.isEmpty(l.getReleasedType())) {
-                    l.setReleasedTypeName(l.getReleasedType() == 1 ? "真实报警" : "误报警");
-                }
+                
                 if (!ObjectUtils.isEmpty(l.getLineDir())) {
                     l.setLineDirName(l.getLineDir() == 1 ? "上行" : "下行");
                 }
                 if (!ObjectUtils.isEmpty(l.getAlarmType())) {
                     l.setAlarmTypeName(dictDataService.selectDictLabel("sys_alarm_type", String.valueOf(l.getAlarmType())));
                 }
-                if (!ObjectUtils.isEmpty(l.getIsLock())) {
-                    l.setIsLockName(l.getIsLock() == 1 ? "已解除" : "未解除");
+                if (!ObjectUtils.isEmpty(l.getIsRelease())) {
+                    l.setIsReleaseName(l.getIsRelease() == 1 ? "已解除" : "未解除");
                 }
             });
         }
@@ -539,9 +523,6 @@ public class MsgAlarmController extends BaseController {
                         BaseUser buser = baseUserService.getUser(l.getReleasedBy());
                         l.setReleasedByName(buser.getNickName());
                     }
-                    if (!ObjectUtils.isEmpty(l.getReleasedType())) {
-                        l.setReleasedTypeName(l.getReleasedType() == 1 ? "真实报警" : "误报警");
-                    }
                     if (!ObjectUtils.isEmpty(l.getAlarmType())) {
                         String alarmType = l.getAlarmType();
                         String alarmTypeValue = dictDataService.selectDictLabel("sys_alarm_type", alarmType);
@@ -552,8 +533,8 @@ public class MsgAlarmController extends BaseController {
                         String lineDirValue = dictDataService.selectDictLabel("sys_line_dir", lineDir);
                         l.setLineDirValue(lineDirValue);
                     }
-                    if (!ObjectUtils.isEmpty(l.getIsLock())) {
-                        l.setIsLockName(l.getIsLock() == 1 ? "已解除" : "未解除");
+                    if (!ObjectUtils.isEmpty(l.getIsRelease())) {
+                        l.setIsReleaseName(l.getIsRelease() == 1 ? "已解除" : "未解除");
                     }
                 });
             }