From 79c4a94b8d90daad16d51a851832ce7d0cff1992 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 31 三月 2022 08:45:40 +0800
Subject: [PATCH] 优化 添加业主为 cmd模式
---
service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java | 136 +++++++++++++++++++++++----------------------
1 files changed, 70 insertions(+), 66 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java
old mode 100755
new mode 100644
similarity index 60%
rename from service-api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java
rename to service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java
index 604112a..a86d769
--- a/service-api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java
@@ -1,54 +1,45 @@
-package com.java110.api.listener.owner;
+package com.java110.user.cmd.owner;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.owner.IOwnerBMO;
-import com.java110.api.bmo.ownerAttr.IOwnerAttrBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
+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.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.factory.SendSmsFactory;
import com.java110.dto.file.FileDto;
import com.java110.dto.msg.SmsDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.common.ISmsInnerServiceSMO;
+import com.java110.intf.community.IOwnerRoomRelV1InnerServiceSMO;
+import com.java110.intf.community.IOwnerV1InnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.user.IOwnerAttrInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.po.file.FileRelPo;
+import com.java110.po.owner.OwnerAttrPo;
+import com.java110.po.owner.OwnerPo;
+import com.java110.po.owner.OwnerRoomRelPo;
import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.ServiceCodeConstant;
+import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
import java.util.List;
-/**
- * @ClassName SaveOwnerListener
- * @Description 淇濆瓨灏忓尯妤间俊鎭�
- * @Author wuxw
- * @Date 2019/4/26 14:51
- * @Version 1.0
- * add by wuxw 2019/4/26
- **/
-
-@Java110Listener("saveOwnerListener")
-public class SaveOwnerListener extends AbstractServiceApiPlusListener {
-
- @Autowired
- private IOwnerBMO ownerBMOImpl;
+@Java110Cmd(serviceCode = "owner.saveOwner")
+public class SaveOwnerCmd extends AbstractServiceCmdListener {
@Autowired
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
- @Autowired
- private IOwnerAttrBMO ownerAttrBMOImpl;
@Autowired
private ISmsInnerServiceSMO smsInnerServiceSMOImpl;
@@ -57,22 +48,22 @@
private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
+ @Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
- private static Logger logger = LoggerFactory.getLogger(SaveOwnerListener.class);
+ @Autowired
+ private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerAttrInnerServiceSMO ownerAttrInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
@Override
- public String getServiceCode() {
- return ServiceCodeConstant.SERVICE_CODE_SAVE_OWNER;
- }
-
- @Override
- public HttpMethod getHttpMethod() {
- return HttpMethod.POST;
- }
-
- @Override
- protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+ 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");
@@ -102,7 +93,8 @@
}
@Override
- protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+ @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)) {
//鑾峰彇鎵嬫満鍙�(鍒ゆ柇鎵嬫満鍙锋槸鍚﹂噸澶�)
@@ -124,18 +116,24 @@
}
//鐢熸垚memberId
generateMemberId(reqJson);
- //娣诲姞灏忓尯妤�
- ownerBMOImpl.addOwner(reqJson, context);
- // if ("1001".equals(reqJson.getString("ownerTypeCd"))) {
- // //灏忓尯妤兼坊鍔犲埌灏忓尯涓�
- // ownerBMOImpl.addCommunityMember(reqJson, context);
- // }
+ JSONObject businessOwner = new JSONObject();
+ businessOwner.putAll(reqJson);
+ businessOwner.put("state", "2000");
+ OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
+ int flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨涓氫富澶辫触");
+ }
//鏈夋埧灞嬩俊鎭紝鍒欑洿鎺ョ粦瀹氭埧灞嬪拰 涓氫富鐨勫叧绯�
if (reqJson.containsKey("roomId")) {
- //娣诲姞鍗曞厓淇℃伅
- ownerBMOImpl.sellRoom(reqJson, context);
- //娣诲姞鐗╀笟璐圭敤淇℃伅
- //ownerBMOImpl.addPropertyFee(reqJson, context);
+ 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("淇濆瓨涓氫富鎴垮眿鍏崇郴澶辫触");
+ }
}
if (reqJson.containsKey("ownerPhoto") && !StringUtils.isEmpty(reqJson.getString("ownerPhoto"))) {
FileDto fileDto = new FileDto();
@@ -148,11 +146,21 @@
reqJson.put("ownerPhotoId", fileDto.getFileId());
reqJson.put("fileSaveName", fileName);
- ownerBMOImpl.addOwnerPhoto(reqJson, context);
+ JSONObject businessUnit = new JSONObject();
+ businessUnit.put("fileRelId", "-1");
+ businessUnit.put("relTypeCd", "10000");
+ businessUnit.put("saveWay", "table");
+ businessUnit.put("objId", reqJson.getString("memberId"));
+ businessUnit.put("fileRealName", reqJson.getString("ownerPhotoId"));
+ businessUnit.put("fileSaveName", reqJson.getString("fileSaveName"));
+ FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
+ flag = fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨涓氫富鎴垮眿鍏崇郴澶辫触");
+ }
}
- dealOwnerAttr(reqJson, context);
-
+ dealOwnerAttr(reqJson, cmdDataFlowContext);
}
/**
@@ -163,12 +171,12 @@
private void generateMemberId(JSONObject paramObj) {
String memberId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId);
paramObj.put("memberId", memberId);
- if (!paramObj.containsKey("ownerId") || "1001".equals(paramObj.getString("ownerTypeCd"))) {
+ if (!paramObj.containsKey("ownerId") || OwnerDto.OWNER_TYPE_CD_OWNER.equals(paramObj.getString("ownerTypeCd"))) {
paramObj.put("ownerId", memberId);
}
}
- private void dealOwnerAttr(JSONObject paramObj, DataFlowContext context) {
+ private void dealOwnerAttr(JSONObject paramObj, ICmdDataFlowContext cmdDataFlowContext) {
if (!paramObj.containsKey("attrs")) {
return;
@@ -179,23 +187,19 @@
return;
}
-
+ int flag = 0;
JSONObject attr = null;
for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
attr = attrs.getJSONObject(attrIndex);
attr.put("communityId", paramObj.getString("communityId"));
attr.put("memberId", paramObj.getString("memberId"));
- ownerAttrBMOImpl.addOwnerAttr(attr, context);
+ attr.put("attrId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ OwnerAttrPo ownerAttrPo = BeanConvertUtil.covertBean(attr, OwnerAttrPo.class);
+ flag = ownerAttrInnerServiceSMOImpl.saveOwnerAttr(ownerAttrPo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨涓氫富鎴垮眿鍏崇郴澶辫触");
+ }
}
- }
-
-
- public IFileInnerServiceSMO getFileInnerServiceSMOImpl() {
- return fileInnerServiceSMOImpl;
- }
-
- public void setFileInnerServiceSMOImpl(IFileInnerServiceSMO fileInnerServiceSMOImpl) {
- this.fileInnerServiceSMOImpl = fileInnerServiceSMOImpl;
}
}
--
Gitblit v1.8.0