From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java | 130 ++++++++++++++++++++++++++++++++++--------
1 files changed, 104 insertions(+), 26 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
index 3610822..e4d806d 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/EditOwnerCmd.java
@@ -5,13 +5,16 @@
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.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
+import com.java110.dto.account.AccountDto;
import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
@@ -19,6 +22,7 @@
import com.java110.intf.user.IOwnerAppUserV1InnerServiceSMO;
import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.po.account.AccountPo;
import com.java110.po.file.FileRelPo;
import com.java110.po.owner.OwnerAppUserPo;
import com.java110.po.owner.OwnerAttrPo;
@@ -33,12 +37,54 @@
import java.util.List;
+@Java110CmdDoc(title = "淇敼涓氫富",
+ description = "绗笁鏂圭郴缁燂紝姣斿鎷涘晢绯荤粺鍚屾涓氫富淇℃伅",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/owner.editOwner",
+ resource = "userDoc",
+ author = "鍚村鏂�",
+ serviceCode = "owner.editOwner",
+ seq = 10
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
+ @Java110ParamDoc(name = "name", 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 = "memberId", length = 30, remark = "涓氫富ID"),
+ @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\"age\": \"\",\n" +
+ "\t\"link\": \"18909718888\",\n" +
+ "\t\"address\": \"寮犱笁\",\n" +
+ "\t\"sex\": \"0\",\n" +
+ "\t\"ownerTypeCd\": \"1001\",\n" +
+ "\t\"remark\": \"\",\n" +
+ "\t\"memberId\": 123123123,\n" +
+ "\t\"ownerPhoto\": \"\",\n" +
+ "\t\"idCard\": \"\",\n" +
+ "\t\"communityId\": \"2022121921870161\"\n" +
+ "}",
+ resBody="{\"code\":0,\"msg\":\"鎴愬姛\"}"
+)
@Java110Cmd(serviceCode = "owner.editOwner")
-public class EditOwnerCmd extends AbstractServiceCmdListener {
-
-
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+public class EditOwnerCmd extends Cmd {
@Autowired
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
@@ -51,18 +97,24 @@
@Autowired
private IOwnerAppUserInnerServiceSMO ownerAppUserInnerServiceSMOImpl;
+
@Autowired
private IOwnerAppUserV1InnerServiceSMO ownerAppUserV1InnerServiceSMOImpl;
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+ @Autowired
+ private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+ @Autowired
+ private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "memberId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId");
Assert.jsonObjectHaveKey(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
- Assert.jsonObjectHaveKey(reqJson, "age", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
+// Assert.jsonObjectHaveKey(reqJson, "age", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
Assert.jsonObjectHaveKey(reqJson, "link", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
Assert.jsonObjectHaveKey(reqJson, "sex", "璇锋眰鎶ユ枃涓湭鍖呭惈sex");
Assert.jsonObjectHaveKey(reqJson, "ownerTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerTypeCd");
@@ -84,6 +136,7 @@
}
//鑾峰彇韬唤璇佸彿(鍒ゆ柇韬唤璇佸彿鏄惁閲嶅)
String idCard = reqJson.getString("idCard");
+
if (!StringUtil.isEmpty(idCard) && idCard.contains("*")) {
OwnerDto owner = new OwnerDto();
owner.setOwnerId(reqJson.getString("ownerId"));
@@ -97,8 +150,8 @@
String userValidate = MappingCache.getValue("USER_VALIDATE");
- if(!"ON".equals(userValidate)){
- return ;
+ if (!"ON".equals(userValidate)) {
+ return;
}
OwnerDto ownerDto = new OwnerDto();
@@ -143,20 +196,15 @@
// throw new IllegalArgumentException("鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘锛�");
// }
if (reqJson.containsKey("ownerPhoto") && !StringUtils.isEmpty(reqJson.getString("ownerPhoto"))) {
- FileDto fileDto = new FileDto();
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- fileDto.setContext(reqJson.getString("ownerPhoto"));
- fileDto.setSuffix("jpeg");
- fileDto.setCommunityId(reqJson.getString("communityId"));
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- reqJson.put("ownerPhotoId", fileDto.getFileId());
- reqJson.put("fileSaveName", fileName);
editOwnerPhoto(reqJson);
}
+ //todo 淇敼 涓氫富淇℃伅
editOwner(reqJson);
+
+
+
JSONArray attrs = reqJson.getJSONArray("attrs");
- if (attrs.size() < 1) {
+ if (attrs == null || attrs.size() < 1) {
return;
}
JSONObject attr = null;
@@ -165,7 +213,7 @@
attr = attrs.getJSONObject(attrIndex);
attr.put("memberId", reqJson.getString("memberId"));
attr.put("communityId", reqJson.getString("communityId"));
- if (!attr.containsKey("attrId") || attr.getString("attrId").startsWith("-") || StringUtil.isEmpty(attr.getString("attrId"))) {
+ if (!attr.containsKey("attrId") || StringUtil.isEmpty(attr.getString("attrId")) || attr.getString("attrId").startsWith("-")) {
attr.put("attrId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
OwnerAttrPo ownerAttrPo = BeanConvertUtil.covertBean(attr, OwnerAttrPo.class);
flag = ownerAttrInnerServiceSMOImpl.saveOwnerAttr(ownerAttrPo);
@@ -199,6 +247,9 @@
}
businessOwner.put("state", ownerDtos.get(0).getState());
OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
+ if (StringUtil.isEmpty(ownerPo.getIdCard())) {
+ ownerPo.setAge(null);
+ }
int flag = ownerV1InnerServiceSMOImpl.updateOwner(ownerPo);
if (flag < 1) {
throw new CmdException("淇敼涓氫富澶辫触");
@@ -206,7 +257,7 @@
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
ownerAppUserDto.setMemberId(paramInJson.getString("ownerId"));
- //鏌ヨapp鐢ㄦ埛琛�
+ //todo 鏌ヨapp鐢ㄦ埛琛�
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserInnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
if (ownerAppUserDtos != null && ownerAppUserDtos.size() > 0) {
for (OwnerAppUserDto ownerAppUser : ownerAppUserDtos) {
@@ -219,9 +270,36 @@
}
}
}
+ //todo 鍒ゆ柇涓氫富鎵嬫満鍙峰拰璐︽埛鎵嬫満鍙锋槸鍚︾浉鍚岋紝涓嶇浉鍚屼慨鏀硅处鎴锋墜鏈哄彿
+ AccountDto accountDto = new AccountDto();
+ accountDto.setObjId(ownerDtos.get(0).getMemberId());
+ accountDto.setPartId(ownerDtos.get(0).getCommunityId());
+ List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
+ if(accountDtos == null || accountDtos.size()< 1){
+ return ;
+ }
+ if(accountDtos.get(0).getLink().equals(ownerDtos.get(0).getLink())){
+ return;
+ }
+
+ AccountPo accountPo = new AccountPo();
+ accountPo.setLink(ownerDtos.get(0).getLink());
+ accountPo.setAcctId(accountDtos.get(0).getAcctId());
+ accountInnerServiceSMOImpl.updateAccount(accountPo);
}
public void editOwnerPhoto(JSONObject paramInJson) {
+
+ String _photo = paramInJson.getString("ownerPhoto");
+ if(_photo.length()> 512){
+ FileDto fileDto = new FileDto();
+ fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
+ fileDto.setFileName(fileDto.getFileId());
+ fileDto.setContext(_photo);
+ fileDto.setSuffix("jpeg");
+ fileDto.setCommunityId(paramInJson.getString("communityId"));
+ _photo = fileInnerServiceSMOImpl.saveFile(fileDto);
+ }
FileRelDto fileRelDto = new FileRelDto();
fileRelDto.setRelTypeCd("10000");
@@ -230,12 +308,12 @@
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
if (fileRelDtos == null || fileRelDtos.size() == 0) {
JSONObject businessUnit = new JSONObject();
- businessUnit.put("fileRelId", "-1");
+ businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
businessUnit.put("relTypeCd", "10000");
businessUnit.put("saveWay", "table");
businessUnit.put("objId", paramInJson.getString("memberId"));
- businessUnit.put("fileRealName", paramInJson.getString("ownerPhotoId"));
- businessUnit.put("fileSaveName", paramInJson.getString("ownerPhotoId"));
+ businessUnit.put("fileRealName", _photo);
+ businessUnit.put("fileSaveName", _photo);
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
if (flag < 1) {
@@ -246,8 +324,8 @@
JSONObject businessUnit = new JSONObject();
businessUnit.putAll(BeanConvertUtil.beanCovertMap(fileRelDtos.get(0)));
- businessUnit.put("fileRealName", paramInJson.getString("ownerPhotoId"));
- businessUnit.put("fileSaveName", paramInJson.getString("fileSaveName"));
+ businessUnit.put("fileRealName", _photo);
+ businessUnit.put("fileSaveName", _photo);
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
flag = fileRelInnerServiceSMOImpl.updateFileRel(fileRelPo);
if (flag < 1) {
--
Gitblit v1.8.0