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

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

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.domain.vo.SysRoleRequestVo;
+import com.ozs.common.core.domain.vo.SysUserVo;
+import com.ozs.system.service.DataScoreUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -63,6 +65,8 @@ public class SysRoleController extends BaseController
 
     @Autowired
     private ISysDeptService deptService;
+    @Autowired
+    private DataScoreUtil dataScoreUtil;
 
 //    @PreAuthorize("@ss.hasPermi('system:role:list')")
 //    @GetMapping("/list")
@@ -78,6 +82,7 @@ public class SysRoleController extends BaseController
     @ApiOperation("根据条件分页查询角色数据")
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody SysRoleRequestVo vo) {
+//        vo= (SysRoleRequestVo) dataScoreUtil.setDataScore(getUserId(),vo);
         LambdaQueryWrapper<SysRole> lw = new LambdaQueryWrapper<SysRole>();
         lw.eq(SysRole::getDelFlag, 1);
         if (!StringUtils.isBlank(vo.getRoleName())) {
@@ -89,6 +94,18 @@ public class SysRoleController extends BaseController
         if (!StringUtils.isBlank(vo.getStatus())) {
             lw.eq(SysRole::getStatus, vo.getStatus());
         }
+        
+//        if(!vo.getDsFlay()){
+//            if (!ObjectUtils.isEmpty(vo.getDsUserId())){
+//                lw.eq(SysRole::getCreateBy, vo.getDsUserId()).or();
+//            }
+//            if (!ObjectUtils.isEmpty(vo.getDsDeptId())){
+//                lw.eq(SysRole::getDeptId,vo.getDsDeptId()).or();
+//            }
+//            if (!ObjectUtils.isEmpty(vo.getDsDeptIds())){
+//                lw.in(SysRole::getDeptId,vo.getDsDeptIds());
+//            }
+//        }
         IPage<SysRole> page = roleService.page(new Page<SysRole>(vo.getPageNum(), vo.getPageSize()), lw);
         return success(page);
 

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

@@ -22,11 +22,14 @@ 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;
+import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.MsgAlarmVo;
+import com.ozs.system.service.DataScoreUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
@@ -75,7 +78,10 @@ public class SysUserController extends BaseController {
     private TokenService tokenService;
     @Autowired
     private ISysRoleService iSysRoleService;
-
+    @Value("${base.defaultPassword:yn5aq5Mt.106.tky}")
+    private String defaultPassword;
+    @Autowired
+    private DataScoreUtil dataScoreUtil;
 //    /**
 //     * 获取用户列表
 //     */
@@ -98,6 +104,7 @@ public class SysUserController extends BaseController {
     @PostMapping("/list")
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     public AjaxResult list(@RequestBody SysUserVo sysUserVo) {
+        sysUserVo= (SysUserVo) dataScoreUtil.setDataScore(getUserId(),sysUserVo);
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<SysUser>();
         if (!ObjectUtils.isEmpty(sysUserVo.getUserName())) {
             wrapper.like(SysUser::getUserName, sysUserVo.getUserName());
@@ -114,11 +121,21 @@ public class SysUserController extends BaseController {
         if (!ObjectUtils.isEmpty(sysUserVo.getStatus())) {
             wrapper.eq(SysUser::getStatus, sysUserVo.getStatus());
         }
-
+        if(!sysUserVo.getDsFlay()){
+            if (!ObjectUtils.isEmpty(sysUserVo.getDsUserId())){
+                wrapper.eq(SysUser::getCreateBy, sysUserVo.getDsUserId()).or();
+            }
+            if (!ObjectUtils.isEmpty(sysUserVo.getDsDeptId())){
+                wrapper.eq(SysUser::getDeptId,sysUserVo.getDsDeptId()).or();
+            }
+            if (!ObjectUtils.isEmpty(sysUserVo.getDsDeptIds())){
+                wrapper.in(SysUser::getDeptId,sysUserVo.getDsDeptIds());
+            }
+        }
         IPage<SysUser> page = userService.page(new Page<>(sysUserVo.getPageNum(), sysUserVo.getPageSize()), wrapper);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
             List<SysUser> dto1 = page.getRecords().stream().map(o -> {
-                List<Long> longs=new ArrayList<>();
+                List<Long> longs = new ArrayList<>();
                 SysDept sysDept = deptService.selectDeptById(o.getDeptId());
                 if (!ObjectUtils.isEmpty(sysDept)) {
                     o.setDeptName(sysDept.getDeptName());
@@ -128,7 +145,7 @@ public class SysUserController extends BaseController {
                     for (SysRole role : roles) {
                         longs.add(role.getRoleId());
                     }
-                }else {
+                } else {
                     longs = iSysRoleService.selectRoleListByUserId(o.getId());
                 }
                 Long[] objects = longs.toArray(new Long[]{});
@@ -144,7 +161,7 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user) {
-        List<Long> longs=new ArrayList<>();
+        List<Long> longs = new ArrayList<>();
         List<SysUser> list = userService.selectUserList(user);
         for (SysUser sysUser : list) {
             StringBuilder stringBuilder = new StringBuilder();
@@ -154,7 +171,7 @@ public class SysUserController extends BaseController {
                     longs.add(role.getRoleId());
                 }
             } else {
-                longs= roleService.selectRoleListByUserId(sysUser.getId());
+                longs = roleService.selectRoleListByUserId(sysUser.getId());
             }
             for (Long aLong : longs) {
                 SysRole sysRole = roleService.selectRoleById(aLong);
@@ -204,7 +221,7 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = {"/", "/{id}"})
     public AjaxResult getInfo(@PathVariable(value = "id", required = false) Long id) {
-        userService.checkUserDataScope(id);
+//        userService.checkUserDataScope(id);
         AjaxResult ajax = AjaxResult.success();
         List<SysRole> roles = roleService.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(id) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
@@ -223,10 +240,6 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody SysUser user) {
-        boolean matches = user.getPassword().matches(PW_PATTERN);
-        if (!matches) {
-            return error("您的密码太简单!需要包含大小英文、数字、特殊字符、并且长度8-20");
-        }
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhoneNum())
@@ -234,7 +247,6 @@ public class SysUserController extends BaseController {
             return error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
         }
         user.setCreateBy(getUsername());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toAjax(userService.saveUser(user));
     }
 
@@ -245,12 +257,8 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @RequestMapping(value = "/edit", method = RequestMethod.PUT)
     public AjaxResult edit(@Validated @RequestBody SysUser user) {
-        boolean matches = user.getPassword().matches(PW_PATTERN);
-        if (!matches) {
-            return error("您的密码太简单!需要包含大小英文、数字、特殊字符、并且长度8-20");
-        }
-        userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getId());
+//        userService.checkUserAllowed(user);
+//        userService.checkUserDataScope(user.getId());
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhoneNum())
@@ -261,7 +269,6 @@ public class SysUserController extends BaseController {
             return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setUpdateBy(getUsername());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         return toAjax(userService.updateUsers(user));
     }
 
@@ -278,8 +285,8 @@ public class SysUserController extends BaseController {
                 return error("您的密码太简单!需要包含大小英文、数字、特殊字符、并且长度8-20");
             }
         }
-        userService.checkUserAllowedUpdate(user);
-        userService.checkUserDataScope(user.getId());
+//        userService.checkUserAllowedUpdate(user);
+//        userService.checkUserDataScope(user.getId());
         if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUniqueUpdate(user))) {
             return error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
         } else if (StringUtils.isNotEmpty(user.getPhoneNum())
@@ -340,13 +347,35 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user) {
-        userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getId());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+//        boolean matches = user.getPassword().matches(PW_PATTERN);
+//        if (!matches) {
+//            return error("您的密码太简单!需要包含大小英文、数字、特殊字符、并且长度8-20");
+//        }
+//        userService.checkUserAllowed(user);
+//        userService.checkUserDataScope(user.getId());
+        user.setPassword(SecurityUtils.encryptPassword(defaultPassword));
         user.setUpdateBy(getUsername());
         return toAjax(userService.resetPwd(user));
     }
 
+
+    /**
+     * 修改密码
+     */
+    @PreAuthorize("@ss.hasPermi('system:user:updatePwd')")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePwd")
+    public AjaxResult updatePwd(@RequestBody SysUser user) {
+        boolean matches = user.getPassword().matches(PW_PATTERN);
+        if (!matches) {
+            return error("您的密码太简单!需要包含大小英文、数字、特殊字符、并且长度8-20");
+        }
+//        userService.checkUserAllowed(user);
+//        userService.checkUserDataScope(user.getId());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setUpdateBy(getUsername());
+        return toAjax(userService.resetPwd(user));
+    }
     /**
      * 状态修改
      */
@@ -354,8 +383,8 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user) {
-        userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getId());
+//        userService.checkUserAllowed(user);
+//        userService.checkUserDataScope(user.getId());
         user.setUpdateBy(getUsername());
         return toAjax(userService.updateUserStatus(user));
     }
@@ -381,7 +410,7 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
-        userService.checkUserDataScope(userId);
+//        userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);
         return success();
     }