报警列表增加报警解除人名称

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

@@ -170,4 +170,9 @@ public class MsgAlarm extends BaseEntity implements Serializable {
      */
     @TableField(exist = false)
     private List<String> imageUrls;
+
+    /**
+     * 解除人真实姓名
+     */
+    private String releasedByName;
 }

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

@@ -62,7 +62,7 @@
     </select>
 
     <select id="getUser" resultType="com.ozs.service.entity.BaseUser" parameterType="java.lang.String">
-        select user_id userId, dept_id deptId, data_permission dataPermission from sys_user where user_id = #{userId}
+        select user_id userId, dept_id deptId, data_permission dataPermission,nick_name nickName from sys_user where user_id = #{userId}
     </select>
     <select id="getUserName" resultType="com.ozs.service.entity.BaseUser" parameterType="java.lang.String">
         select user_id userId, dept_id deptId, data_permission dataPermission from sys_user where user_name = #{userName}

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

@@ -80,6 +80,8 @@ public class MsgAlarmController extends BaseController {
     private ISysDictDataService dictDataService;
     @Autowired
     private DataScoreUtil dataScoreUtil;
+    @Resource
+    private BaseUserService baseUserService;
 
     /**
      * web更多消息-总数，已读数
@@ -157,6 +159,10 @@ public class MsgAlarmController extends BaseController {
                 }
                 BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
                 o.setRailwayName(baseRailwayManagement.getRailwayName());
+                if (StringUtils.isNotEmpty(o.getReleasedBy())) {
+                    BaseUser user = baseUserService.getUser(o.getReleasedBy());
+                    o.setReleasedByName(user.getNickName());
+                }
                 String mils = AppendUtils.stringAppend(cameraManagement.getInstallMile());
                 o.setAlarmMiles(mils);
                 String end = AppendUtils.stringAppend(cameraManagement.getEndMile());
@@ -198,7 +204,7 @@ public class MsgAlarmController extends BaseController {
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             return AjaxResult.success(msgAlarmResp);
-        }else {
+        } else {
             return success("无报警信息数据");
         }
     }