From 471f693ac87a6ed6a2b00e93472b025266c0271f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 13 Nov 2023 09:27:19 +0800
Subject: [PATCH] Merge branch 'wb' of http://blit.7drlb.com:8888/r/moral into qa
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 150 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 129 insertions(+), 21 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index b112317..cde7c7f 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -8,27 +8,38 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.entity.*;
import com.moral.api.mapper.*;
import com.moral.api.pojo.bo.UserBO;
+import com.moral.api.pojo.enums.AllocationApproveEnum;
import com.moral.api.pojo.enums.FileTableEnum;
import com.moral.api.pojo.enums.StateEnum;
import com.moral.api.pojo.enums.SysDictTypeEnum;
+
import com.moral.api.pojo.vo.file.FileVo;
+import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.FileTableService;
+import com.moral.api.service.ResponsibilityUnitService;
import com.moral.api.service.UserService;
import com.moral.api.utils.OperationLogUtils;
+import com.moral.api.utils.StringUtils;
import com.moral.api.utils.WechatUtils;
+import com.moral.api.vo.WxMssVo;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.*;
+
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.web.client.RestTemplate;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -69,6 +80,9 @@
@Autowired
private ResponsibilityUnitMapper responsibilityUnitMapper;
+ @Autowired
+ private ResponsibilityUnitService responsibilityUnitService;
+
@Value("${AES.KEY}")
private String AESKey;
@@ -103,6 +117,16 @@
}
ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
List<Integer> list = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_DEVICE.value, userBo.getId());
+ result.put("userName", userBo.getUserName());
+ result.put("unitId",userBo.getUnitId());
+ result.put("userId", userBo.getId());
+ result.put("account", userBo.getAccount());
+ List<FileVo> listFile = fileTableService.list(userBo.getId(), FileTableEnum.APP_ALLOCATION.value);
+ result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
+ result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
+ result.put("device",ObjectUtils.isEmpty(list)? StateEnum.NOT_EFFECTIVE.value :StateEnum.TAKE_EFFECT.value);
+ String userIdStr = new StringBuffer("00").append(userBo.getId().toString()).toString();
+ String tokenResult = TokenUtils.getTokenById(userIdStr);
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
userInfo.put("userId", userBo.getId());
@@ -117,19 +141,25 @@
userInfo.put("isAdmin", userBo.getIsAdmin());
userInfo.put("organizationId",userBo.getOrganizationId());
userInfo.put("openid", openId);
+ if(StringUtils.isNotEmpty(tokenResult)){
+ result.put("token", tokenResult);
+ result.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ result.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
+ sysLog("������������������" + userBo.getAccount()+" ;openId:"+openId,userBo);
+ //������openId���user������
+ User user = userMapper.selectById(userBo.getId());
+ user.setOpenId(openId);
+ userMapper.updateById(user);
+ TokenUtils.getRefreshTokenApp(tokenResult,userInfo);
+ return result;
+ }
+
try {
//������token������������redis
String token = TokenUtils.getTokenApp(new StringBuffer("00").append(userBo.getId().toString()).toString(),userInfo);
result.put("token", token);
- result.put("userName", userBo.getUserName());
- result.put("unitId",userBo.getUnitId());
- result.put("userId", userBo.getId());
- result.put("account", userBo.getAccount());
- List<FileVo> listFile = fileTableService.list(userBo.getId(), FileTableEnum.APP_ALLOCATION.value);
- result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
- result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
- result.put("device",ObjectUtils.isEmpty(list)? StateEnum.NOT_EFFECTIVE.value :StateEnum.TAKE_EFFECT.value);
+
} catch (Exception e) {
log.error("token���������������" + e.getMessage());
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
@@ -178,7 +208,19 @@
// String nickName = rawDataJson.getString("nickName");
// String avatarUrl = rawDataJson.getString("avatarUrl");
}
-
+ String userIdStr = new StringBuffer("00").append(user.getId().toString()).toString();
+ String tokenResult = TokenUtils.getTokenById(userIdStr);
+ result.put("userName", user.getUserName());
+ result.put("unitId",user.getUnitId());
+ List<FileVo> listFile = fileTableService.list(user.getId(), FileTableEnum.APP_ALLOCATION.value);
+ result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
+ result.put("userId", user.getId());
+ result.put("account", user.getAccount());
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(user.getUnitId());
+ List<Integer> list = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_DEVICE.value, user.getId());
+ result.put("device",ObjectUtils.isEmpty(list)? StateEnum.NOT_EFFECTIVE.value : StateEnum.TAKE_EFFECT.value);
+ result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
+ result.put("openId",openid);
Map<String, Object> userInfo = new LinkedHashMap<>();
userInfo.put("userId", user.getId());
userInfo.put("account", user.getAccount());
@@ -186,26 +228,24 @@
userInfo.put("email", user.getEmail());
userInfo.put("mobile", user.getMobile());
userInfo.put("unitId",user.getUnitId());
-// userInfo.put("unName",user.getAreaName());
userInfo.put("organizationId",user.getOrganizationId());
userInfo.put("wechat", user.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(user.getExpireTime()));
userInfo.put("isAdmin", user.getIsAdmin());
- ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(user.getUnitId());
- List<Integer> list = responsibilityUnitMapper.selectCodeList(SysDictTypeEnum.SYS_DEVICE.value, user.getId());
+ if(StringUtils.isNotEmpty(tokenResult)){
+ result.put("token", tokenResult);
+ result.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ result.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
+ sysLog("������������������" + user.getAccount()+" ;openId:"+openid,user);
+ TokenUtils.getRefreshTokenApp(tokenResult,userInfo);
+ return result;
+ }
try {
//������token������������redis
String token = TokenUtils.getTokenApp(new StringBuffer("00").append(user.getId().toString()).toString(),userInfo);
result.put("token", token);
- result.put("userName", user.getUserName());
- result.put("unitId",user.getUnitId());
- List<FileVo> listFile = fileTableService.list(user.getId(), FileTableEnum.APP_ALLOCATION.value);
- result.put("file", CollectionUtils.isNotEmpty(listFile)?listFile.get(0):new FileVo());
- result.put("userId", user.getId());
- result.put("account", user.getAccount());
- result.put("device",ObjectUtils.isEmpty(list)? StateEnum.NOT_EFFECTIVE.value : StateEnum.TAKE_EFFECT.value);
- result.put("unName",Objects.nonNull(responsibilityUnit)&&Objects.nonNull(responsibilityUnit.getUnitName())?responsibilityUnit.getUnitName():"���������������");
- result.put("openId",openid);
+
+
} catch (Exception e) {
log.error("token���������������" + e.getMessage());
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
@@ -226,6 +266,74 @@
sysLog(userId+"������������������",user);
return true;
}
+
+
+
+ /**
+ * ���������������
+ * @param appAllocationPushUserCond
+ */
+ @Override
+ @Async("asyncPoolTaskExecutor")
+ public void pushOneUser(Allocation appAllocationPushUserCond) {
+ QxUser currentUser = UserHelper.getCurrentUser();
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(appAllocationPushUserCond.getUnitId());
+ Integer areaCode = responsibilityUnit.getAreaCode();
+
+ List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectAreaUnit(areaCode.toString().length()>6?responsibilityUnit.getParentCode():responsibilityUnit.getAreaCode());
+ //������unitid
+ LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(User::getIsDelete,Constants.NOT_DELETE);
+ Integer state = appAllocationPushUserCond.getState();
+ if (state==20){
+ wrapper.eq(User::getUnitId,appAllocationPushUserCond.getUnitId());
+ }else {
+ wrapper.eq(User::getUnitId,ObjectUtils.isEmpty(responsibilityUnits)?0:responsibilityUnits.get(0).getUnitId());
+ }
+
+ List<User> users = userMapper.selectList(wrapper);
+ if (ObjectUtils.isEmpty(users)){
+ return;
+ }
+
+ String dateString = DateUtils.dateToDateString(appAllocationPushUserCond.getEscalationTime(),"MM���dd���");
+ //������������������������������������������������access_token������������������������������access_token������������������������������
+ //���������������
+ String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + WechatUtils.getAccessToken();
+ //������������
+ for (User user : users) {
+ if (user.getId().equals(currentUser.getUserId())){
+ continue;
+ }
+ RestTemplate restTemplate = new RestTemplate();
+ //���������������������
+ WxMssVo wxMssVo = new WxMssVo();
+ wxMssVo.setTouser(user.getOpenId());//���������openid���������������������������������������������������������������������
+ wxMssVo.setTemplate_id("YNqUZ1MgMvwY3G-NENVbcmIBR5dUotSdnwcz96CWrho");//������������������id
+ wxMssVo.setLang("zh_CN");
+ wxMssVo.setMiniprogramState("formal");
+ wxMssVo.setPage("pages/index/index");
+ Map<String, Object> m = new HashMap<>();
+ HashMap<String, Object> map1 = new HashMap<>();
+ HashMap<String, Object> map2 = new HashMap<>();
+ HashMap<String, Object> map3 = new HashMap<>();
+ HashMap<String, Object> map4 = new HashMap<>();
+ map1.put("value",responsibilityUnit.getUnitName()+dateString+"������������");
+ map2.put("value",appAllocationPushUserCond.getAllocationNum());
+ map3.put("value",state==30? AllocationApproveEnum.IN_APPROVAL.name:AllocationApproveEnum.UNDER_RECTIFICATION.name);
+ map4.put("value",DateUtils.dateToDateString(new Date(),"yyyy���MM���dd���"));
+ m.put("thing18", map1);
+ m.put("character_string1", map2);
+ m.put("thing2", map3);
+ m.put("date4", map4);
+ wxMssVo.setData(JSON.toJSON(m));
+ ResponseEntity<String> responseEntity =
+ restTemplate.postForEntity(url, wxMssVo, String.class);
+ String body = responseEntity.getBody();
+ log.info("������:"+body+"������:"+user.getAccount()+"openID"+user.getOpenId());
+ }
+ }
+
private void sysLog(String cont,User user){
//������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
--
Gitblit v1.8.0