From 3d571a3e5ef8e6cc76214b79ea386455afb1bd9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 27 十二月 2024 11:02:05 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java | 235 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 124 insertions(+), 111 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java
index 9c420ce..c9bcc1a 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/OwnerRegisterCmd.java
@@ -4,7 +4,7 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.AuthenticationFactory;
import com.java110.core.factory.GenerateCodeFactory;
@@ -14,22 +14,30 @@
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.user.UserAttrDto;
+import com.java110.dto.user.UserDto;
import com.java110.intf.common.ISmsInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.community.IRoomV1InnerServiceSMO;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.intf.user.*;
import com.java110.po.owner.OwnerAppUserPo;
import com.java110.po.user.UserPo;
-import com.java110.po.userAttr.UserAttrPo;
+import com.java110.po.user.UserAttrPo;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.UserLevelConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
@@ -38,7 +46,7 @@
* 鏈嶅姟娉ㄥ唽鍔熻兘杩佺Щ
*/
@Java110Cmd(serviceCode = "owner.ownerRegister")
-public class OwnerRegisterCmd extends AbstractServiceCmdListener {
+public class OwnerRegisterCmd extends Cmd {
private final static Logger logger = LoggerFactory.getLogger(OwnerRegisterCmd.class);
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
@@ -64,6 +72,12 @@
@Autowired
private IOwnerAppUserV1InnerServiceSMO ownerAppUserV1InnerServiceSMOImpl;
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -71,12 +85,21 @@
Assert.hasKeyAndValue(reqJson, "msgCode", "鏈寘鍚仈绯荤數璇濋獙璇佺爜");
Assert.hasKeyAndValue(reqJson, "password", "鏈寘鍚瘑鐮�");
+ UserDto userDto = new UserDto();
+ userDto.setTel(reqJson.getString("link"));
+ userDto.setLevelCd(UserDto.LEVEL_CD_USER);
+ List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+
+ if (!ListUtil.isNull(userDtos)) {
+ throw new CmdException("鎵嬫満鍙峰凡瀛樺湪锛岃鐧婚檰");
+ }
+
SmsDto smsDto = new SmsDto();
smsDto.setTel(reqJson.getString("link"));
smsDto.setCode(reqJson.getString("msgCode"));
smsDto = smsInnerServiceSMOImpl.validateCode(smsDto);
- if (!smsDto.isSuccess() && "ON".equals(MappingCache.getValue(SendSmsFactory.SMS_SEND_SWITCH))) {
+ if (!smsDto.isSuccess() && "ON".equals(MappingCache.getValue(MappingConstant.SMS_DOMAIN, SendSmsFactory.SMS_SEND_SWITCH))) {
throw new IllegalArgumentException(smsDto.getMsg());
}
}
@@ -85,128 +108,118 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- OwnerAppUserDto ownerAppUserDto = BeanConvertUtil.covertBean(reqJson, OwnerAppUserDto.class);
- ownerAppUserDto.setStates(new String[]{"10000", "12000"});
-
- //鏄惁宸茬粡娉ㄥ唽杩�
- List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-
- if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) {
- throw new IllegalArgumentException("宸茬粡娉ㄥ唽杩囩敤鎴�");
- }
OwnerDto ownerDto = new OwnerDto();
ownerDto.setLink(reqJson.getString("link"));
-
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
- String appId = cmdDataFlowContext.getReqHeaders().get("app-id");
- if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) { //鍏紬鍙�
- reqJson.put("appType", OwnerAppUserDto.APP_TYPE_WECHAT);
- } else if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId)) { //灏忕▼搴�
- reqJson.put("appType", OwnerAppUserDto.APP_TYPE_WECHAT_MINA);
- } else {//app
- reqJson.put("appType", OwnerAppUserDto.APP_TYPE_APP);
- }
- reqJson.put("userId", GenerateCodeFactory.getUserId());
- if (reqJson.containsKey("openId")) {
- reqJson.put("openId", reqJson.getString("openId"));
- } else {
- reqJson.put("openId", "-1");
- }
- //娣诲姞灏忓尯妤�
- addOwnerAppUser(reqJson, ownerDtos);
- registerUser(reqJson);
-
- cmdDataFlowContext.setResponseEntity(ResultVo.success());
- }
-
- private void addOwnerAppUser(JSONObject paramInJson, List<OwnerDto> ownerDtos) {
- if (ownerDtos == null || ownerDtos.size() < 1) {
- OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(paramInJson, OwnerAppUserPo.class);
- //鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触
- ownerAppUserPo.setState("12000");
- ownerAppUserPo.setAppTypeCd("10010");
- ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
- ownerAppUserPo.setMemberId("-1");
- ownerAppUserPo.setCommunityName("-1");
- ownerAppUserPo.setCommunityId("鏃�");
- ownerAppUserPo.setAppUserName("娓稿");
- ownerAppUserPo.setIdCard("鏃�");
-
- int flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
- if (flag < 1) {
- throw new CmdException("娣诲姞鐢ㄦ埛涓氫富鍏崇郴澶辫触");
- }
- return;
- }
- List<CommunityDto> communityDtos = null;
- CommunityDto tmpCommunityDto = null;
- OwnerAppUserPo ownerAppUserPo = null;
- for (OwnerDto ownerDto : ownerDtos) {
- CommunityDto communityDto = new CommunityDto();
- communityDto.setState("1100");
- communityDto.setCommunityId(ownerDto.getCommunityId());
- communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
- Assert.listOnlyOne(communityDtos, "鎵嬫満鍙峰搴斾笟涓绘湭鏌ヨ鍒板皬鍖轰俊鎭紝璇疯仈绯荤墿涓�");
- tmpCommunityDto = communityDtos.get(0);
- ownerAppUserPo = BeanConvertUtil.covertBean(paramInJson, OwnerAppUserPo.class);
- //鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触
- ownerAppUserPo.setState("12000");
- ownerAppUserPo.setAppTypeCd("10010");
- ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
- ownerAppUserPo.setMemberId(ownerDto.getMemberId());
- ownerAppUserPo.setCommunityName(tmpCommunityDto.getName());
- ownerAppUserPo.setCommunityId(tmpCommunityDto.getCommunityId());
- ownerAppUserPo.setAppUserName(ownerDto.getName());
- ownerAppUserPo.setIdCard(ownerDto.getIdCard());
-
- int flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
- if (flag < 1) {
- throw new CmdException("娣诲姞鐢ㄦ埛涓氫富鍏崇郴澶辫触");
- }
- }
- }
-
- /**
- * 娉ㄥ唽鐢ㄦ埛
- *
- * @param paramObj
- */
- public void registerUser(JSONObject paramObj) {
- Assert.jsonObjectHaveKey(paramObj, "name", "璇锋眰鍙傛暟涓湭鍖呭惈name 鑺傜偣锛岃纭");
- Assert.jsonObjectHaveKey(paramObj, "tel", "璇锋眰鍙傛暟涓湭鍖呭惈tel 鑺傜偣锛岃纭");
- Assert.jsonObjectHaveKey(paramObj, "password", "璇锋眰鍙傛暟涓湭鍖呭惈password 鑺傜偣锛岃纭");
- if (paramObj.containsKey("email") && !StringUtil.isEmpty(paramObj.getString("email"))) {
- Assert.isEmail(paramObj, "email", "涓嶆槸鏈夋晥鐨勯偖绠辨牸寮�");
- }
-
- paramObj.put("levelCd", UserLevelConstant.USER_LEVEL_ORDINARY);
//璁剧疆榛樿瀵嗙爜
- String userPassword = paramObj.getString("password");
+ String userPassword = reqJson.getString("password");
userPassword = AuthenticationFactory.passwdMd5(userPassword);
- paramObj.put("password", userPassword);
+ String name = reqJson.getString("link");
+ if (!ListUtil.isNull(ownerDtos)) {
+ name = ownerDtos.get(0).getName();
+ }
+ //todo 娉ㄥ唽鐢ㄦ埛
+ UserPo userPo = new UserPo();
+ userPo.setAddress("鏃�");
+ userPo.setUserId(GenerateCodeFactory.getUserId());
+ userPo.setLevelCd(UserLevelConstant.USER_LEVEL_ORDINARY);
+ userPo.setName(name);
+ userPo.setTel(reqJson.getString("link"));
+ userPo.setPassword(userPassword);
-
- UserPo userPo = BeanConvertUtil.covertBean(paramObj, UserPo.class);
int flag = userV1InnerServiceSMOImpl.saveUser(userPo);
if (flag < 1) {
throw new CmdException("娉ㄥ唽澶辫触");
}
+ //todo 淇濆瓨openId
+ String openId = reqJson.getString("openId");
+ if (!StringUtil.isEmpty(openId)) {
+ UserAttrPo userAttrPo = new UserAttrPo();
+ userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ userAttrPo.setSpecCd(UserAttrDto.SPEC_OPEN_ID);
+ userAttrPo.setUserId(userPo.getUserId());
+ userAttrPo.setValue(openId);
+ flag = userAttrV1InnerServiceSMOImpl.saveUserAttr(userAttrPo);
+ if (flag < 1) {
+ throw new CmdException("娉ㄥ唽澶辫触");
+ }
+ }
- if (!paramObj.containsKey("openId") || "-1".equals(paramObj.getString("openId"))) {
+ //todo 鏍规嵁鎵嬫満鍙锋湭鍏宠仈鍒颁笟涓荤洿鎺ヨ繑鍥炴垚鍔燂紝鍚庣画閫氳繃璁よ瘉鎴垮眿鐨勬柟寮忔搷浣�
+ if (ListUtil.isNull(ownerDtos)) {
return;
}
- JSONObject userAttrObj = new JSONObject();
- userAttrObj.put("attrId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
- userAttrObj.put("specCd", "100201911001");
- userAttrObj.put("value", paramObj.getString("openId"));
- UserAttrPo userAttrPo = BeanConvertUtil.covertBean(userAttrObj, UserAttrPo.class);
- userAttrPo.setUserId(userPo.getUserId());
- flag = userAttrV1InnerServiceSMOImpl.saveUserAttr(userAttrPo);
- if (flag < 1) {
- throw new CmdException("娉ㄥ唽澶辫触");
+ String appId = cmdDataFlowContext.getReqHeaders().get("app-id");
+ String appType = "";
+ if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) { //鍏紬鍙�
+ appType = OwnerAppUserDto.APP_TYPE_WECHAT;
+ } else if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId)) { //灏忕▼搴�
+ appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
+ } else {//app
+ appType = OwnerAppUserDto.APP_TYPE_APP;
}
+ OwnerAppUserPo ownerAppUserPo = null;
+
+ List<CommunityDto> communityDtos = null;
+ for (OwnerDto tmpOwnerDto : ownerDtos) {
+ CommunityDto communityDto = new CommunityDto();
+ communityDto.setState("1100");
+ communityDto.setCommunityId(tmpOwnerDto.getCommunityId());
+ communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
+ if (ListUtil.isNull(communityDtos)) {
+ continue;
+ }
+ communityDto = communityDtos.get(0);
+ ownerAppUserPo = new OwnerAppUserPo();
+ ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
+ ownerAppUserPo.setMemberId(tmpOwnerDto.getMemberId());
+ ownerAppUserPo.setCommunityId(tmpOwnerDto.getCommunityId());
+ ownerAppUserPo.setCommunityName(communityDto.getName());
+ ownerAppUserPo.setAppUserName(tmpOwnerDto.getName());
+ ownerAppUserPo.setIdCard(tmpOwnerDto.getIdCard());
+ ownerAppUserPo.setLink(tmpOwnerDto.getLink());
+ ownerAppUserPo.setOpenId("-1");
+ ownerAppUserPo.setAppTypeCd("10010");
+ ownerAppUserPo.setState(OwnerAppUserDto.STATE_AUDIT_SUCCESS);
+ ownerAppUserPo.setRemark("娉ㄥ唽鑷姩鍏宠仈");
+ ownerAppUserPo.setUserId(userPo.getUserId());
+ ownerAppUserPo.setAppType(appType);
+ ownerAppUserPo.setOwnerTypeCd(tmpOwnerDto.getOwnerTypeCd());
+ queryOwnerRoom(tmpOwnerDto, ownerAppUserPo);
+ flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
+ if (flag < 1) {
+ throw new CmdException("娣诲姞鐢ㄦ埛涓氫富鍏崇郴澶辫触");
+ }
+ }
+
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
+
+ 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());
+ }
+
+
}
--
Gitblit v1.8.0