|
|
@@ -42,9 +42,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.File;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
/**
|
|
|
@@ -268,6 +266,44 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * @desc : 注册-创建员工的时候保存微信用户信息
|
|
|
+ * @author : 姜永辉
|
|
|
+ * @date : 2024-02-20 13:55
|
|
|
+ */
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
+ public ResponseResultVO<?> registerFeign(Map<String, Object> map) {
|
|
|
+ UserWxLogin userWxLogin = new UserWxLogin();
|
|
|
+ userWxLogin.setCurrentCp(Integer.parseInt(map.get("currentCp") + ""));
|
|
|
+ userWxLogin.setUserPhone(map.get("userPhone") + "");
|
|
|
+ userWxLogin.setUserName(map.get("userName") + "");
|
|
|
+
|
|
|
+ UserLogin userLogin = userMapper.getByPhone(userWxLogin.getUserPhone());
|
|
|
+ if (userLogin == null) {
|
|
|
+ //注册
|
|
|
+ List<Integer> joinedCps = new ArrayList<>();
|
|
|
+ joinedCps.add(userWxLogin.getCurrentCp());
|
|
|
+ userWxLogin.setJoinedCps(joinedCps);
|
|
|
+ userMapper.insert(userWxLogin);
|
|
|
+ } else {
|
|
|
+ List<Integer> joinedCps = userLogin.getJoinedCps();
|
|
|
+ if (joinedCps == null) {
|
|
|
+ joinedCps = new ArrayList<>();
|
|
|
+ joinedCps.add(userWxLogin.getCurrentCp());
|
|
|
+ userWxLogin.setJoinedCps(joinedCps);
|
|
|
+ userMapper.updateCpid(userLogin.getUserId(), null, userWxLogin.getJoinedCps());
|
|
|
+ }
|
|
|
+ if (joinedCps != null && !joinedCps.contains(userWxLogin.getCurrentCp())) {
|
|
|
+ joinedCps.add(userWxLogin.getCurrentCp());
|
|
|
+ userWxLogin.setJoinedCps(joinedCps);
|
|
|
+ userMapper.updateCpid(userLogin.getUserId(), null, userWxLogin.getJoinedCps());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return ResponseResultUtil.success(true);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
* @desc : 注册
|
|
|
* @author : 洪旭东
|
|
|
* @date : 2024-02-20 13:55
|
|
|
@@ -345,9 +381,9 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
|
|
|
*/
|
|
|
public ResponseResultVO<?> changeCp(UserLogin userLogin) throws OAuthSystemException {
|
|
|
// 更新用户的当前企业
|
|
|
- if(userLogin.getCurrentCp() != Constant.Experience.profession.getName()
|
|
|
- && userLogin.getCurrentCp() != Constant.Experience.Standard.getName() ){
|
|
|
- userMapper.updateCpid(userLogin.getUserId(),userLogin.getCurrentCp(), userLogin.getJoinedCps());
|
|
|
+ if (userLogin.getCurrentCp() != Constant.Experience.profession.getName()
|
|
|
+ && userLogin.getCurrentCp() != Constant.Experience.Standard.getName()) {
|
|
|
+ userMapper.updateCpid(userLogin.getUserId(), userLogin.getCurrentCp(), userLogin.getJoinedCps());
|
|
|
}
|
|
|
|
|
|
//当前公司
|
|
|
@@ -389,9 +425,9 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
|
|
|
try {
|
|
|
accessToken = AESSecurityUtil.encrypt(AESKey, accessToken);
|
|
|
// 往redis记录缓存
|
|
|
- Map<String,Object> ul = new HashMap<>();
|
|
|
- ul.put("accessToken",accessToken);
|
|
|
- ul.put("opUpdateTime",LocalDateTime.now());
|
|
|
+ Map<String, Object> ul = new HashMap<>();
|
|
|
+ ul.put("accessToken", accessToken);
|
|
|
+ ul.put("opUpdateTime", LocalDateTime.now());
|
|
|
stringRedisTemplate.opsForValue().set(Constant.RedisConstant.REDIS_USER_LOGIN.getName() + '_' + userId + '_' + userLogin.getAppCode(), JSONObject.toJSONString(ul));
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
@@ -453,9 +489,9 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
|
|
|
try {
|
|
|
accessToken = AESSecurityUtil.encrypt(AESKey, accessToken);
|
|
|
// 往redis记录缓存
|
|
|
- Map<String,Object> ul = new HashMap<>();
|
|
|
- ul.put("accessToken",accessToken);
|
|
|
- ul.put("opUpdateTime",LocalDateTime.now());
|
|
|
+ Map<String, Object> ul = new HashMap<>();
|
|
|
+ ul.put("accessToken", accessToken);
|
|
|
+ ul.put("opUpdateTime", LocalDateTime.now());
|
|
|
stringRedisTemplate.opsForValue().set(Constant.RedisConstant.REDIS_USER_LOGIN.getName() + '_' + userId + '_' + userLogin.getAppCode(), JSONObject.toJSONString(ul));
|
|
|
|
|
|
} catch (Exception e) {
|
|
|
@@ -551,7 +587,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
|
|
|
ResponseResultVO<String> responseResultVO = HttpUtils.postReturnFile(url, param, absolutelyPath);
|
|
|
|
|
|
if (responseResultVO.getCode() == ResponseCodeEnum.SUCCESS.getCode()) {
|
|
|
- return ResponseResultUtil.success(absolutelyPath.replace(config.getUploadPath(),""));
|
|
|
+ return ResponseResultUtil.success(absolutelyPath.replace(config.getUploadPath(), ""));
|
|
|
} else {
|
|
|
return responseResultVO;
|
|
|
}
|