From 24044dfc99608a0ad56c8de58b32d6e47fc1f25d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 05 三月 2025 23:36:33 +0800
Subject: [PATCH] 运营加入用户查询功能
---
service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java
index d99b8d1..73aad5a 100644
--- a/service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java
@@ -18,6 +18,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.AuthenticationFactory;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.user.dao.IUserV1ServiceDao;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.dto.user.UserDto;
@@ -29,6 +30,7 @@
import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -114,8 +116,15 @@
@Override
public String getUserIdByQrCode(@RequestBody String qrCode) {
- qrCode = AuthenticationFactory.AesDecrypt(qrCode, AuthenticationFactory.PASSWD_SALT);
+ qrCode = CommonCache.getValue(qrCode);
+ if(StringUtil.isEmpty(qrCode)){
+ throw new IllegalArgumentException("浜岀淮鐮佸け鏁�");
+ }
+ qrCode = AuthenticationFactory.AesDecrypt(qrCode, AuthenticationFactory.AES_KEY);
JSONObject qrCodeJson = JSONObject.parseObject(qrCode);
+ if (qrCodeJson == null || !qrCodeJson.containsKey("time")) {
+ throw new IllegalArgumentException("浜岀淮鐮侀潪娉�");
+ }
long time = qrCodeJson.getLongValue("time");
if (DateUtil.getCurrentDate().getTime() - time > 5 * 60 * 1000) {
throw new IllegalArgumentException("浜岀淮鐮佸け鏁�");
@@ -129,8 +138,31 @@
JSONObject qrCodeJson = new JSONObject();
qrCodeJson.put("userId", userId);
qrCodeJson.put("time", DateUtil.getCurrentDate().getTime());
- String qrCode = AuthenticationFactory.AesEncrypt(qrCodeJson.toJSONString(), AuthenticationFactory.PASSWD_SALT);
- return qrCode;
+ String qrCode = AuthenticationFactory.AesEncrypt(qrCodeJson.toJSONString(), AuthenticationFactory.AES_KEY);
+ String key = GenerateCodeFactory.getUUID();
+ CommonCache.setValue(key, qrCode, CommonCache.defaultExpireTime);
+ return key;
+ }
+
+ @Override
+ public int getSystemUserCount(@RequestBody UserDto userDto) {
+ return userV1ServiceDaoImpl.getSystemUserCount(BeanConvertUtil.beanCovertMap(userDto));
+
+ }
+
+ @Override
+ public List<UserDto> getSystemUsers(@RequestBody UserDto userDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+
+ int page = userDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ userDto.setPage((page - 1) * userDto.getRow());
+ }
+
+ List<UserDto> users = BeanConvertUtil.covertBeanList(userV1ServiceDaoImpl.getSystemUsers(BeanConvertUtil.beanCovertMap(userDto)), UserDto.class);
+
+ return users;
}
}
--
Gitblit v1.8.0