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

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

@@ -66,6 +66,10 @@ public class MsgAlarmResp implements Serializable {
      * 报警里程位置
      */
     private String alarmMile;
+    /**
+     * 通道编号
+     */
+    private String channel;
 
 
     /**

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

@@ -175,7 +175,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             }
         }
         if (failureNum > 0) {
-            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            failureMsg.insert(0, "很抱歉，数据导入成功！共 " + successNum + " 条,导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
         } else {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条。");

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

@@ -19,7 +19,8 @@
         a.card_num AS cardNum,
         a.start_recording AS startRecording,
         a.task_id AS taskId,
-        a.create_time AS createTime
+        a.create_time AS createTime,
+        a.remark AS remark
         FROM
         base_camera_management a
         <where>

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

@@ -375,9 +375,10 @@ public class BaseCameraManagementController extends BaseController {
         if (baseCameraManagement.getBeginMile() > baseCameraManagement.getEndMile()) {
             return error("监控范围开始里程位置不能大于监控范围结束里程位置");
         }
+        BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
         baseCameraManagement.setUpdateBy(getUserId());
+        baseCameraManagement.setCreateBy(management.getCreateBy());
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-        BaseCameraManagement management = baseCameraManagementService.getById(baseCameraManagement.getId());
         if (!ObjectUtils.isEmpty(management.getCameraCode())) {
             queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, management.getCameraCode());
         }

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

@@ -283,6 +283,11 @@ public class MsgAlarmController extends BaseController {
             msgAlarm.setLineDirName(msgAlarm.getLineDir() == 1 ? "上行" : "下行");
             msgAlarm.setIsLockName(msgAlarm.getIsLock() == 1 ? "已解除" : "未解除");
             msgAlarm.setAlarmTypeName("泥石流");
+            String[] split1 = msgAlarm.getAlarmAttr().split(",");
+            String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
+                    "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
+                    "大小" + split1[4] + "×" + split1[5];
+            msgAlarm.setAlarmAttr(stringBuilder);
         }
         ExcelUtil<MsgAlarm> util = new ExcelUtil<>(MsgAlarm.class);
         util.exportExcel(response, msgAlarmList, "报警信息管理");
@@ -371,7 +376,7 @@ public class MsgAlarmController extends BaseController {
             SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
             msgAlarmResp.setDeptName(sysDept.getDeptName());
             String[] split1 = msgAlarm.getAlarmAttr().split(",");
-            String stringBuilder = "画面大小为" + split1[0] + "×" + split1[1] + "," +
+            String stringBuilder = "画面,大小为" + split1[0] + "×" + split1[1] + "," +
                     "泥石流范围为左上角坐标(" + split1[2] + "," + split1[3] + ")" +
                     "大小" + split1[4] + "×" + split1[5];
             msgAlarmResp.setAlarmAttrName(stringBuilder);
@@ -403,12 +408,16 @@ public class MsgAlarmController extends BaseController {
         LambdaQueryWrapper<BaseCameraManagement> base = new LambdaQueryWrapper<>();
         base.eq(BaseCameraManagement::getCameraCode, msgAlarm.getCameraCode());
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(base);
-        String url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
-                msgAlarm.getAlarmTime(),
-                msgAlarm.getReleasedTime(),
-                false);
+        String url = null;
+        try {
+            url = CameraUtil.historyPlayListStr(baseCameraManagement.getChannel(),
+                    msgAlarm.getAlarmTime(),
+                    msgAlarm.getReleasedTime(),
+                    false);
+        } catch (Exception exception) {
+            log.error(exception.getMessage());
+        }
         msgAlarm.setReleasedUrl(url);
-        msgAlarmService.updateById(msgAlarm);
         boolean b = msgAlarmService.updateById(msgAlarm);
 //        LambdaQueryWrapper<MsgAppPush> wrapper = new LambdaQueryWrapper<>();
 //        wrapper.eq(MsgAppPush::getAlarmId, msgAlarm.getAlarmId());

hazard-admin/src/main/java/com/ozs/web/controller/app/GeoHazardMineController.java

@@ -111,6 +111,8 @@ public class GeoHazardMineController extends BaseController {
 //        sysUserService.updatePassword(userId, newPwd);
 //        return AjaxResult.success();
         LoginUser loginUser = getLoginUser();
+        String password = user.getPassword();
+        String s = SecurityUtils.encryptPassword(password);
         if (!SecurityUtils.matchesPassword(user.getPassword(), loginUser.getPassword())) {
             return error("修改密码失败，旧密码错误");
         }
@@ -123,6 +125,7 @@ public class GeoHazardMineController extends BaseController {
         }
         user.setPassword(SecurityUtils.encryptPassword(user.getNewPassword()));
         user.setUpdateBy(getUsername());
+        user.setId(getId());
         if (userService.resetPwd(user) > 0) {
             // 更新缓存用户密码
             loginUser.getUser().setPassword(SecurityUtils.encryptPassword(user.getNewPassword()));

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

@@ -58,13 +58,6 @@ public class SysLoginController extends BaseController {
      */
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody) {
-        // 判断账号是否在其他电脑登陆
-        String userId = loginService.getUserIdByUserName(loginBody.getUsername());
-        log.info("111111111-----" + userId);
-        if (!StringUtils.isEmpty(userId)) {
-            log.info("22222222-----" + userId);
-            redisCache.deleteObject(userId);
-        }
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),

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

@@ -178,17 +178,17 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
-        String password=null;
+        String password = null;
         ExcelUtil<SysUsers> util = new ExcelUtil<SysUsers>(SysUsers.class);
         List<SysUsers> userList = util.importExcel(file.getInputStream());
         String userId = getUserId();
         List<SysDictData> data = dictTypeService.selectDictDataByType("default_password");
