解除说明修改

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

@@ -150,7 +150,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private String remark;
 
     /**
-     * 解除报警类型1真实报警2误报警
+     * 解除报警类型1实报2误报
      */
     private Integer releasedType;
 
@@ -161,7 +161,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     private String releasedReason;
 
     /**
-     * 解除报警类型名称   1真实报警2误报警
+     * 解除报警类型名称   1实报2误报
      */
     @TableField(exist = false)
     @Excel(name = "解除报警类型")

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

@@ -108,12 +108,12 @@ public class AlarmStatisticDto {
     private String releasedReason;
 
     /**
-     * 解除报警类型1真实报警2误报警
+     * 解除报警类型1实报2误报
      */
     private Integer releasedType;
 
     /**
-     * 解除报警类型名称   1真实报警2误报警
+     * 解除报警类型名称   1实报2误报
      */
     @Excel(name = "解除报警类型")
     private String releasedTypeName;

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

@@ -51,12 +51,12 @@ public class AlarmStatisticVo {
     private String releasedReason;
 
     /**
-     * 解除报警类型1真实报警2误报警
+     * 解除报警类型1实报2误报
      */
     private Integer releasedType;
 
     /**
-     * 解除报警类型名称   1真实报警2误报警
+     * 解除报警类型名称   1实报2误报
      */
     private String releasedTypeName;
 

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

@@ -109,7 +109,7 @@ public class MsgAlarmResp implements Serializable {
     private String deptName;
 
     /**
-     * 解除报警类型1真实报警2误报警
+     * 解除报警类型1实报2误报
      */
     private Integer releasedType;
 
@@ -133,7 +133,7 @@ public class MsgAlarmResp implements Serializable {
     private String releasedByName;
 
     /**
-     * 解除报警类型名称   1真实报警2误报警
+     * 解除报警类型名称   1实报2误报
      */
     private String releasedTypeName;
 

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

@@ -90,7 +90,7 @@ public class MsgAlarmVo extends PageVo implements Serializable {
     private String endMiles;
 
     /**
-     * 解除报警类型1真实报警2误报警
+     * 解除报警类型1实报2误报
      */
     private Integer releasedType;
 }

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

@@ -806,7 +806,7 @@ public class BaseCameraManagementController extends BaseController {
                         "大小" + split1[4] + "×" + split1[5];
                 msgAlarmResp.setAlarmAttrName(stringBuilder);
                 if (!ObjectUtils.isEmpty(msgAlarmResp.getReleasedType())) {
-                    msgAlarmResp.setReleasedTypeName(msgAlarmResp.getReleasedType() == 1 ? "真实报警" : "误报警");
+                    msgAlarmResp.setReleasedTypeName(msgAlarmResp.getReleasedType() == 1 ? "实报" : "误报");
                 }
                 if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
                     String[] split = msgAlarm.getImageUrl().split(";");

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

@@ -218,7 +218,7 @@ public class MsgAlarmController extends BaseController {
                 }
                 o.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
                 if (!ObjectUtils.isEmpty(o.getReleasedType())) {
-                    o.setReleasedTypeName(o.getReleasedType() == 1 ? "真实报警" : "误报警");
+                    o.setReleasedTypeName(o.getReleasedType() == 1 ? "实报" : "误报");
                 }
                 return o;
             }).collect(Collectors.toList());
@@ -278,7 +278,7 @@ public class MsgAlarmController extends BaseController {
             }
             msgAlarm.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
             if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
-                msgAlarm.setReleasedTypeName(msgAlarm.getReleasedType() == 1 ? "真实报警" : "误报警");
+                msgAlarm.setReleasedTypeName(msgAlarm.getReleasedType() == 1 ? "实报" : "误报");
             }
             msgAlarm.setLineDirName(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
             msgAlarm.setIsLockName(msgAlarm.getIsLock() == 1 ? "已解除" : "未解除");
@@ -322,7 +322,7 @@ public class MsgAlarmController extends BaseController {
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
             if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
-                msgAlarmResp.setReleasedTypeName(msgAlarmResp.getReleasedType() == 1 ? "真实报警" : "误报警");
+                msgAlarmResp.setReleasedTypeName(msgAlarmResp.getReleasedType() == 1 ? "实报" : "误报");
             }
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             return AjaxResult.success(msgAlarmResp);
@@ -356,7 +356,7 @@ public class MsgAlarmController extends BaseController {
                 msgAlarm.setReleasedByName(user.getNickName());
             }
             if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
-                msgAlarm.setReleasedTypeName(msgAlarm.getReleasedType() == 1 ? "真实报警" : "误报警");
+                msgAlarm.setReleasedTypeName(msgAlarm.getReleasedType() == 1 ? "实报" : "误报");
             }
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
@@ -485,7 +485,7 @@ public class MsgAlarmController extends BaseController {
                     l.setReleasedByName(buser.getNickName());
                 }
                 if (!ObjectUtils.isEmpty(l.getReleasedType())) {
-                    l.setReleasedTypeName(l.getReleasedType() == 1 ? "真实报警" : "误报警");
+                    l.setReleasedTypeName(l.getReleasedType() == 1 ? "实报" : "误报");
                 }
                 if (!ObjectUtils.isEmpty(l.getLineDir())) {
                     l.setLineDirName(l.getLineDir() == 1 ? "上行" : "下行");
@@ -608,7 +608,7 @@ public class MsgAlarmController extends BaseController {
                         l.setReleasedByName(buser.getNickName());
                     }
                     if (!ObjectUtils.isEmpty(l.getReleasedType())) {
-                        l.setReleasedTypeName(l.getReleasedType() == 1 ? "真实报警" : "误报警");
+                        l.setReleasedTypeName(l.getReleasedType() == 1 ? "实报" : "误报");
                     }
                     if (!ObjectUtils.isEmpty(l.getAlarmType())) {
                         String alarmType = l.getAlarmType();