From 8db876498c0179e8ffab848237eccd66436ccacc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 13:46:12 +0800
Subject: [PATCH] 优化疫情上报功能

---
 service-store/src/main/java/com/java110/store/cmd/property/SavePropertyCmd.java |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 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..2bb8b6d 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,7 +20,7 @@
 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;
@@ -77,7 +77,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 +148,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 +165,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 +175,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("淇濆瓨鏁版嵁澶辫触");
@@ -318,8 +326,7 @@
         privilegeUserPo.setPrivilegeFlag("1");
         privilegeUserPo.setStoreId(storePo.getStoreId());
         privilegeUserPo.setUserId(userPo.getUserId());
-        privilegeUserPo.setPId(defaultPrivilege);
-        privilegeUserPo.setPuId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        privilegeUserPo.setpId(defaultPrivilege);
 
         flag = privilegeUserV1InnerServiceSMOImpl.savePrivilegeUser(privilegeUserPo);
         if (flag < 1) {
@@ -392,6 +399,9 @@
             }
         }
 
+        cmdDataFlowContext.setResponseEntity(ResultVo.success());
+
+
 
     }
 

--
Gitblit v1.8.0