From 45102fc13900aad6d117b00a4feeeafe9c3f5fee Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 27 五月 2025 21:04:09 +0800
Subject: [PATCH] 优化查询业主成员
---
service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerMemberCmd.java | 103 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 75 insertions(+), 28 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerMemberCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerMemberCmd.java
index 0f22dd2..28d1a58 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerMemberCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerMemberCmd.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;
@@ -11,6 +12,7 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.factory.SendSmsFactory;
import com.java110.core.smo.IPhotoSMO;
+import com.java110.doc.annotation.*;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.msg.SmsDto;
import com.java110.dto.owner.OwnerDto;
@@ -31,12 +33,61 @@
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 org.springframework.beans.factory.annotation.Autowired;
import java.text.ParseException;
import java.util.List;
+@Java110CmdDoc(title = "娣诲姞涓氫富",
+ description = "绗笁鏂圭郴缁燂紝姣斿鎷涘晢绯荤粺鍚屾涓氫富淇℃伅",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/owner.saveOwnerMember",
+ resource = "userDoc",
+ author = "鍚村鏂�",
+ serviceCode = "owner.saveOwnerMember",
+ seq = 10
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
+ @Java110ParamDoc(name = "name", length = 64, remark = "涓氫富鍚嶇О"),
+ @Java110ParamDoc(name = "roomName", length = 64, remark = "鎴垮眿 妤兼爧-鍗曞厓-鎴垮眿"),
+ @Java110ParamDoc(name = "link", length = 11, remark = "涓氫富鎵嬫満鍙�"),
+ @Java110ParamDoc(name = "idCard", length = 30, remark = "涓氫富韬唤璇佸彿"),
+ @Java110ParamDoc(name = "address", length = 512, remark = "鍦板潃"),
+ @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 = "涓氫富浜鸿劯 鐢ㄤ簬鍚屾闂ㄧ 浜鸿劯寮�闂�"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody = "{\n" +
+ "\t\"name\": \"鐜嬬帇\",\n" +
+ "\t\"roomName\": \"1-1-1001\",\n" +
+ "\t\"age\": \"\",\n" +
+ "\t\"link\": \"18909718888\",\n" +
+ "\t\"address\": \"寮犱笁\",\n" +
+ "\t\"sex\": \"0\",\n" +
+ "\t\"ownerTypeCd\": \"1001\",\n" +
+ "\t\"remark\": \"\",\n" +
+ "\t\"ownerId\": -1,\n" +
+ "\t\"ownerPhoto\": \"\",\n" +
+ "\t\"idCard\": \"\",\n" +
+ "\t\"communityId\": \"2022121921870161\"\n" +
+ "}",
+ resBody = "{\"code\":0,\"msg\":\"鎴愬姛\"}"
+)
/**
* 娣诲姞瀹跺涵鎴愬憳
*/
@@ -76,13 +127,22 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
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, "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈涓氫富");
+ if(!reqJson.containsKey("link") || StringUtil.isEmpty(reqJson.getString("link"))){
+ reqJson.put("link",GenerateCodeFactory.getLink());
+ }
+
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+
+ if (reqJson.containsKey("ownerPhotoUrl")) {
+ String ownerPhotoUrl = reqJson.getString("ownerPhotoUrl");
+ if (!StringUtil.isEmpty(ownerPhotoUrl) && ownerPhotoUrl.length() > 500) {
+ throw new CmdException("鍥剧墖鍦板潃澶暱");
+ }
+ }
//todo 楠岃瘉鍚楁牎楠�
if (reqJson.containsKey("msgCode")) {
@@ -113,27 +173,25 @@
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+ String userId = CmdContextUtils.getUserId(context);
//todo 鐢熸垚memberId
- generateMemberId(reqJson);
+ String memberId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId);
+ reqJson.put("memberId", memberId);
- 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);
- }
+ OwnerPo ownerPo = BeanConvertUtil.covertBean(reqJson, OwnerPo.class);
+
+ String ownerPhotoUrl = reqJson.getString("ownerPhotoUrl");
+ ownerPo.setFaceUrl(ownerPhotoUrl);
+ ownerPo.setAge("0");
+ ownerPo.setUserId(userId);
+ ownerPo.setState(OwnerDto.STATE_FINISH);
+ ownerPo.setPersonType(OwnerDto.PERSON_TYPE_PERSON);
+ ownerPo.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_MEMBER);
int flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
if (flag < 1) {
throw new CmdException("淇濆瓨涓氫富澶辫触");
}
-
- //todo 淇濆瓨鐓х墖
- photoSMOImpl.savePhoto(reqJson.getString("ownerPhoto"),
- reqJson.getString("memberId"),
- reqJson.getString("communityId"),
- "10000");
//todo 淇濆瓨灞炴��
dealOwnerAttr(reqJson, context);
@@ -143,17 +201,6 @@
}
-
- /**
- * 鐢熸垚灏忓尯妤糏D
- *
- * @param paramObj 璇锋眰鍏ュ弬鏁版嵁
- */
- private void generateMemberId(JSONObject paramObj) {
- String memberId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId);
- paramObj.put("memberId", memberId);
-
- }
private void dealOwnerAttr(JSONObject paramObj, ICmdDataFlowContext cmdDataFlowContext) {
--
Gitblit v1.8.0