From 7935724516cb699835da888d59cd5b7bec5c6049 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 九月 2024 12:07:29 +0800
Subject: [PATCH] 完成业主功能的优化
---
service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java | 131 +++++++++++++++----------------------------
1 files changed, 47 insertions(+), 84 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java
index bb39e3a..6c78df7 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -39,6 +40,7 @@
import com.java110.utils.lock.DistributedLock;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,8 +67,9 @@
@Java110ParamDoc(name = "link", length = 11, remark = "涓氫富鎵嬫満鍙�"),
@Java110ParamDoc(name = "idCard", length = 30, remark = "涓氫富韬唤璇佸彿"),
@Java110ParamDoc(name = "address", length = 512, remark = "鍦板潃"),
+ @Java110ParamDoc(name = "personType", length = 12, remark = "浜哄憳绫诲瀷 P 涓汉 C 鍏徃"),
+ @Java110ParamDoc(name = "personRole", length = 12, remark = "浜哄憳瑙掕壊 1 涓氫富 2 绉熷 3 瀹跺涵鎴愬憳 4 鍏徃鍛樺伐 99 鍏朵粬"),
@Java110ParamDoc(name = "sex", length = 12, remark = "鎬у埆 鐢� 1 濂� 0"),
- @Java110ParamDoc(name = "ownerTypeCd", length = 12, remark = "涓氫富绫诲瀷 1001 涓氫富 2002 瀹跺涵鎴愬憳 瀹跺涵鎴愬憳 闇�瑕佷紶涓氫富鐨刼wnerId"),
@Java110ParamDoc(name = "remark", length = 512, remark = "澶囨敞"),
@Java110ParamDoc(name = "ownerId", length = 30, remark = "涓氫富 鏃� 濉啓-1 瀹跺涵鎴愬憳鏃跺～鍐欎笟涓籌D"),
@Java110ParamDoc(name = "ownerPhoto", length = -1, remark = "涓氫富浜鸿劯 鐢ㄤ簬鍚屾闂ㄧ 浜鸿劯寮�闂�"),
@@ -82,7 +85,6 @@
@Java110ExampleDoc(
reqBody = "{\n" +
"\t\"name\": \"鐜嬬帇\",\n" +
- "\t\"age\": \"\",\n" +
"\t\"link\": \"18909718888\",\n" +
"\t\"address\": \"寮犱笁\",\n" +
"\t\"sex\": \"0\",\n" +
@@ -90,6 +92,8 @@
"\t\"remark\": \"\",\n" +
"\t\"ownerId\": -1,\n" +
"\t\"ownerPhoto\": \"\",\n" +
+ "\t\"personType\": \"P\",\n" +
+ "\t\"personRole\": \"1\",\n" +
"\t\"idCard\": \"\",\n" +
"\t\"communityId\": \"2022121921870161\"\n" +
"}",
@@ -97,7 +101,6 @@
)
@Java110Cmd(serviceCode = "owner.saveOwner")
public class SaveOwnerCmd extends Cmd {
-
@Autowired
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
@@ -128,92 +131,66 @@
@Autowired
private IGeneratorOwnerUserBMO generatorOwnerUserBMOImpl;
-
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
Assert.jsonObjectHaveKey(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈userId");
- Assert.jsonObjectHaveKey(reqJson, "age", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
Assert.jsonObjectHaveKey(reqJson, "link", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
Assert.jsonObjectHaveKey(reqJson, "sex", "璇锋眰鎶ユ枃涓湭鍖呭惈sex");
- Assert.jsonObjectHaveKey(reqJson, "ownerTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈绫诲瀷");
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- //Assert.jsonObjectHaveKey(paramIn, "idCard", "璇锋眰鎶ユ枃涓湭鍖呭惈韬唤璇佸彿");
- if (reqJson.containsKey("roomId")) {
- Assert.jsonObjectHaveKey(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state鑺傜偣");
- Assert.jsonObjectHaveKey(reqJson, "storeId", "璇锋眰鎶ユ枃涓湭鍖呭惈storeId鑺傜偣");
- Assert.hasLength(reqJson.getString("roomId"), "roomId涓嶈兘涓虹┖");
- Assert.hasLength(reqJson.getString("state"), "state涓嶈兘涓虹┖");
- Assert.hasLength(reqJson.getString("storeId"), "storeId涓嶈兘涓虹┖");
- }
- if (reqJson.containsKey("msgCode")) {
- 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(MappingConstant.SMS_DOMAIN,SendSmsFactory.SMS_SEND_SWITCH))) {
- throw new IllegalArgumentException(smsDto.getMsg());
+ Assert.jsonObjectHaveKey(reqJson, "personType", "璇锋眰鎶ユ枃涓湭鍖呭惈personType");
+ Assert.jsonObjectHaveKey(reqJson, "personRole", "璇锋眰鎶ユ枃涓湭鍖呭惈personRole");
+
+ if (reqJson.containsKey("ownerPhotoUrl")) {
+ String ownerPhotoUrl = reqJson.getString("ownerPhotoUrl");
+ if (!StringUtil.isEmpty(ownerPhotoUrl) && ownerPhotoUrl.length() > 500) {
+ throw new CmdException("鍥剧墖鍦板潃澶暱");
}
}
+
//灞炴�ф牎楠�
Assert.judgeAttrValue(reqJson);
+
+ String userValidate = MappingCache.getValue("USER_VALIDATE");
+ if (!"ON".equals(userValidate)) {
+ return;
+ }
+ //鑾峰彇鎵嬫満鍙�(鍒ゆ柇鎵嬫満鍙锋槸鍚﹂噸澶�)
+ String link = reqJson.getString("link");
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setLink(link);
+ ownerDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryAllOwners(ownerDto);
+ Assert.listIsNull(ownerDtos, "鎵嬫満鍙烽噸澶嶏紝璇烽噸鏂拌緭鍏�");
+
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- String userValidate = MappingCache.getValue("USER_VALIDATE");
- if ((!reqJson.containsKey("source") || !"BatchImport".equals(reqJson.getString("source"))) && "ON".equals(userValidate)) {
- //鑾峰彇鎵嬫満鍙�(鍒ゆ柇鎵嬫満鍙锋槸鍚﹂噸澶�)
- String link = reqJson.getString("link");
- OwnerDto ownerDto = new OwnerDto();
- ownerDto.setLink(link);
- ownerDto.setCommunityId(reqJson.getString("communityId"));
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryAllOwners(ownerDto);
- Assert.listIsNull(ownerDtos, "鎵嬫満鍙烽噸澶嶏紝璇烽噸鏂拌緭鍏�");
- //鑾峰彇韬唤璇佸彿(鍒ゆ柇韬唤璇佸彿鏄惁閲嶅)
- String idCard = reqJson.getString("idCard");
- if (!StringUtil.isEmpty(idCard)) {
- OwnerDto owner = new OwnerDto();
- owner.setIdCard(idCard);
- owner.setCommunityId(reqJson.getString("communityId"));
- List<OwnerDto> owners = ownerInnerServiceSMOImpl.queryAllOwners(owner);
- Assert.listIsNull(owners, "韬唤璇佸彿閲嶅锛岃閲嶆柊杈撳叆");
- }
- }
- //鐢熸垚memberId
- generateMemberId(reqJson);
- JSONObject businessOwner = new JSONObject();
- businessOwner.putAll(reqJson);
- businessOwner.put("state", "2000");
- OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
- if (reqJson.containsKey("age") && StringUtil.isEmpty(reqJson.getString("age"))) {
- ownerPo.setAge(null);
- }
+ String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
+
+ String memberId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId);
+
+ OwnerPo ownerPo = BeanConvertUtil.covertBean(reqJson, OwnerPo.class);
+ ownerPo.setState(OwnerDto.STATE_FINISH);
+ ownerPo.setMemberId(memberId);
+ ownerPo.setOwnerId(memberId);
+ ownerPo.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
+ ownerPo.setAge("0");
+ ownerPo.setUserId(userId);
+
+ String ownerPhotoUrl = reqJson.getString("ownerPhotoUrl");
+
+
+ ownerPo.setFaceUrl(ownerPhotoUrl);
int flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
if (flag < 1) {
throw new CmdException("淇濆瓨涓氫富澶辫触");
}
- //鏈夋埧灞嬩俊鎭紝鍒欑洿鎺ョ粦瀹氭埧灞嬪拰 涓氫富鐨勫叧绯�
- if (reqJson.containsKey("roomId")) {
- JSONObject businessUnit = new JSONObject();
- businessUnit.putAll(reqJson);
- businessUnit.put("relId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
- OwnerRoomRelPo ownerRoomRelPo = BeanConvertUtil.covertBean(businessUnit, OwnerRoomRelPo.class);
- flag = ownerRoomRelV1InnerServiceSMOImpl.saveOwnerRoomRel(ownerRoomRelPo);
- if (flag < 1) {
- throw new CmdException("淇濆瓨涓氫富鎴垮眿鍏崇郴澶辫触");
- }
- }
- //淇濆瓨鐓х墖
- photoSMOImpl.savePhoto(reqJson.getString("ownerPhoto"),
- reqJson.getString("memberId"),
- reqJson.getString("communityId"),
- "10000");
-
- dealOwnerAttr(reqJson, cmdDataFlowContext);
+ dealOwnerAttr(reqJson, memberId, cmdDataFlowContext);
//todo 鐢熸垚鐧诲綍璐﹀彿
@@ -221,28 +198,14 @@
}
-
- /**
- * 鐢熸垚灏忓尯妤糏D
- *
- * @param paramObj 璇锋眰鍏ュ弬鏁版嵁
- */
- private void generateMemberId(JSONObject paramObj) {
- String memberId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId);
- paramObj.put("memberId", memberId);
- if (!paramObj.containsKey("ownerId") || OwnerDto.OWNER_TYPE_CD_OWNER.equals(paramObj.getString("ownerTypeCd"))) {
- paramObj.put("ownerId", memberId);
- }
- }
-
- private void dealOwnerAttr(JSONObject paramObj, ICmdDataFlowContext cmdDataFlowContext) {
+ private void dealOwnerAttr(JSONObject paramObj, String memberId, ICmdDataFlowContext cmdDataFlowContext) {
if (!paramObj.containsKey("attrs")) {
return;
}
JSONArray attrs = paramObj.getJSONArray("attrs");
- if (attrs.size() < 1) {
+ if (ListUtil.isNull(attrs)) {
return;
}
@@ -251,7 +214,7 @@
for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
attr = attrs.getJSONObject(attrIndex);
attr.put("communityId", paramObj.getString("communityId"));
- attr.put("memberId", paramObj.getString("memberId"));
+ attr.put("memberId", memberId);
attr.put("attrId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
OwnerAttrPo ownerAttrPo = BeanConvertUtil.covertBean(attr, OwnerAttrPo.class);
flag = ownerAttrInnerServiceSMOImpl.saveOwnerAttr(ownerAttrPo);
--
Gitblit v1.8.0