报警详情

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

@@ -38,9 +38,10 @@ public class MsgAlarmResp implements Serializable {
     private String railwayName;
 
     /**
-     * 报警病害类型（目前只有1泥石流，后续可扩展使用）
+     * 报警病害类型（1泥石流2异物侵线 3断轨监测）
      */
     private Integer alarmType;
+    private String alarmTypeStr;
 
     /**
      * 报警行别(1上行2下行)
@@ -72,6 +73,12 @@ public class MsgAlarmResp implements Serializable {
      * 报警是否解除 1已解除2未解除
      */
     private Integer isRelease;
+    private String  isReleaseName;
+
+    /**
+     * 解除内容
+     */
+    private String releaseContent;
 
     /**
      * 解除时间

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

@@ -311,10 +311,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());
-//            }
+            if (!StringUtils.isEmptySunhh(msgAlarm.getReleasedBy())) {
+                BaseUser user = baseUserService.getUser(msgAlarm.getReleasedBy());
+                msgAlarm.setReleasedByName(user.getNickName());
+            }
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
 //            msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
@@ -325,6 +325,8 @@ public class MsgAlarmController extends BaseController {
             String mile = AppendUtils.stringAppend(msgAlarm.getAlarmMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setLineDirStr(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
+            msgAlarmResp.setAlarmTypeStr(msgAlarm.getAlarmType() == 1 ? "泥石流" : (msgAlarm.getAlarmType() == 2 ? "异物侵线" : (msgAlarm.getAlarmType() == 3 ? "断轨监测" : "未知")));
+            msgAlarmResp.setIsReleaseName(msgAlarm.getIsRelease() == 1 ? "已解除" : (msgAlarm.getIsRelease() == 2 ? "未解除" : "未知"));
             List<SysDictData> data = dictTypeService.selectDictDataByType("sys_alarm_type");
             data.stream().forEach(sysDictData -> {
                 if (sysDictData.getDictValue().equals(msgAlarm.getAlarmType().toString())) {