From dd9759eaa3dabd3d55943fc0c741fd5018d2d76e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 31 五月 2023 16:43:29 +0800
Subject: [PATCH] optimize dining
---
service-store/src/main/java/com/java110/store/cmd/property/SavePropertyCmd.java | 109 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 78 insertions(+), 31 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/property/SavePropertyCmd.java b/service-store/src/main/java/com/java110/store/cmd/property/SavePropertyCmd.java
index 929c6f7..64cd00e 100644
--- a/service-store/src/main/java/com/java110/store/cmd/property/SavePropertyCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/property/SavePropertyCmd.java
@@ -20,13 +20,14 @@
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.AuthenticationFactory;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.community.CommunityDto;
-import com.java110.dto.menuGroup.MenuGroupDto;
+import com.java110.dto.menu.MenuGroupDto;
import com.java110.dto.store.StoreAttrDto;
import com.java110.dto.store.StoreDto;
import com.java110.dto.workflow.WorkflowDto;
@@ -66,6 +67,41 @@
import java.util.Calendar;
import java.util.List;
+
+@Java110CmdDoc(title = "娣诲姞鐗╀笟鍏徃",
+ description = "涓昏鎻愪緵缁欏绯荤粺娣诲姞鐗╀笟鍏徃",
+ httpMethod = "post",
+ url = "http://{ip}:{port}/app/property.saveProperty",
+ resource = "storeDoc",
+ author = "鍚村鏂�",
+ serviceCode = "property.saveProperty",
+ seq = 1
+)
+
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "name", length = 64, remark = "鐗╀笟鍚嶇О"),
+ @Java110ParamDoc(name = "nearbyLandmarks", length = 64, remark = "鍦版爣锛屽xx 鍏洯鏃�"),
+ @Java110ParamDoc(name = "tel", length = 11, remark = "鐗╀笟绠＄悊鍛樼數璇� 浣滀负绠＄悊鍛樿处鍙峰瘑鐮� 娣诲姞鍚庤鍙婃椂淇敼瀵嗙爜"),
+ @Java110ParamDoc(name = "address", length = 11, remark = "鍏徃鍦板潃"),
+ @Java110ParamDoc(name = "corporation", length = 11, remark = "娉曚汉"),
+ @Java110ParamDoc(name = "foundingTime", length = 11, remark = "鎴愮珛鏃ユ湡"),
+ @Java110ParamDoc(name = "communityIds", type = "Array" ,length = 0, remark = "鍒嗛厤灏忓尯"),
+ @Java110ParamDoc(parentNodeName = "communityIds",name = "-", type = "String" ,length = 0, remark = "灏忓尯ID"),
+ @Java110ParamDoc(name = "groupIds", type = "Array" ,length = 0, remark = "鍒嗛厤鑿滃崟缁�"),
+ @Java110ParamDoc(parentNodeName = "groupIds",name = "-", type = "String" ,length = 0, remark = "鑿滃崟缁処D"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "杩斿洖缂栧彿锛�0 鎴愬姛 鍏朵粬澶辫触"),
+ @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "鎴愬姛", remark = "鎻忚堪"),
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody="{\"name\":\"api鐗╀笟\",\"address\":\"api鐗╀笟\",\"tel\":\"18909711449\",\"corporation\":\"鏃燶",\"foundingTime\":\"2022-09-01\",\"nearbyLandmarks\":\"鍥芥姇骞垮満\",\"groupIds\":[\"802021080609660006\",\"802021012591650002\",\"802020101628950105\",\"802020092468300217\",\"802020091723050020\",\"802020020977260001\",\"802020012374230001\",\"802019110855900043\",\"802019103010680005\",\"802019102057730004\",\"802019091604450001\",\"800201907017\",\"800201906011\",\"800201904009\",\"800201904008\",\"800201904007\",\"800201904006\",\"800201904005\",\"800201904004\",\"800201906010\",\"800201904002\",\"800201904001\",\"802022052412780003\",\"802021080609660006\",\"802021012591650002\",\"802020101628950105\",\"802020092468300217\",\"802020091723050020\",\"802020020977260001\",\"802020012374230001\",\"802019110855900043\",\"802019103010680005\",\"802019102057730004\",\"802019091604450001\",\"800201907017\",\"800201906011\",\"800201904009\",\"800201904008\",\"800201904007\",\"800201904006\",\"800201904005\",\"800201904004\",\"800201906010\",\"800201904002\",\"800201904001\"],\"communityIds\":[\"2022092200930358\"]}",
+ resBody="{'code':0,'msg':'鎴愬姛'}"
+)
/**
* 绫昏〃杩帮細淇濆瓨
* 鏈嶅姟缂栫爜锛歴tore.saveStore
@@ -77,7 +113,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "property.saveProperty")
-public class SavePropertyCmd extends AbstractServiceCmdListener {
+public class SavePropertyCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(SavePropertyCmd.class);
@@ -148,6 +184,12 @@
storePo.setStoreId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
storePo.setStoreTypeCd(StoreDto.STORE_TYPE_PROPERTY);
storePo.setState(StoreDto.STATE_NORMAL);
+ if(!reqJson.containsKey("mapY")){
+ storePo.setMapY("1");
+ }
+ if(!reqJson.containsKey("mapX")){
+ storePo.setMapX("1");
+ }
int flag = storeV1InnerServiceSMOImpl.saveStore(storePo);
if (flag < 1) {
@@ -159,6 +201,7 @@
storeAttrPo.setAttrId(GenerateCodeFactory.getAttrId());
storeAttrPo.setSpecCd(StoreAttrDto.SPEC_CD_CORPORATION);
storeAttrPo.setValue(reqJson.getString("corporation"));
+ storeAttrPo.setStoreId(storePo.getStoreId());
flag = storeAttrV1InnerServiceSMOImpl.saveStoreAttr(storeAttrPo);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
@@ -168,6 +211,7 @@
storeAttrPo.setAttrId(GenerateCodeFactory.getAttrId());
storeAttrPo.setSpecCd(StoreAttrDto.SPEC_CD_FOUNDINGTIME);
storeAttrPo.setValue(reqJson.getString("foundingTime"));
+ storeAttrPo.setStoreId(storePo.getStoreId());
flag = storeAttrV1InnerServiceSMOImpl.saveStoreAttr(storeAttrPo);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
@@ -209,7 +253,7 @@
orgPo.setOrgId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orgId));
orgPo.setAllowOperation("F");
orgPo.setBelongCommunityId("9999");
- orgPo.setParentOrgId(orgPo.getOrgId());
+ orgPo.setParentOrgId("-1");
orgPo.setStoreId(storePo.getStoreId());
flag = orgV1InnerServiceSMOImpl.saveOrg(orgPo);
@@ -218,37 +262,37 @@
}
//淇濆瓨鍒嗗叕鍙�
- OrgPo orgHeadPo = new OrgPo();
- orgHeadPo.setOrgName("鍏徃鎬婚儴");
- orgHeadPo.setOrgLevel("2");
- orgHeadPo.setOrgId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orgId));
- orgHeadPo.setAllowOperation("F");
- orgHeadPo.setBelongCommunityId("9999");
- orgHeadPo.setParentOrgId(orgPo.getOrgId());
- orgHeadPo.setStoreId(storePo.getStoreId());
- flag = orgV1InnerServiceSMOImpl.saveOrg(orgHeadPo);
- if (flag < 1) {
- throw new CmdException("娉ㄥ唽澶辫触");
- }
+// OrgPo orgHeadPo = new OrgPo();
+// orgHeadPo.setOrgName("鍏徃鎬婚儴");
+// orgHeadPo.setOrgLevel("2");
+// orgHeadPo.setOrgId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orgId));
+// orgHeadPo.setAllowOperation("F");
+// orgHeadPo.setBelongCommunityId("9999");
+// orgHeadPo.setParentOrgId(orgPo.getOrgId());
+// orgHeadPo.setStoreId(storePo.getStoreId());
+// flag = orgV1InnerServiceSMOImpl.saveOrg(orgHeadPo);
+// if (flag < 1) {
+// throw new CmdException("娉ㄥ唽澶辫触");
+// }
- //淇濆瓨閮ㄩ棬
- OrgPo orgHeadPartPo = new OrgPo();
- orgHeadPartPo.setOrgName("鎬婚儴鍔炲叕瀹�");
- orgHeadPartPo.setOrgLevel("3");
- orgHeadPartPo.setOrgId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orgId));
- orgHeadPartPo.setAllowOperation("F");
- orgHeadPartPo.setBelongCommunityId("9999");
- orgHeadPartPo.setParentOrgId(orgHeadPo.getOrgId());
- orgHeadPartPo.setStoreId(storePo.getStoreId());
- flag = orgV1InnerServiceSMOImpl.saveOrg(orgHeadPartPo);
- if (flag < 1) {
- throw new CmdException("娉ㄥ唽澶辫触");
- }
+// //淇濆瓨閮ㄩ棬
+// OrgPo orgHeadPartPo = new OrgPo();
+// orgHeadPartPo.setOrgName("鎬婚儴鍔炲叕瀹�");
+// orgHeadPartPo.setOrgLevel("3");
+// orgHeadPartPo.setOrgId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_orgId));
+// orgHeadPartPo.setAllowOperation("F");
+// orgHeadPartPo.setBelongCommunityId("9999");
+// orgHeadPartPo.setParentOrgId(orgHeadPo.getOrgId());
+// orgHeadPartPo.setStoreId(storePo.getStoreId());
+// flag = orgV1InnerServiceSMOImpl.saveOrg(orgHeadPartPo);
+// if (flag < 1) {
+// throw new CmdException("娉ㄥ唽澶辫触");
+// }
//娣诲姞缁勭粐 鍛樺伐鍏崇郴
OrgStaffRelPo orgStaffRelPo = new OrgStaffRelPo();
- orgStaffRelPo.setOrgId(orgHeadPartPo.getOrgId());
+ orgStaffRelPo.setOrgId(orgPo.getOrgId());
orgStaffRelPo.setStaffId(userPo.getUserId());
orgStaffRelPo.setRelId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
orgStaffRelPo.setRelCd(StoreUserRelConstant.REL_ADMIN);
@@ -318,7 +362,7 @@
privilegeUserPo.setPrivilegeFlag("1");
privilegeUserPo.setStoreId(storePo.getStoreId());
privilegeUserPo.setUserId(userPo.getUserId());
- privilegeUserPo.setPId(defaultPrivilege);
+ privilegeUserPo.setpId(defaultPrivilege);
privilegeUserPo.setPuId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
flag = privilegeUserV1InnerServiceSMOImpl.savePrivilegeUser(privilegeUserPo);
@@ -392,6 +436,9 @@
}
}
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
+
+
}
--
Gitblit v1.8.0