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/SaveParkingBoxAreaCmd.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/parkingBoxArea/SaveParkingBoxAreaCmd.java b/service-community/src/main/java/com/java110/community/cmd/parkingBoxArea/SaveParkingBoxAreaCmd.java
index 8bb5af3..72a3aae 100644
--- a/service-community/src/main/java/com/java110/community/cmd/parkingBoxArea/SaveParkingBoxAreaCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/parkingBoxArea/SaveParkingBoxAreaCmd.java
@@ -19,10 +19,12 @@
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.GenerateCodeFactory;
+import com.java110.dto.parking.ParkingAreaDto;
import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.intf.community.IParkingAreaV1InnerServiceSMO;
import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.intf.community.IParkingBoxV1InnerServiceSMO;
import com.java110.po.parkingBox.ParkingBoxPo;
@@ -32,8 +34,10 @@
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;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -46,7 +50,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "parkingBoxArea.saveParkingBoxArea")
-public class SaveParkingBoxAreaCmd extends AbstractServiceCmdListener {
+public class SaveParkingBoxAreaCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(SaveParkingBoxAreaCmd.class);
@@ -58,38 +62,55 @@
@Autowired
private IParkingBoxV1InnerServiceSMO parkingBoxV1InnerServiceSMOImpl;
+ @Autowired
+ private IParkingAreaV1InnerServiceSMO parkingAreaV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "boxId", "璇锋眰鎶ユ枃涓湭鍖呭惈boxId");
Assert.hasKeyAndValue(reqJson, "paId", "璇锋眰鎶ユ枃涓湭鍖呭惈paId");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "defaultArea", "璇锋眰鎶ユ枃涓湭鍖呭惈defaultArea");
-
+ ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+ parkingAreaDto.setPaId(reqJson.getString("paId"));
+ List<ParkingAreaDto> parkingAreaDtos = parkingAreaV1InnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+ Assert.listOnlyOne(parkingAreaDtos, "鍋滆溅鍦轰笉瀛樺湪锛�");
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
+ parkingBoxAreaDto.setPaId(reqJson.getString("paId"));
+ parkingBoxAreaDto.setBoxId(reqJson.getString("boxId"));
+ List<ParkingBoxAreaDto> parkingBoxAreaDtos = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxAreaDto);
+ Assert.listIsNull(parkingBoxAreaDtos, "鍋滆溅鍦洪噸澶嶏紝璇烽噸鏂版坊鍔狅紒");
String defaultArea = reqJson.getString("defaultArea");
if (ParkingBoxAreaDto.DEFAULT_AREA_TRUE.equals(defaultArea)) {
- ParkingBoxAreaPo tmpParkingBoxAreaPo = new ParkingBoxAreaPo();
- tmpParkingBoxAreaPo.setBoxId(reqJson.getString("boxId"));
- tmpParkingBoxAreaPo.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_FALSE);
- parkingBoxAreaV1InnerServiceSMOImpl.updateParkingBoxArea(tmpParkingBoxAreaPo);
+ ParkingBoxAreaDto parkingBoxArea = new ParkingBoxAreaDto();
+ parkingBoxArea.setBoxId(reqJson.getString("boxId"));
+ parkingBoxArea.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_FALSE);
+ List<ParkingBoxAreaDto> parkingBoxAreas = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxArea);
+ if (parkingBoxAreas != null && parkingBoxAreas.size() > 0) {
+ for (ParkingBoxAreaDto parkingBox : parkingBoxAreas) {
+ ParkingBoxAreaPo tmpParkingBoxAreaPo = new ParkingBoxAreaPo();
+ tmpParkingBoxAreaPo.setBaId(parkingBox.getBaId());
+ tmpParkingBoxAreaPo.setBoxId(reqJson.getString("boxId"));
+ tmpParkingBoxAreaPo.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_FALSE);
+ parkingBoxAreaV1InnerServiceSMOImpl.updateParkingBoxArea(tmpParkingBoxAreaPo);
+ }
+ }
}
-
ParkingBoxAreaPo parkingBoxAreaPo = BeanConvertUtil.covertBean(reqJson, ParkingBoxAreaPo.class);
parkingBoxAreaPo.setBaId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
int flag = parkingBoxAreaV1InnerServiceSMOImpl.saveParkingBoxArea(parkingBoxAreaPo);
-
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
ParkingBoxPo parkingBoxPo = new ParkingBoxPo();
parkingBoxPo.setBoxId(reqJson.getString("boxId"));
parkingBoxV1InnerServiceSMOImpl.updateParkingBox(parkingBoxPo);
-
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0