From 3c821b3c5469ac5fc4660d33c3b998fb9005e889 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 十月 2021 11:08:03 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/carInout/ListCarInParkingAreaCmd.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 c0c8c67..04bc118 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
@@ -20,8 +20,9 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.smo.IComputeFeeSMO;
import com.java110.dto.machine.CarInoutDto;
-import com.java110.intf.common.ICarInoutInnerServiceSMO;
+import com.java110.intf.common.ICarInoutV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -29,6 +30,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 绫昏〃杩帮細鏌ヨ 鍦ㄥ満杞﹁締
@@ -46,7 +52,10 @@
private static Logger logger = LoggerFactory.getLogger(ListCarInParkingAreaCmd.class);
@Autowired
- private ICarInoutInnerServiceSMO carInoutInnerServiceSMOImpl;
+ private ICarInoutV1InnerServiceSMO carInoutV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IComputeFeeSMO computeFeeSMOImpl;
@Override
@@ -59,8 +68,26 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
CarInoutDto carInoutDto = BeanConvertUtil.covertBean(reqJson, CarInoutDto.class);
- //carInoutInnerServiceSMOImpl.queryCarInCount(carInoutDto);
+ carInoutDto.setStates(new String[]{CarInoutDto.STATE_IN, CarInoutDto.STATE_PAY, CarInoutDto.STATE_REPAY});
+ int count = carInoutV1InnerServiceSMOImpl.queryCarInoutsCount(carInoutDto);
- cmdDataFlowContext.setResponseEntity(ResultVo.success());
+ List<CarInoutDto> carInoutDtos = null;
+
+ if (count > 0) {
+ carInoutDtos = carInoutV1InnerServiceSMOImpl.queryCarInouts(carInoutDto);
+ carInoutDtos = computeCarInouts(carInoutDtos);
+ } else {
+ carInoutDtos = new ArrayList<>();
+ }
+
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, carInoutDtos);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+ cmdDataFlowContext.setResponseEntity(responseEntity);
+ }
+
+ private List<CarInoutDto> computeCarInouts(List<CarInoutDto> carInoutDtos) {
+ return computeFeeSMOImpl.computeTempCarStopTimeAndFee(carInoutDtos);
}
}
--
Gitblit v1.8.0