|
@@ -3,7 +3,6 @@ package vip.xiaonuo.weixin.gongzhong.controller;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import jakarta.servlet.http.HttpServletResponse;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.SneakyThrows;
|
|
@@ -17,7 +16,6 @@ import vip.xiaonuo.coldchain.modular.alarmuser.entity.AlarmUser;
|
|
|
import vip.xiaonuo.coldchain.modular.alarmuser.service.AlarmUserService;
|
|
|
import vip.xiaonuo.coldchain.modular.push.entity.WeChatUser;
|
|
|
import vip.xiaonuo.coldchain.modular.push.utils.PushUtil;
|
|
|
-import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
|
|
|
import vip.xiaonuo.dev.modular.config.service.DevConfigService;
|
|
|
|
|
|
import java.util.List;
|
|
@@ -54,16 +52,14 @@ public class WxMpController {
|
|
|
WeChatUser weChatUser = PushUtil.getUserInfo(code);
|
|
|
log.info("获取用户信息:{}", JSONUtil.toJsonStr(weChatUser));
|
|
|
|
|
|
- List<AlarmUser> userList = alarmUserService.list(new LambdaQueryWrapper<>(AlarmUser.class)
|
|
|
- .eq(AlarmUser::getOpenId, weChatUser.getOpenid())
|
|
|
- .eq(AlarmUser::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE)
|
|
|
- .orderByDesc(AlarmUser::getCreateTime));
|
|
|
+ List<AlarmUser> userList = alarmUserService.getByOpenId(weChatUser.getOpenid());
|
|
|
AlarmUser alarmUser;
|
|
|
|
|
|
if (CollUtil.isNotEmpty(userList)) {
|
|
|
//检查用户的组织机构
|
|
|
long count = userList.stream().filter(x -> StrUtil.isNotBlank(x.getCreateOrg())).count();
|
|
|
if (count > 0) {
|
|
|
+ //进入授权页面
|
|
|
String redirect = devConfigService.getValueByKey("wx_front_authed_page");
|
|
|
if (StrUtil.isNotBlank(redirect)) {
|
|
|
response.sendRedirect(redirect);
|
|
@@ -76,13 +72,7 @@ public class WxMpController {
|
|
|
alarmUser = userList.get(0);
|
|
|
} else {
|
|
|
//没有用户信息则创建用户
|
|
|
- alarmUserService.getUserInfo(code, null, null);
|
|
|
- alarmUser = alarmUserService.getOne(new LambdaQueryWrapper<>(AlarmUser.class)
|
|
|
- .eq(AlarmUser::getOpenId, weChatUser.getOpenid())
|
|
|
- .isNull(AlarmUser::getCreateOrg)
|
|
|
- .eq(AlarmUser::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE)
|
|
|
- .orderByDesc(AlarmUser::getCreateTime)
|
|
|
- .last("limit 1"));
|
|
|
+ alarmUser = alarmUserService.subscribe(weChatUser.getOpenid());
|
|
|
}
|
|
|
|
|
|
String redirect = devConfigService.getValueByKey("wx_front_not_auth_page") + "?id=" + alarmUser.getId();
|