Browse Source

feature: 系统管理->用户管理功能

autumnal_wind@yeah.net 1 month ago
parent
commit
f8ceae0bbc

+ 4 - 9
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -139,14 +139,10 @@ public class SysUserController extends BaseController {
139 139
             SysUserVo sysUser = userService.selectUserById(userId);
140 140
             userInfoVo.setUser(sysUser);
141 141
             userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId));
142
-            Long deptId = sysUser.getDeptId();
143
-            if (ObjectUtil.isNotNull(deptId)) {
144
-                SysPostBo postBo = new SysPostBo();
145
-//                postBo.setDeptId(deptId);
146
-                userInfoVo.setPosts(postService.selectPostList(postBo));
147
-                userInfoVo.setPostIds(postService.selectPostListByUserId(userId));
148
-            }
149 142
         }
143
+        SysPostBo postBo = new SysPostBo();
144
+        userInfoVo.setPosts(postService.selectPostList(postBo));
145
+
150 146
         return R.ok(userInfoVo);
151 147
     }
152 148
 
@@ -217,8 +213,7 @@ public class SysUserController extends BaseController {
217 213
      */
218 214
     @SaCheckPermission("system:user:query")
219 215
     @GetMapping("/optionselect")
220
-    public R<List<SysUserVo>> optionselect(@RequestParam(required = false) Long[] userIds,
221
-                                           @RequestParam(required = false) Long deptId) {
216
+    public R<List<SysUserVo>> optionselect(@RequestParam(required = false) Long[] userIds, @RequestParam(required = false) Long deptId) {
222 217
         return R.ok(userService.selectUserByIds(userIds == null ? null : List.of(userIds), deptId));
223 218
     }
224 219
 

+ 3 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java

@@ -5,6 +5,8 @@ import lombok.Data;
5 5
 import lombok.EqualsAndHashCode;
6 6
 import lombok.NoArgsConstructor;
7 7
 import org.dromara.common.core.constant.UserConstants;
8
+import org.dromara.common.encrypt.annotation.EncryptField;
9
+import org.dromara.common.encrypt.enumd.AlgorithmType;
8 10
 import org.dromara.common.tenant.core.TenantEntity;
9 11
 
10 12
 import java.util.Date;
@@ -79,6 +81,7 @@ public class SysUser extends TenantEntity {
79 81
     /**
80 82
      * 手机号码
81 83
      */
84
+    @EncryptField(algorithm = AlgorithmType.BASE64)
82 85
     private String phone;
83 86
 
84 87
     /**

+ 0 - 14
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRegisterInfoServiceImpl.java

@@ -151,11 +151,9 @@ public class SysRegisterInfoServiceImpl implements ISysRegisterInfoService {
151 151
     @SuppressWarnings("unchecked")
152 152
     @Override
153 153
     public SysRegisterInfoVo queryRegisterInfo() {
154
-
155 154
         List<SysRegisterinfo> list = baseMapper.selectList();
156 155
         AtomicReference<SysRegisterInfoVo> vo = new AtomicReference<>(new SysRegisterInfoVo());
157 156
         list.stream().findFirst().ifPresent(p -> {
158
-
159 157
             String base64Info = p.getRegisterInfo();
160 158
             byte[] result = Base64.getDecoder().decode(base64Info.getBytes());
161 159
             JSONObject obj = JSONObject.parseObject(new String(result, StandardCharsets.UTF_8));
@@ -198,18 +196,6 @@ public class SysRegisterInfoServiceImpl implements ISysRegisterInfoService {
198 196
 
199 197
             RedisUtils.setCacheObject(CacheNames.CUSTOM_PUB_KEY,customerPublicKey);
200 198
             RedisUtils.setCacheObject(CacheNames.CUSTOM_PRI_KEY,customerPrivateKey);
201
-
202
-            //String seckey = YcEncryptUtil.getBalanceSecretKey(customerPublicKey,"20082016134101023897");
203
-            //byte[] key = YcEncryptUtil.hexToByte(StrUtil.subSuf(seckey,3));
204
-            //String cardValue = YcEncryptUtil.parseByte2HexStr("");
205
-            //String encryptValue = SecureUtil.desede(key).encryptHex("17.9", StandardCharsets.UTF_8);
206
-            //String encryptValue1 = SecureUtil.des(key).encryptHex("17.9".getBytes(StandardCharsets.UTF_8));
207
-            //String encryptValue2 = SecureUtil.des(key).decryptStr("ea0ea7d3e6f50986");
208
-            //byte[] data = YcEncryptUtil.hexToByte("01000000827801BF2D965037ED88D46FB8A8C4C9636D8BF149BB729D");
209
-            //String encryptValue2 = SecureUtil.desede(key).decryptStr(data);
210
-
211
-            //log.info("encryptValue-{}", encryptValue.getBytes());
212
-
213 199
         });
214 200
         return vo.get();
215 201
     }

+ 29 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/task/InitRunner.java

@@ -0,0 +1,29 @@
1
+package org.dromara.system.task;
2
+
3
+import lombok.RequiredArgsConstructor;
4
+import lombok.extern.slf4j.Slf4j;
5
+import org.dromara.system.service.ISysRegisterInfoService;
6
+import org.springframework.boot.CommandLineRunner;
7
+import org.springframework.stereotype.Component;
8
+
9
+/**
10
+ * name: InitRunner
11
+ * package: org.dromara.backstage.task
12
+ * description: 系统启动时的初始化工作
13
+ * date: 2024-09-09 10:32:29 10:32
14
+ *
15
+ * @author yubo
16
+ * @version 0.1
17
+ * @since JDK 1.8
18
+ */
19
+@RequiredArgsConstructor
20
+@Component
21
+@Slf4j
22
+public class InitRunner implements CommandLineRunner {
23
+    private final ISysRegisterInfoService sysRegisterInfoService;
24
+    @Override
25
+    public void run(String... args) throws Exception {
26
+        //加载系统注册信息
27
+        sysRegisterInfoService.queryRegisterInfo();
28
+    }
29
+}