修改创建用户、禁用用户功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/benyun/IUserinfoController.java

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.benyun;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.system.domain.vo.OpenAccountVO;
 import com.ruoyi.system.service.AccountService;
 import com.ruoyi.system.service.IUserinfoService;
@@ -31,7 +33,7 @@ public class IUserinfoController {
      */
     @SaIgnore
     @PostMapping("/createAdmin")
-    public R createAdmin(@Validated @RequestBody OpenAccountVO openAccountVO) {
+    public R createAdmin(@Validated(value = {AddGroup.class}) @RequestBody OpenAccountVO openAccountVO) {
         ArrayList<Integer> integers = new ArrayList<>();
         integers.add(3); //管理员
         openAccountVO.setRoles(integers);
@@ -46,7 +48,7 @@ public class IUserinfoController {
      */
     @SaIgnore
     @PostMapping("/createUser")
-    public R createUser(@Validated @RequestBody OpenAccountVO openAccountVO) {
+    public R createUser(@Validated(value = {AddGroup.class}) @RequestBody OpenAccountVO openAccountVO) {
         ArrayList<Integer> integers = new ArrayList<>();
         integers.add(2); //管理员
         openAccountVO.setRoles(integers);
@@ -56,7 +58,7 @@ public class IUserinfoController {
 
     @SaIgnore
     @PostMapping("/disableUser")
-    public R disableUser(@Validated @RequestBody OpenAccountVO openAccountVO) {
+    public R disableUser(@Validated(value = {QueryGroup.class}) @RequestBody OpenAccountVO openAccountVO) {
         iUserinfoService.disableUser(openAccountVO);
         return R.ok();
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/StoreServiceImpl.java

@@ -55,7 +55,6 @@ public class StoreServiceImpl implements StoreService {
      */
     @Override
     public void updateStore(StoreVo storeVo) {
-        storeVo.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(storeVo.getAddrCode()));
         UpdateWrapper<Store> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("store_id",storeVo.getStoreId())
         .set("store_name",storeVo.getStoreName())

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/OpenAccountVO.java

@@ -1,5 +1,7 @@
 package com.ruoyi.system.domain.vo;
 
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -17,7 +19,7 @@ public class OpenAccountVO implements Serializable {
     /**
      * 统一用户id（uId不懂为什么用不了）
      */
-    @NotNull(message = "uId不能为空")
+    @NotNull(message = "uId不能为空",groups = {AddGroup.class, QueryGroup.class})
     private Long uId;
 
 //    @NotNull(message = "u_id不能为空")
@@ -26,14 +28,14 @@ public class OpenAccountVO implements Serializable {
     /**
      * 用户账号
      */
-    @NotBlank(message = "用户账号不能为空")
+    @NotBlank(message = "用户账号不能为空",groups = {AddGroup.class})
     @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
     private String userName;
 
     /**
      * 用户昵称
      */
-    @NotBlank(message = "用户昵称不能为空")
+    @NotBlank(message = "用户昵称不能为空",groups = {AddGroup.class})
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
     private String nickName;
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/IUserinfoServiceImpl.java

@@ -27,9 +27,9 @@ public class IUserinfoServiceImpl implements IUserinfoService {
 
     @Override
     public R createAdmin(OpenAccountVO openAccountVO) {
-        //检查用户名称、Uid是否重复
-        String s = checkUIdAndUserName(openAccountVO);
-        if (s == null){
+        //检查是否存在uId用户
+        OpenAccount openAccount1 = checkUIdAndUserName(openAccountVO);
+        if (openAccount1 == null){
             //注册用户
             OpenAccount openAccount = new OpenAccount(openAccountVO);
             iUserinfoMapper.insert(openAccount);
@@ -41,15 +41,29 @@ public class IUserinfoServiceImpl implements IUserinfoService {
                 userRoleMapper.insert(sysUserRole);
             }
             return R.ok();
+        }else {
+            //启用用户
+            UpdateWrapper<OpenAccount> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("u_id",openAccountVO.getUId());
+            updateWrapper.set("del_flag",0);
+            iUserinfoMapper.update(null,updateWrapper);
+
+            //设置角色
+            for (Integer role : openAccountVO.getRoles()) {
+                SysUserRole sysUserRole = new SysUserRole();
+                sysUserRole.setUserId(openAccount1.getUserId());
+                sysUserRole.setRoleId(Long.valueOf(role));
+                userRoleMapper.insert(sysUserRole);
+            }
+            return R.ok();
         }
-        return R.fail(s);
     }
 
     @Override
     public R createUser(OpenAccountVO openAccountVO) {
-        //检查用户名称、Uid是否重复
-        String s = checkUIdAndUserName(openAccountVO);
-        if (s == null){
+        //检查是否存在uId用户
+        OpenAccount openAccount1 = checkUIdAndUserName(openAccountVO);
+        if (openAccount1 == null){
             //注册用户
             OpenAccount openAccount = new OpenAccount(openAccountVO);
             iUserinfoMapper.insert(openAccount);
@@ -61,37 +75,50 @@ public class IUserinfoServiceImpl implements IUserinfoService {
                 userRoleMapper.insert(sysUserRole);
             }
             return R.ok();
+        }else {
+            //启用用户
+            UpdateWrapper<OpenAccount> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("u_id",openAccountVO.getUId());
+            updateWrapper.set("del_flag",0);
+            iUserinfoMapper.update(null,updateWrapper);
+
+            //设置角色
+            for (Integer role : openAccountVO.getRoles()) {
+                SysUserRole sysUserRole = new SysUserRole();
+                sysUserRole.setUserId(openAccount1.getUserId());
+                sysUserRole.setRoleId(Long.valueOf(role));
+                userRoleMapper.insert(sysUserRole);
+            }
+            return R.ok();
         }
-        return R.fail(s);
     }
 
     @Override
     public void disableUser(OpenAccountVO openAccountVO) {
-        UpdateWrapper<OpenAccount> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("u_id",openAccountVO.getUId());
-        updateWrapper.set("delFlag",2);
-        iUserinfoMapper.update(null,updateWrapper);
+        //检查是否存在uId用户
+        OpenAccount openAccount1 = checkUIdAndUserName(openAccountVO);
+        if (openAccount1 != null){
+            //禁用用户
+            UpdateWrapper<OpenAccount> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("u_id",openAccountVO.getUId());
+            updateWrapper.set("del_flag",2);
+            iUserinfoMapper.update(null,updateWrapper);
+
+            //清除分配角色
+            QueryWrapper<SysUserRole> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("user_id",openAccount1.getUserId());
+            userRoleMapper.delete(queryWrapper);
+        }
     }
 
     /**
      * 判断用户是否存在
      * */
-    public String checkUIdAndUserName(OpenAccountVO openAccountVO){
+    public OpenAccount checkUIdAndUserName(OpenAccountVO openAccountVO){
         //判断u_id 和 用户名称是否存在
         QueryWrapper<OpenAccount> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("u_id","user_name");
         queryWrapper.eq("u_id",openAccountVO.getUId());
-        queryWrapper.or();
-        queryWrapper.eq("user_name",openAccountVO.getUserName());
-        List<OpenAccount> openAccounts = iUserinfoMapper.selectList(queryWrapper);
-        if (!openAccounts.isEmpty()){
-            if (openAccounts.size() == 2)
-                return "uId、userName已存在";
-            else if (openAccounts.get(0).getUId() == openAccountVO.getUId())
-                return "uId已存在";
-            else
-                return "userName已存在";
-        }
-        return null;
+        OpenAccount openAccount = iUserinfoMapper.selectOne(queryWrapper);
+        return openAccount;
     }
 }