From d6039d44dc57bd13c1ffcd96594b9faa526a57e0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 13 九月 2023 16:29:01 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/cmd/org/UpdateOrgCmd.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/org/UpdateOrgCmd.java b/service-user/src/main/java/com/java110/user/cmd/org/UpdateOrgCmd.java
index e87d388..c59593e 100644
--- a/service-user/src/main/java/com/java110/user/cmd/org/UpdateOrgCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/org/UpdateOrgCmd.java
@@ -21,6 +21,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.org.OrgDto;
import com.java110.intf.user.IOrgV1InnerServiceSMO;
import com.java110.po.org.OrgPo;
import com.java110.utils.exception.CmdException;
@@ -30,6 +31,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.util.List;
/**
@@ -53,8 +56,14 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "orgId", "orgId涓嶈兘涓虹┖");
-Assert.hasKeyAndValue(reqJson, "storeId", "storeId涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "orgId", "缁勭粐ID涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "orgName", "蹇呭～锛岃濉啓缁勭粐鍚嶇О");
+ Assert.hasKeyAndValue(reqJson, "orgLevel", "蹇呭～锛岃濉啓鎶ヤ慨浜哄悕绉�");
+ Assert.hasKeyAndValue(reqJson, "parentOrgId", "蹇呭～锛岃閫夋嫨涓婄骇ID");
+ //Assert.hasKeyAndValue(reqJson, "description", "蹇呭～锛岃濉啓鎻忚堪");
+ String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
+ reqJson.put("storeId", storeId);
+ Assert.hasKeyAndValue(reqJson, "storeId", "蹇呭～锛岃濉啓鍟嗘埛ID");
}
@@ -62,7 +71,19 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- OrgPo orgPo = BeanConvertUtil.covertBean(reqJson, OrgPo.class);
+ OrgDto orgDto = new OrgDto();
+ orgDto.setOrgId(reqJson.getString("orgId"));
+ orgDto.setStoreId(reqJson.getString("storeId"));
+ List<OrgDto> orgDtos = orgV1InnerServiceSMOImpl.queryOrgs(orgDto);
+
+ Assert.listOnlyOne(orgDtos, "鏈煡璇㈠埌缁勭粐淇℃伅 鎴栨煡璇㈠埌澶氭潯鏁版嵁");
+
+ JSONObject businessOrg = new JSONObject();
+ businessOrg.putAll(reqJson);
+ businessOrg.put("allowOperation", orgDtos.get(0).getAllowOperation());
+ businessOrg.put("belongCommunityId", orgDtos.get(0).getBelongCommunityId());
+ OrgPo orgPo = BeanConvertUtil.covertBean(businessOrg, OrgPo.class);
+
int flag = orgV1InnerServiceSMOImpl.updateOrg(orgPo);
if (flag < 1) {
--
Gitblit v1.8.0