From 35b7b48dcc6825d661c67fb9b7a2ed33d9743851 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 十二月 2024 23:14:06 +0800
Subject: [PATCH] 加入手机合规性校验
---
service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java | 115 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 81 insertions(+), 34 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
index 74ddfd7..c66fefe 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
@@ -13,11 +13,18 @@
import com.java110.dto.msg.SmsDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
+import com.java110.dto.room.RoomDto;
+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.community.IRoomInnerServiceSMO;
+import com.java110.intf.job.IIotInnerServiceSMO;
+import com.java110.intf.job.IMallInnerServiceSMO;
import com.java110.intf.user.*;
import com.java110.po.owner.OwnerAppUserPo;
import com.java110.po.user.UserAttrPo;
@@ -27,10 +34,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;
@@ -71,6 +75,21 @@
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+ @Autowired
+ private ISystemInfoV1InnerServiceSMO systemInfoV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMallInnerServiceSMO mallInnerServiceSMOImpl;
+
+ @Autowired
+ private IIotInnerServiceSMO iotInnerServiceSMOImpl;
+
+ @Autowired
+ private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
Assert.hasKeyAndValue(reqJson, "username", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛鍚�");
@@ -79,7 +98,7 @@
//todo 楠岃瘉鐮佺櫥褰�
if (reqJson.containsKey("loginByPhone") && reqJson.getBoolean("loginByPhone")) {
SmsDto smsDto = new SmsDto();
- smsDto.setTel(reqJson.getString("userName"));
+ smsDto.setTel(reqJson.getString("username"));
smsDto.setCode(reqJson.getString("password"));
smsDto = smsInnerServiceSMOImpl.validateCode(smsDto);
if (!smsDto.isSuccess()) {
@@ -94,10 +113,10 @@
UserDto userDto = new UserDto();
userDto.setLevelCd(UserDto.LEVEL_CD_USER);
- if (ValidatorUtil.isMobile(reqJson.getString("userName"))) {//鐢ㄦ埛涓存椂绉橀挜鐧诲綍
- userDto.setTel(reqJson.getString("userName"));
+ if (ValidatorUtil.isMobile(reqJson.getString("username"))) {//鐢ㄦ埛涓存椂绉橀挜鐧诲綍
+ userDto.setTel(reqJson.getString("username"));
} else {
- userDto.setUserName(reqJson.getString("userName"));
+ userDto.setUserName(reqJson.getString("username"));
}
// todo 涓嶆槸楠岃瘉鐮佺櫥褰�
@@ -109,37 +128,39 @@
List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
//todo 1.1 濡傛灉楠岃瘉鐮佺櫥褰曪紝鑷姩缁戝畾鍏崇郴
- if (userDtos == null || userDtos.size() < 1) {
+ if (ListUtil.isNull(userDtos)) {
userDtos = ifOwnerLoginByPhone(reqJson, context);
}
- if (userDtos == null || userDtos.size() < 1) {
- throw new CmdException("涓氫富涓嶅瓨鍦紝璇峰厛娉ㄥ唽");
+ if (ListUtil.isNull(userDtos)) {
+ throw new CmdException("瀵嗙爜閿欒鎴栬�呯敤鎴蜂笉瀛樺湪");
}
+
+ //todo 1.2 鍚屾鐗╀笟鐢ㄦ埛璧勬枡缁欏晢鍩�
+ mallInnerServiceSMOImpl.sendUserInfo(userDtos.get(0));
+
+ //todo 1.3 鍚屾鐗╀笟鐢ㄦ埛璧勬枡缁欑墿鑱旂綉
+ iotInnerServiceSMOImpl.sendUserInfo(userDtos.get(0));
// todo 2.0 鏍￠獙 涓氫富鐢ㄦ埛缁戝畾琛ㄦ槸鍚﹀瓨鍦ㄨ褰�
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
ownerAppUserDto.setUserId(userDtos.get(0).getUserId());
ownerAppUserDto.setLink(userDtos.get(0).getTel());
+ ownerAppUserDto.setState(OwnerAppUserDto.STATE_AUDIT_SUCCESS);
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
- if (ownerAppUserDtos == null || ownerAppUserDtos.size() < 1) {
- throw new CmdException("鐢ㄦ埛鏈敞鍐岋紝璇峰厛娉ㄥ唽");
+ 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();
}
-
- // 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());
+ communityDto.setCommunityId(communityId);
List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
- Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨鍦紝" + ownerAppUserDtos.get(0).getCommunityId());
-
+ Assert.listOnlyOne(communityDtos, "灏忓尯涓嶅瓨鍦紝纭繚寮�鍙戣�呰处鎴烽厤缃粯璁ゅ皬鍖�" + communityId);
//todo 鐢熸垚 app 姘镐箙鐧诲綍key
UserDto tmpUserDto = userDtos.get(0);
@@ -147,16 +168,15 @@
//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.setCommunityQrCode(communityDtos.get(0).getQrCode());
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);
context.setResponseEntity(ResultVo.createResponseEntity(loginOwnerResDto));
@@ -235,7 +255,7 @@
List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
// 璇存槑涓氫富涓嶅瓨鍦� 鐩存帴杩斿洖璺戝紓甯�
- if (ownerDtos == null || ownerDtos.size() < 1) {
+ if (ListUtil.isNull(ownerDtos)) {
return null;
}
@@ -273,6 +293,10 @@
ownerAppUserPo.setLink(ownerDtos.get(0).getLink());
ownerAppUserPo.setUserId(userPo.getUserId());
ownerAppUserPo.setOpenId("-1");
+ ownerAppUserPo.setOwnerTypeCd(ownerDtos.get(0).getOwnerTypeCd());
+
+ queryOwnerRoom(ownerDtos.get(0), ownerAppUserPo);
+
flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
if (flag < 1) {
@@ -285,6 +309,29 @@
return userDtos;
}
+ private void queryOwnerRoom(OwnerDto ownerDto, OwnerAppUserPo ownerAppUserPo) {
+
+
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setOwnerId(ownerDto.getOwnerId());
+
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+
+ if (ListUtil.isNull(ownerRoomRelDtos)) {
+ return;
+ }
+
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(ownerRoomRelDtos.get(0).getRoomId());
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+ if (ListUtil.isNull(roomDtos)) {
+ return;
+ }
+
+ ownerAppUserPo.setRoomId(roomDtos.get(0).getRoomId());
+ ownerAppUserPo.setRoomName(roomDtos.get(0).getFloorNum() + "-" + roomDtos.get(0).getUnitNum() + "-" + roomDtos.get(0).getRoomNum());
+ }
+
private UserAttrDto getCurrentUserAttrDto(List<UserAttrDto> userAttrDtos, String specCd) {
if (userAttrDtos == null) {
return null;
--
Gitblit v1.8.0