Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -74,4 +74,9 @@ public class MsgAlarmVo extends PageVo implements Serializable {
      * 状态：1未读；2已读
      */
     private Integer status;
+
+    /**
+     * 报警里程位置
+     */
+    private String alarmMiles;
 }

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

@@ -8,7 +8,7 @@
         join msg_alarm AS b on a.alarm_id = b.alarm_id
         join base_camera_management AS c on b.camera_code = c.camera_code
         <where>
-            status = 1
+            a.status = 1
             <if test="!dsFlay">
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">
@@ -35,7 +35,7 @@
         join msg_alarm AS b on a.alarm_id = b.alarm_id
         join base_camera_management AS c on b.camera_code = c.camera_code
         <where>
-            status = 1
+            a.status = 1
             <if test="!dsFlay">
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">
@@ -80,6 +80,9 @@
                     </if>
                 </trim>
             </if>
+            <if test="status != null and status != ''">
+                and a.status = #{status}
+            </if>
             <if test="alarmType != null and alarmType != ''">
                 and b.alarm_type = #{alarmType}
             </if>

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

@@ -80,7 +80,7 @@ import java.util.stream.Collectors;
 @RequestMapping("/service/baseCameraManagement")
 @Slf4j
 public class BaseCameraManagementController extends BaseController {
-    public static final String PATTERN = "^K([0-9]+)\\+([0-9]+)$";
+    public static final String PATTERN = "^K([0-9]+)\\+([0-9]{1,3})$";
     @Resource
     BaseCameraManagementService baseCameraManagementService;
     @Resource
@@ -416,6 +416,7 @@ public class BaseCameraManagementController extends BaseController {
         SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format1 = dateFormat1.format(new Date());
         list.add(format1);
+        list.add(msgAlarm.getLineDir());
         return AjaxResult.success(list);
     }
 
@@ -594,7 +595,7 @@ public class BaseCameraManagementController extends BaseController {
     /**
      * 视频服务树形结构
      *
-     * @param name      线路
+     * @param railwayCode      线路
      * @param lineDir   行别
      * @param mils 里程位置
      * @return
@@ -602,9 +603,9 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("视频服务树形结构")
     @GetMapping("/cameraTree")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-    public AjaxResult cameraTree(@RequestParam(value = "name", required = false) String name,
+    public AjaxResult cameraTree(@RequestParam(value = "railwayCode", required = false) String railwayCode,
                                  @RequestParam(value = "lineDir", required = false) Integer lineDir,
-                                 @RequestParam(value = "beginMile", required = false) String mils) {
+                                 @RequestParam(value = "mils", required = false) String mils) {
         Integer milsInt = null;
         if (!StringUtils.isEmpty(mils)) {
             if (!mils.matches(PATTERN)) {
@@ -612,7 +613,7 @@ public class BaseCameraManagementController extends BaseController {
             }
             milsInt = AppendUtils.stringSplit(mils);
         }
-        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(name, lineDir, milsInt);
+        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(railwayCode, lineDir, milsInt);
         List<CameraTree> children = cameraTree.getChildren();
         children.sort(new Comparator<CameraTree>() {
             @Override

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

@@ -66,6 +66,7 @@ import java.util.stream.Collectors;
 @RequestMapping("/service/msgAlarm")
 public class MsgAlarmController extends BaseController {
     private static final Logger log = LoggerFactory.getLogger(MsgAlarmController.class);
+    public static final String PATTERN = "^K([0-9]+)\\+([0-9]{1,3})$";
     @Resource
     MsgAlarmService msgAlarmService;
     @Resource
@@ -145,6 +146,14 @@ 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)) {
+                return error("里程位置填写格式不正确!");
+            }else {
+                int miles = AppendUtils.stringSplit(msgAlarmVo.getAlarmMiles());
+                msgAlarmVo.setAlarmMile(miles);
+            }
+        }
         IPage<MsgAlarm> page = msgAlarmService.queryPage(msgAlarmVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
@@ -201,6 +210,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);
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
@@ -234,6 +246,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);
             BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());

hazard-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -140,7 +140,8 @@ public class SysRoleController extends BaseController
         {
             return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
-        role.setCreateBy(getUsername());
+        role.setCreateBy(getUserId());
+        role.setUpdateBy(getUserId());
         return toAjax(roleService.insertRole(role));
 
     }
@@ -163,7 +164,7 @@ public class SysRoleController extends BaseController
         {
             return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
-        role.setUpdateBy(getUsername());
+        role.setUpdateBy(getUserId());
 
         if (roleService.updateRole(role) > 0)
         {

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -233,7 +233,8 @@ public class SysUserController extends BaseController {
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
-        user.setCreateBy(getUsername());
+        user.setCreateBy(getUserId());
+        user.setUpdateBy(getUserId());
         return toAjax(userService.saveUser(user));
     }
 
@@ -255,7 +256,7 @@ public class SysUserController extends BaseController {
                 && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
-        user.setUpdateBy(getUsername());
+        user.setUpdateBy(getUserId());
         return toAjax(userService.updateUsers(user));
     }