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

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

@@ -169,13 +169,13 @@ public class MsgAlarmController extends BaseController {
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
         msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), msgAlarmVo);
         if (!ObjectUtils.isEmpty(msgAlarmVo.getAlarmMile())) {
-                msgAlarmVo.setAlarmMile(msgAlarmVo.getAlarmMile() * 1000);
+            msgAlarmVo.setAlarmMile(msgAlarmVo.getAlarmMile() * 1000);
         }
         if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginMile())) {
-                msgAlarmVo.setBeginMile(msgAlarmVo.getBeginMile() * 1000);
+            msgAlarmVo.setBeginMile(msgAlarmVo.getBeginMile() * 1000);
         }
         if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMile())) {
-                msgAlarmVo.setEndMile(msgAlarmVo.getEndMile() * 1000);
+            msgAlarmVo.setEndMile(msgAlarmVo.getEndMile() * 1000);
         }
         IPage<MsgAlarm> page = msgAlarmService.queryPage(msgAlarmVo);
         page.setTotal(page.getTotal());
@@ -222,7 +222,7 @@ public class MsgAlarmController extends BaseController {
         }
         return AjaxResult.success(page);
     }
-    
+
     /**
      * 导出报警消息
      *
@@ -317,6 +317,9 @@ public class MsgAlarmController extends BaseController {
             msgAlarmResp.setBeginMile(endMile);
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
+            if (!ObjectUtils.isEmpty(msgAlarm.getReleasedType())) {
+                msgAlarmResp.setReleasedTypeName(msgAlarmResp.getReleasedType() == 1 ? "真实报警" : "误报警");
+            }
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             return AjaxResult.success(msgAlarmResp);
         } else {
@@ -373,8 +376,8 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation("根据报警信息ID解除报警")
     @Log(title = "报警信息管理", businessType = BusinessType.UPDATE)
     public AjaxResult updateIsLock(@RequestParam(value = "id") Long id,
-                                   @RequestParam(value = "releasedType",required = false) Integer releasedType,
-                                   @RequestParam(value = "releasedReason",required = false) String releasedReason) {
+                                   @RequestParam(value = "releasedType", required = false) Integer releasedType,
+                                   @RequestParam(value = "releasedReason", required = false) String releasedReason) {
         MsgAlarm msgAlarm = msgAlarmService.getById(id);
         msgAlarm.setIsLock(1);
         msgAlarm.setUpdateBy(getUserId());
@@ -509,30 +512,30 @@ public class MsgAlarmController extends BaseController {
         }
 
         List<Integer> list1 = new ArrayList<>();
-            if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
-                list.forEach(l -> {
-                    list1.add(l.getMonthsta());
-                });
-            }
-            AlarmStatisticMonthDto dto;
-            for (int i = 0; i < numbs.size(); i++) {
-                if (!list1.contains(numbs.get(i))) {
-                    dto = new AlarmStatisticMonthDto();
-                    dto.setMonthsta(numbs.get(i));
-                    dto.setFrequency(0);
-                    list.add(dto);
-                }
+        if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
+            list.forEach(l -> {
+                list1.add(l.getMonthsta());
+            });
+        }
+        AlarmStatisticMonthDto dto;
+        for (int i = 0; i < numbs.size(); i++) {
+            if (!list1.contains(numbs.get(i))) {
+                dto = new AlarmStatisticMonthDto();
+                dto.setMonthsta(numbs.get(i));
+                dto.setFrequency(0);
+                list.add(dto);
             }
-            if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
-                Collections.sort(list, new Comparator<AlarmStatisticMonthDto>() {
-                    @Override
-                    public int compare(AlarmStatisticMonthDto o1, AlarmStatisticMonthDto o2) {
+        }
+        if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
+            Collections.sort(list, new Comparator<AlarmStatisticMonthDto>() {
+                @Override
+                public int compare(AlarmStatisticMonthDto o1, AlarmStatisticMonthDto o2) {
 
-                        return o1.getMonthsta().compareTo(o2.getMonthsta());
-                    }
-                });
-            }
-            return AjaxResult.success(list);
+                    return o1.getMonthsta().compareTo(o2.getMonthsta());
+                }
+            });
+        }
+        return AjaxResult.success(list);
     }
 
 

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

@@ -7,10 +7,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 
+import com.ozs.common.core.domain.entity.SysUser;
+import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.utils.ImgUtil;
 import com.ozs.common.utils.MinioUtils;
+import com.ozs.common.utils.SecurityUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.uuid.IdUtils;
+import com.ozs.framework.web.service.TokenService;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.MsgAlarm;
@@ -46,6 +50,11 @@ import java.util.UUID;
 @RequestMapping("/app/mine")
 @Slf4j
 public class GeoHazardMineController extends BaseController {
+    public static final String PW_PATTERN = "^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,20}$";
+    @Autowired
+    private ISysUserService userService;
+    @Autowired
+    private TokenService tokenService;
     @Value("${file.avatarUrl:#{null}}")
     private String avatarURL;
     @Value("${file.filreUrl:#{null}}")
@@ -98,9 +107,29 @@ public class GeoHazardMineController extends BaseController {
      */
     @RequestMapping(value = "/updatePassword", method = RequestMethod.POST)
     @ApiOperation("app修改密码")
-    public AjaxResult updatePassword(@RequestParam("userId") String userId, @RequestParam("newPwd") String newPwd) {
-        sysUserService.updatePassword(userId, newPwd);
-        return AjaxResult.success();
+    public AjaxResult updatePassword(@RequestBody SysUser user) {
+//        sysUserService.updatePassword(userId, newPwd);
+//        return AjaxResult.success();
+        LoginUser loginUser = getLoginUser();
+        if (!SecurityUtils.matchesPassword(user.getPassword(), loginUser.getPassword())) {
+            return error("修改密码失败，旧密码错误");
+        }
+        boolean matches = user.getNewPassword().matches(PW_PATTERN);
+        if (!matches) {
+            return error("您的密码太简单!需要包含大小英文、数字、特殊字符、并且长度8-20");
+        }
+        if (SecurityUtils.matchesPassword(user.getNewPassword(), loginUser.getPassword())) {
+            return error("新密码不能与旧密码相同");
+        }
+        user.setPassword(SecurityUtils.encryptPassword(user.getNewPassword()));
+        user.setUpdateBy(getUsername());
+        if (userService.resetPwd(user) > 0) {
+            // 更新缓存用户密码
+            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(user.getNewPassword()));
+            tokenService.setLoginUser(loginUser);
+            return success();
+        }
+        return error("修改密码异常，请联系管理员");
     }
 
     /**