From ceb01711acb75f7eda1d3b67ce583720c8811bd1 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 八月 2022 00:12:10 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java b/service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java
index fe5156a..025eb50 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java
@@ -17,16 +17,29 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
+import com.java110.common.dao.ICarInoutV1ServiceDao;
import com.java110.core.annotation.Java110Cmd;
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.machine.CarInoutDto;
+import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.dto.tempCarFeeConfig.TempCarPayOrderDto;
+import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
+import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
+import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+
+import java.util.List;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -39,7 +52,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "machine.customCarInOutCmd")
-public class CustomCarInOutCmd extends AbstractServiceCmdListener {
+public class CustomCarInOutCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(CustomCarInOutCmd.class);
@@ -48,6 +61,16 @@
@Autowired
private IMachineOpenDoorBMO machineOpenDoorBMOImpl;
+
+ @Autowired
+ private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
+
+ @Autowired
+ private ICarInoutV1InnerServiceSMO carInoutV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
@@ -55,11 +78,51 @@
Assert.hasKeyAndValue(reqJson, "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈杞︾墝鍙�");
Assert.hasKeyAndValue(reqJson, "type", "璇锋眰鎶ユ枃涓湭鍖呭惈绫诲瀷");
+ if("1101".equals(reqJson.getString("type"))) {
+ return;
+ }
+
+ Assert.hasKeyAndValue(reqJson,"payType","鏈寘鍚敮浠樻柟寮�");
+ Assert.hasKeyAndValue(reqJson,"amount","鏈寘鍚敮浠橀噾棰�");
+
+ CarInoutDto carInoutDto = new CarInoutDto();
+ carInoutDto.setCarNum(reqJson.getString("carNum"));
+ carInoutDto.setStates(new String[]{
+ CarInoutDto.STATE_IN,
+ CarInoutDto.STATE_REPAY
+ });
+ int count = carInoutV1InnerServiceSMOImpl.queryCarInoutsCount(carInoutDto);
+
+ if(count < 1){
+ throw new CmdException("杞﹁締鏈叆鍦�");
+ }
+
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ //鍑哄満鏃� 鍏� 琛ュ厖璐圭敤淇℃伅
+ if(!"1101".equals(reqJson.getString("type"))) {
+
+ ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
+ parkingBoxAreaDto.setBoxId(reqJson.getString("boxId"));
+ parkingBoxAreaDto.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_TRUE);
+ List<ParkingBoxAreaDto> parkingBoxAreaDtos = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxAreaDto);
+
+ if(parkingBoxAreaDtos == null || parkingBoxAreaDtos.size()< 1){
+ throw new CmdException("鏈寘鍚仠杞﹀満淇℃伅");
+ }
+
+ TempCarPayOrderDto tempCarPayOrderDto = new TempCarPayOrderDto();
+ tempCarPayOrderDto.setCarNum(reqJson.getString("carNum"));
+ tempCarPayOrderDto.setPaId(parkingBoxAreaDtos.get(0).getPaId());
+ tempCarPayOrderDto.setOrderId(reqJson.getString("inoutId"));
+ tempCarPayOrderDto.setAmount(Double.parseDouble(reqJson.getString("amount")));
+ tempCarPayOrderDto.setPayType(reqJson.getString("payType"));
+ //tempCarPayOrderDto.setMachineId(reqJson.getString("machineId"));
+ ResultVo resultVo = dataBusInnerServiceSMOImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
+ }
ResponseEntity<String> responseEntity = machineOpenDoorBMOImpl.customCarInOut(reqJson);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
--
Gitblit v1.8.0