From 77c25d685df97e33e86690da05e5a742e8c355a4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 02 四月 2024 14:25:08 +0800
Subject: [PATCH] 优化自登陆问题
---
service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginByOpenIdCmd.java | 76 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginByOpenIdCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginByOpenIdCmd.java
index ba2cf2d..ff6d1df 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginByOpenIdCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginByOpenIdCmd.java
@@ -13,10 +13,12 @@
import com.java110.dto.msg.SmsDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.system.SystemInfoDto;
import com.java110.dto.user.LoginOwnerResDto;
import com.java110.dto.user.UserAttrDto;
import com.java110.dto.user.UserDto;
import com.java110.intf.common.ISmsInnerServiceSMO;
+import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.user.*;
import com.java110.po.owner.OwnerAppUserPo;
@@ -26,10 +28,7 @@
import com.java110.utils.constant.UserLevelConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.exception.SMOException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
-import com.java110.utils.util.ValidatorUtil;
+import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +55,7 @@
@Autowired
private IUserAttrV1InnerServiceSMO userAttrV1InnerServiceSMOImpl;
+
@Autowired
private ISmsInnerServiceSMO smsInnerServiceSMOImpl;
@@ -71,6 +71,11 @@
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+ @Autowired
+ private ISystemInfoV1InnerServiceSMO systemInfoV1InnerServiceSMOImpl;
+
+
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
Assert.hasKeyAndValue(reqJson, "openId", "璇锋眰鎶ユ枃涓湭鍖呭惈openId");
@@ -81,18 +86,38 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
- // todo 2.0 鏍￠獙 涓氫富鐢ㄦ埛缁戝畾琛ㄦ槸鍚﹀瓨鍦ㄨ褰�
- OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
- ownerAppUserDto.setOpenId(reqJson.getString("openId"));
- List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ UserAttrDto userAttrDto = new UserAttrDto();
+ userAttrDto.setSpecCd(UserAttrDto.SPEC_OPEN_ID);
+ userAttrDto.setValue(reqJson.getString("openId"));
+ List<UserAttrDto> userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
- if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
+ if(ListUtil.isNull(userAttrDtos)){
throw new CmdException("鏈壘鍒扮敤鎴蜂俊鎭�");
}
+ // todo 2.0 鏍￠獙 涓氫富鐢ㄦ埛缁戝畾琛ㄦ槸鍚﹀瓨鍦ㄨ褰�
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setUserId(userAttrDtos.get(0).getUserId());
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+
+ String communityId = "";
+ if (!ListUtil.isNull(ownerAppUserDtos)) {
+ // todo 4.0 鏌ヨ灏忓尯鏄惁瀛樺湪
+ communityId = ownerAppUserDtos.get(0).getCommunityId();
+ } else {
+ SystemInfoDto systemInfoDto = new SystemInfoDto();
+ List<SystemInfoDto> systemInfoDtos = systemInfoV1InnerServiceSMOImpl.querySystemInfos(systemInfoDto);
+ communityId = systemInfoDtos.get(0).getDefaultCommunityId();
+ }
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setCommunityId(communityId);
+ List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+ Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨鍦紝纭繚寮�鍙戣�呰处鎴烽厤缃粯璁ゅ皬鍖�" + communityId);
+
+
UserDto userDto = new UserDto();
userDto.setLevelCd(UserDto.LEVEL_CD_USER);
- userDto.setUserId(ownerAppUserDtos.get(0).getUserId());
+ userDto.setUserId(userAttrDtos.get(0).getUserId());
//todo 1.0 鏌ヨ鐢ㄦ埛鏄惁瀛樺湪
List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
@@ -101,43 +126,22 @@
throw new CmdException("涓氫富涓嶅瓨鍦紝璇峰厛娉ㄥ唽");
}
-
- // todo 3.0 鏌ヨ涓氫富鏄惁瀛樺湪
- OwnerDto ownerDto = new OwnerDto();
- ownerDto.setMemberId(ownerAppUserDtos.get(0).getMemberId());
- ownerDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
- List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
-
- Assert.listOnlyOne(ownerDtos, "涓氫富涓嶅瓨鍦�");
-
- // todo 4.0 鏌ヨ灏忓尯鏄惁瀛樺湪
- CommunityDto communityDto = new CommunityDto();
- communityDto.setCommunityId(ownerAppUserDtos.get(0).getCommunityId());
- List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
- Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨鍦紝" + ownerAppUserDtos.get(0).getCommunityId());
-
-
- //todo 鐢熸垚 app 姘镐箙鐧诲綍key
UserDto tmpUserDto = userDtos.get(0);
String newKey = generatorLoginKey(tmpUserDto);
//todo 鐢熸垚鐧诲綍token
String token = generatorLoginToken(tmpUserDto);
-
LoginOwnerResDto loginOwnerResDto = new LoginOwnerResDto();
- loginOwnerResDto.setOwnerId(ownerDtos.get(0).getOwnerId());
- loginOwnerResDto.setMemberId(ownerDtos.get(0).getMemberId());
- loginOwnerResDto.setOwnerName(ownerDtos.get(0).getName());
+
+ loginOwnerResDto.setCommunityId(communityDtos.get(0).getCommunityId());
+ loginOwnerResDto.setCommunityName(communityDtos.get(0).getName());
+ loginOwnerResDto.setCommunityTel(communityDtos.get(0).getTel());
loginOwnerResDto.setUserId(tmpUserDto.getUserId());
loginOwnerResDto.setUserName(tmpUserDto.getName());
- loginOwnerResDto.setOwnerTel(ownerDtos.get(0).getLink());
- loginOwnerResDto.setCommunityId(ownerDtos.get(0).getCommunityId());
- loginOwnerResDto.setCommunityName(communityDtos.get(0).getName());
+ loginOwnerResDto.setOwnerTel(tmpUserDto.getTel());
loginOwnerResDto.setToken(token);
loginOwnerResDto.setKey(newKey);
- loginOwnerResDto.setAppUserId(ownerAppUserDtos.get(0).getAppUserId());
context.setResponseEntity(ResultVo.createResponseEntity(loginOwnerResDto));
-
}
/**
--
Gitblit v1.8.0