From 24332e76235e1b86aa9d06535ddb09d6e3334f8f Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 26 十月 2022 02:40:26 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java | 84 +++++++++++++++++++++++++++++++++++++----
1 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java b/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java
index c1ac191..6fcf98e 100644
--- a/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java
@@ -18,17 +18,23 @@
import com.alibaba.fastjson.JSONObject;
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.smo.IComputeFeeSMO;
+import com.java110.dto.carInoutPayment.CarInoutPaymentDto;
import com.java110.dto.machine.CarInoutDto;
+import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.intf.common.ICarInoutPaymentV1InnerServiceSMO;
import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
+import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
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 org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -47,7 +53,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "carInout.listCarInParkingAreaCmd")
-public class ListCarInParkingAreaCmd extends AbstractServiceCmdListener {
+public class ListCarInParkingAreaCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListCarInParkingAreaCmd.class);
@@ -55,27 +61,42 @@
private ICarInoutV1InnerServiceSMO carInoutV1InnerServiceSMOImpl;
@Autowired
+ private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
+
+ @Autowired
private IComputeFeeSMO computeFeeSMOImpl;
+
+ @Autowired
+ private ICarInoutPaymentV1InnerServiceSMO carInoutPaymentV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
- Assert.hasKeyAndValue(reqJson, "paId", "鏈寘鍚仠杞﹀満淇℃伅");
+ if(reqJson.containsKey("boxId") && !StringUtil.isEmpty(reqJson.getString("boxId"))) {
+ Assert.hasKeyAndValue(reqJson, "boxId", "鏈寘鍚矖浜俊鎭�");
+ }else{
+ Assert.hasKeyAndValue(reqJson, "paId", "鏈寘鍚仠杞﹀満淇℃伅");
+ }
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
CarInoutDto carInoutDto = BeanConvertUtil.covertBean(reqJson, CarInoutDto.class);
-
carInoutDto.setStates(new String[]{CarInoutDto.STATE_IN, CarInoutDto.STATE_PAY, CarInoutDto.STATE_REPAY});
+ if(reqJson.containsKey("boxId")) {
+ carInoutDto.setPaIds(getPaIds(reqJson));
+ }else{
+ carInoutDto.setPaId(reqJson.getString("paId"));
+ }
int count = carInoutV1InnerServiceSMOImpl.queryCarInoutsCount(carInoutDto);
List<CarInoutDto> carInoutDtos = null;
if (count > 0) {
carInoutDtos = carInoutV1InnerServiceSMOImpl.queryCarInouts(carInoutDto);
- computeCarInouts(carInoutDtos);
+ freshPayTime(carInoutDtos);
+ carInoutDtos = computeCarInouts(carInoutDtos);
} else {
carInoutDtos = new ArrayList<>();
}
@@ -84,10 +105,55 @@
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
- cmdDataFlowContext.setResponseEntity(ResultVo.success());
+ cmdDataFlowContext.setResponseEntity(responseEntity);
}
- private void computeCarInouts(List<CarInoutDto> carInoutDtos) {
- computeFeeSMOImpl.computeTempCarStopTimeAndFee(carInoutDtos);
+ /**
+ * 杈撳叆鏈�鏂扮殑鏀粯鏃堕棿
+ * @param carInoutDtos
+ */
+ private void freshPayTime(List<CarInoutDto> carInoutDtos) {
+ for(CarInoutDto carInoutDto : carInoutDtos){
+ if(CarInoutDto.STATE_PAY.equals(carInoutDto.getState()) || CarInoutDto.STATE_REPAY.equals(carInoutDto.getState())){
+
+ //鏌ヨ 鏀粯璁板綍 鍒锋柊payTime
+ CarInoutPaymentDto carInoutPaymentDto = new CarInoutPaymentDto();
+ carInoutPaymentDto.setInoutId(carInoutDto.getInoutId());
+ carInoutPaymentDto.setPage(1);
+ carInoutPaymentDto.setRow(1);
+ List<CarInoutPaymentDto> carInoutPaymentDtos = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPayments(carInoutPaymentDto);
+
+ if(carInoutPaymentDtos == null || carInoutPaymentDtos.size() < 1){
+ carInoutDto.setPayTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ continue;
+ }
+
+ carInoutDto.setPayTime(carInoutPaymentDtos.get(0).getPayTime());
+ }
+ }
+ }
+
+ private String[] getPaIds(JSONObject reqJson) {
+ if (reqJson.containsKey("boxId") && !StringUtil.isEmpty(reqJson.getString("boxId"))) {
+ ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
+ parkingBoxAreaDto.setBoxId(reqJson.getString("boxId"));
+ parkingBoxAreaDto.setCommunityId(reqJson.getString("communityId"));
+ List<ParkingBoxAreaDto> parkingBoxAreaDtos = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxAreaDto);
+
+ if (parkingBoxAreaDtos == null || parkingBoxAreaDtos.size() < 1) {
+ throw new CmdException("鏈煡鍒板仠杞﹀満淇℃伅");
+ }
+ List<String> paIds = new ArrayList<>();
+ for (ParkingBoxAreaDto parkingBoxAreaDto1 : parkingBoxAreaDtos) {
+ paIds.add(parkingBoxAreaDto1.getPaId());
+ }
+ String[] paIdss = paIds.toArray(new String[paIds.size()]);
+ return paIdss;
+ }
+ return null;
+ }
+
+ private List<CarInoutDto> computeCarInouts(List<CarInoutDto> carInoutDtos) {
+ return computeFeeSMOImpl.computeTempCarStopTimeAndFee(carInoutDtos);
}
}
--
Gitblit v1.8.0