From cdec9062c85f52d43e8d74e82cbcf9f8606ebb01 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 30 Jan 2024 16:39:59 +0800
Subject: [PATCH] chore:设备在线率接口提交
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 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 a66ed6d..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
@@ -127,17 +127,6 @@
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);
- 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);
- return result;
- }
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
userInfo.put("userId", userBo.getId());
@@ -152,6 +141,19 @@
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
@@ -219,13 +221,6 @@
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);
- 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);
- return result;
- }
Map<String, Object> userInfo = new LinkedHashMap<>();
userInfo.put("userId", user.getId());
userInfo.put("account", user.getAccount());
@@ -233,12 +228,18 @@
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());
-
+ 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);
@@ -329,7 +330,7 @@
ResponseEntity<String> responseEntity =
restTemplate.postForEntity(url, wxMssVo, String.class);
String body = responseEntity.getBody();
- log.info("������:"+body+"������:"+user.getAccount());
+ log.info("������:"+body+"������:"+user.getAccount()+"openID"+user.getOpenId());
}
}
--
Gitblit v1.8.0