From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 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 9c657fc..d11ccac 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
@@ -16,14 +16,21 @@
package com.java110.user.smo.impl;
+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;
import com.java110.po.user.UserPo;
+import com.java110.utils.cache.CommonCache;
+import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
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;
@@ -47,26 +54,26 @@
@Override
- public int saveUser(@RequestBody UserPo userPo) {
+ public int saveUser(@RequestBody UserPo userPo) {
int saveFlag = userV1ServiceDaoImpl.saveUserInfo(BeanConvertUtil.beanCovertMap(userPo));
return saveFlag;
}
- @Override
- public int updateUser(@RequestBody UserPo userPo) {
+ @Override
+ public int updateUser(@RequestBody UserPo userPo) {
int saveFlag = userV1ServiceDaoImpl.updateUserInfo(BeanConvertUtil.beanCovertMap(userPo));
return saveFlag;
}
- @Override
- public int deleteUser(@RequestBody UserPo userPo) {
- userPo.setStatusCd("1");
- int saveFlag = userV1ServiceDaoImpl.updateUserInfo(BeanConvertUtil.beanCovertMap(userPo));
- return saveFlag;
+ @Override
+ public int deleteUser(@RequestBody UserPo userPo) {
+ userPo.setStatusCd("1");
+ int saveFlag = userV1ServiceDaoImpl.updateUserInfo(BeanConvertUtil.beanCovertMap(userPo));
+ return saveFlag;
}
@Override
- public List<UserDto> queryUsers(@RequestBody UserDto userDto) {
+ public List<UserDto> queryUsers(@RequestBody UserDto userDto) {
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
@@ -84,10 +91,11 @@
@Override
public int queryUsersCount(@RequestBody UserDto userDto) {
- return userV1ServiceDaoImpl.queryUsersCount(BeanConvertUtil.beanCovertMap(userDto)); }
+ return userV1ServiceDaoImpl.queryUsersCount(BeanConvertUtil.beanCovertMap(userDto));
+ }
@Override
- public int queryStaffsNoInOrgCount(@RequestBody UserDto userDto) {
+ public int queryStaffsNoInOrgCount(@RequestBody UserDto userDto) {
return userV1ServiceDaoImpl.queryStaffsNoInOrgCount(BeanConvertUtil.beanCovertMap(userDto));
}
@@ -103,6 +111,37 @@
List<UserDto> users = BeanConvertUtil.covertBeanList(userV1ServiceDaoImpl.queryStaffsNoInOrg(BeanConvertUtil.beanCovertMap(userDto)), UserDto.class);
- return users; }
+ return users;
+ }
+
+ @Override
+ public String getUserIdByQrCode(@RequestBody String qrCode) {
+ 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("浜岀淮鐮佸け鏁�");
+ }
+
+ return qrCodeJson.getString("userId");
+ }
+
+ @Override
+ public String generatorUserIdQrCode(@RequestBody String userId) {
+ JSONObject qrCodeJson = new JSONObject();
+ qrCodeJson.put("userId", userId);
+ qrCodeJson.put("time", DateUtil.getCurrentDate().getTime());
+ String qrCode = AuthenticationFactory.AesEncrypt(qrCodeJson.toJSONString(), AuthenticationFactory.AES_KEY);
+ String key = GenerateCodeFactory.getUUID();
+ CommonCache.setValue(key, qrCode, CommonCache.defaultExpireTime);
+ return key;
+ }
}
--
Gitblit v1.8.0