From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-community/src/main/java/com/java110/community/cmd/parkingBoxArea/UpdateParkingBoxAreaCmd.java |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/cmd/parkingBoxArea/UpdateParkingBoxAreaCmd.java b/service-community/src/main/java/com/java110/community/cmd/parkingBoxArea/UpdateParkingBoxAreaCmd.java
index 403a8cc..c51a166 100644
--- a/service-community/src/main/java/com/java110/community/cmd/parkingBoxArea/UpdateParkingBoxAreaCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/parkingBoxArea/UpdateParkingBoxAreaCmd.java
@@ -19,19 +19,22 @@
 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.dto.parkingBoxArea.ParkingBoxAreaDto;
 import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
+import com.java110.intf.community.IParkingBoxV1InnerServiceSMO;
+import com.java110.po.parkingBox.ParkingBoxPo;
 import com.java110.po.parkingBoxArea.ParkingBoxAreaPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
 
 /**
  * 绫昏〃杩帮細鏇存柊
@@ -44,13 +47,15 @@
  * // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
  */
 @Java110Cmd(serviceCode = "parkingBoxArea.updateParkingBoxArea")
-public class UpdateParkingBoxAreaCmd extends AbstractServiceCmdListener {
+public class UpdateParkingBoxAreaCmd extends Cmd {
 
     private static Logger logger = LoggerFactory.getLogger(UpdateParkingBoxAreaCmd.class);
 
-
     @Autowired
     private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IParkingBoxV1InnerServiceSMO parkingBoxV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -64,18 +69,32 @@
         String defaultArea = reqJson.getString("defaultArea");
         if (ParkingBoxAreaDto.DEFAULT_AREA_TRUE.equals(defaultArea)) {
             ParkingBoxAreaPo tmpParkingBoxAreaPo = new ParkingBoxAreaPo();
+            //tmpParkingBoxAreaPo.setBaId(reqJson.getString("baId"));
             tmpParkingBoxAreaPo.setBoxId(reqJson.getString("boxId"));
             tmpParkingBoxAreaPo.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_FALSE);
             parkingBoxAreaV1InnerServiceSMOImpl.updateParkingBoxArea(tmpParkingBoxAreaPo);
         }
-
         ParkingBoxAreaPo parkingBoxAreaPo = BeanConvertUtil.covertBean(reqJson, ParkingBoxAreaPo.class);
         int flag = parkingBoxAreaV1InnerServiceSMOImpl.updateParkingBoxArea(parkingBoxAreaPo);
-
         if (flag < 1) {
             throw new CmdException("鏇存柊鏁版嵁澶辫触");
         }
-
+        ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
+        parkingBoxAreaDto.setBoxId(reqJson.getString("boxId"));
+        List<ParkingBoxAreaDto> parkingBoxAreaDtos = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxAreaDto);
+        if (parkingBoxAreaDtos != null && parkingBoxAreaDtos.size() > 0) {
+            for (ParkingBoxAreaDto parkingBoxArea : parkingBoxAreaDtos) {
+                if (!parkingBoxArea.getBaId().equals(reqJson.getString("baId"))) {
+                    ParkingBoxAreaPo parkingBoxAre = new ParkingBoxAreaPo();
+                    parkingBoxAre.setBaId(parkingBoxArea.getBaId());
+                    parkingBoxAre.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_FALSE);
+                    parkingBoxAreaV1InnerServiceSMOImpl.updateParkingBoxArea(parkingBoxAre);
+                }
+            }
+        }
+        ParkingBoxPo parkingBoxPo = new ParkingBoxPo();
+        parkingBoxPo.setBoxId(reqJson.getString("boxId"));
+        parkingBoxV1InnerServiceSMOImpl.updateParkingBox(parkingBoxPo);
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

--
Gitblit v1.8.0