-        if(!ObjectUtils.isEmpty(data.get(0).getDictValue())){
-            password=data.get(0).getDictValue();
-        }else {
-            password=defaultPassword;
+        if (!ObjectUtils.isEmpty(data.get(0).getDictValue())) {
+            password = data.get(0).getDictValue();
+        } else {
+            password = defaultPassword;
         }
-        String message = userService.importUser(userList, updateSupport, userId,password);
+        String message = userService.importUser(userList, updateSupport, userId, password);
         return success(message);
     }
 
@@ -227,10 +227,10 @@ public class SysUserController extends BaseController {
         if (StringUtils.isNotNull(id)) {
             SysUser sysUser = userService.selectUserById(id);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
-            if (SysUser.isAdmin(id)){
+            if (SysUser.isAdmin(id)) {
                 List<SysRole> roLe = roles.stream().filter(r -> r.getRoleKey().equals("admin")).collect(Collectors.toList());
-                ajax.put("roleIds", roLe.stream().map(SysRole::getRoleId).collect(Collectors.toList())); 
-            }else {
+                ajax.put("roleIds", roLe.stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+            } else {
                 ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
             }
         }
@@ -244,17 +244,17 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody SysUser user) {
-        String password=null;
+        String password = null;
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         }
         user.setCreateBy(getUserId());
         user.setUpdateBy(getUserId());
         List<SysDictData> data = dictTypeService.selectDictDataByType("default_password");
-        if(!ObjectUtils.isEmpty(data.get(0).getDictValue())){
-            password=data.get(0).getDictValue();
-        }else {
-            password=defaultPassword;
+        if (!ObjectUtils.isEmpty(data.get(0).getDictValue())) {
+            password = data.get(0).getDictValue();
+        } else {
+            password = defaultPassword;
         }
         user.setPassword(SecurityUtils.encryptPassword(password));
         return toAjax(userService.saveUser(user));
@@ -270,7 +270,7 @@ public class SysUserController extends BaseController {
 //        userService.checkUserAllowed(user);
 //        userService.checkUserDataScope(user.getId());
         BaseUser baseUser = baseUserService.getUserById(user.getId());
-        if (baseUser.getUserName().equals("admin")){
+        if (baseUser.getUserName().equals("admin")) {
             return success("admin账号不能修改");
         }
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
@@ -325,7 +325,7 @@ public class SysUserController extends BaseController {
         }
         for (Long id : Ids) {
             BaseUser baseUser = baseUserService.getUserById(id);
-            if (baseUser.getUserName().equals("admin")){
+            if (baseUser.getUserName().equals("admin")) {
                 return success("admin账号不能修改");
             }
         }
@@ -355,14 +355,14 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @GetMapping("/resetPwd/{id}")
     public AjaxResult resetPwd(@PathVariable(value = "id") Long id) {
-        String password=null;
+        String password = null;
         SysUser user = new SysUser();
         user.setId(id);
         List<SysDictData> data = dictTypeService.selectDictDataByType("default_password");
-        if(!ObjectUtils.isEmpty(data.get(0).getDictValue())){
-            password=data.get(0).getDictValue();
-        }else {
-            password=defaultPassword;
+        if (!ObjectUtils.isEmpty(data.get(0).getDictValue())) {
+            password = data.get(0).getDictValue();
+        } else {
+            password = defaultPassword;
         }
         user.setPassword(SecurityUtils.encryptPassword(password));
         user.setUpdateBy(getUsername());
@@ -380,7 +380,7 @@ public class SysUserController extends BaseController {
         if (!SecurityUtils.matchesPassword(user.getPassword(), loginUser.getPassword())) {
             return error("修改密码失败，旧密码错误");
         }
-        boolean matches =user.getNewPassword().matches(PW_PATTERN);
+        boolean matches = user.getNewPassword().matches(PW_PATTERN);
         if (!matches) {
             return error("您的密码太简单!需要包含大小英文、数字、特殊字符、并且长度8-20");
         }
@@ -389,7 +389,7 @@ public class SysUserController extends BaseController {
         }
         user.setPassword(SecurityUtils.encryptPassword(user.getNewPassword()));
         user.setUpdateBy(getUsername());
-        if (userService.resetPwd(user)>0) {
+        if (userService.resetPwd(user) > 0) {
             // 更新缓存用户密码
             loginUser.getUser().setPassword(SecurityUtils.encryptPassword(user.getNewPassword()));
             tokenService.setLoginUser(loginUser);
@@ -456,7 +456,7 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     public AjaxResult dataPermission(@PathVariable("id") Long id, @PathVariable("dataPermission") Integer dataPermission) {
         BaseUser baseUser = baseUserService.getUserById(id);
-        if (baseUser.getUserName().equals("admin")){
+        if (baseUser.getUserName().equals("admin")) {
             return success("admin账号不能修改");
         }
         if (userService.dataPermission(id, dataPermission)) {

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -214,7 +214,7 @@ public class CameraUtil {
         String param = "channel=" + channel + "&startTime=" + startTime + "&endTime=" + endTime;
         String s = HttpUtils.sendGet(webUrl + "/api/record/flv/list", param);
         // 视频拼接
-        if (!StringUtils.isBlank(s) || "null".equals(s)) {
+        if (!StringUtils.isBlank(s) && !"null".equals(s) && !s.startsWith("<!DOCTYPE html>")) {
             List<Map<String, Object>> maps = JSON.parseArray(s, Map.class);
             if (ObjectUtils.isEmpty(maps)) {
                 return null;