From 7da40dfc8536c46b574024c23bcfb5f2504114d9 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 23 十月 2022 18:03:18 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/machine/CustomCarInOutCmd.java | 94 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 94 insertions(+), 0 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 0366a40..f5cdf45 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,32 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.common.bmo.machine.IMachineOpenDoorBMO;
+import com.java110.common.dao.ICarBlackWhiteServiceDao;
+import com.java110.common.dao.ICarInoutV1ServiceDao;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
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.CarBlackWhiteDto;
+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.intf.user.ICarBlackWhiteV1InnerServiceSMO;
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;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -48,6 +64,19 @@
@Autowired
private IMachineOpenDoorBMO machineOpenDoorBMOImpl;
+
+ @Autowired
+ private IDataBusInnerServiceSMO dataBusInnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
+
+ @Autowired
+ private ICarInoutV1InnerServiceSMO carInoutV1InnerServiceSMOImpl;
+
+ @Autowired
+ private ICarBlackWhiteV1InnerServiceSMO carBlackWhiteV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
@@ -55,11 +84,76 @@
Assert.hasKeyAndValue(reqJson, "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈杞︾墝鍙�");
Assert.hasKeyAndValue(reqJson, "type", "璇锋眰鎶ユ枃涓湭鍖呭惈绫诲瀷");
+ 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(!"1101".equals(reqJson.getString("type"))) {
+ Assert.hasKeyAndValue(reqJson,"payType","鏈寘鍚敮浠樻柟寮�");
+ Assert.hasKeyAndValue(reqJson,"amount","鏈寘鍚敮浠橀噾棰�");
+ if(count < 1){
+ throw new CmdException("杞﹁締鏈叆鍦�");
+ }
+ }else{
+ if(count > 0){
+ throw new CmdException("杞﹁締宸茬粡鍦ㄥ満锛岃鍏堝嚭鍦�");
+ }
+ //杩涘満鏃� 鍒ゆ柇鏄惁涓洪粦鍚嶅崟
+ CarBlackWhiteDto carBlackWhiteDto = new CarBlackWhiteDto();
+ carBlackWhiteDto.setCarNum(reqJson.getString("carNum"));
+ count = carBlackWhiteV1InnerServiceSMOImpl.queryCarBlackWhitesCount(carBlackWhiteDto);
+ if(count > 0){
+ 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());
+ ResultVo resultVo = dataBusInnerServiceSMOImpl.getTempCarFeeOrder(tempCarPayOrderDto);
+ if(resultVo.getCode() != ResultVo.CODE_OK){
+ throw new CmdException(resultVo.getMsg());
+ }
+ String data = JSONObject.toJSONString(resultVo.getData());
+ JSONObject orderInfo = JSONObject.parseObject(data);
+ //JSONObject orderInfo = JSONObject.parseObject(resultVo.getData().toString());
+
+ tempCarPayOrderDto = new TempCarPayOrderDto();
+ tempCarPayOrderDto.setCarNum(reqJson.getString("carNum"));
+ tempCarPayOrderDto.setPaId(parkingBoxAreaDtos.get(0).getPaId());
+ tempCarPayOrderDto.setOrderId(orderInfo.getString("orderId"));
+ tempCarPayOrderDto.setAmount(Double.parseDouble(reqJson.getString("amount")));
+ tempCarPayOrderDto.setPayCharge(Double.parseDouble(reqJson.getString("payCharge")));
+ tempCarPayOrderDto.setPayType(reqJson.getString("payType"));
+ //tempCarPayOrderDto.setMachineId(reqJson.getString("machineId"));
+ resultVo = dataBusInnerServiceSMOImpl.notifyTempCarFeeOrder(tempCarPayOrderDto);
+ if(resultVo.getCode() != ResultVo.CODE_OK){
+ throw new CmdException(resultVo.getMsg());
+ }
+ }
ResponseEntity<String> responseEntity = machineOpenDoorBMOImpl.customCarInOut(reqJson);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
--
Gitblit v1.8.0