From 5589528feb385d7881f8dbf9314b3abf5d4f4e9e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 27 一月 2023 19:21:11 +0800
Subject: [PATCH] 优化 房屋页面查询功能

---
 service-store/src/main/java/com/java110/store/cmd/property/SavePropertyCmd.java |   90 +++++++++++++++++++++++++++++++-------------
 1 files changed, 63 insertions(+), 27 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 2bb8b6d..152e85c5 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
@@ -24,6 +24,7 @@
 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;
@@ -66,6 +67,40 @@
 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"
+)
+
+@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
@@ -217,7 +252,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);
@@ -226,37 +261,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);
@@ -327,6 +362,7 @@
         privilegeUserPo.setStoreId(storePo.getStoreId());
         privilegeUserPo.setUserId(userPo.getUserId());
         privilegeUserPo.setpId(defaultPrivilege);
+        privilegeUserPo.setPuId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
 
         flag = privilegeUserV1InnerServiceSMOImpl.savePrivilegeUser(privilegeUserPo);
         if (flag < 1) {

--
Gitblit v1.8.0