From ea55110f0bd2a4f1d4ac1cc174d28b716111ca34 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 24 十月 2022 17:21:58 +0800
Subject: [PATCH] 优化 代码
---
service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java b/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
index 0cc7427..d312ddf 100644
--- a/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/carInoutPayment/ListCarInoutPaymentCmd.java
@@ -18,20 +18,25 @@
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.dto.carInoutPayment.CarInoutPaymentDto;
+import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
import com.java110.intf.common.ICarInoutPaymentV1InnerServiceSMO;
+import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
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;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@@ -46,11 +51,13 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "carInoutPayment.listCarInoutPayment")
-public class ListCarInoutPaymentCmd extends AbstractServiceCmdListener {
+public class ListCarInoutPaymentCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(ListCarInoutPaymentCmd.class);
@Autowired
private ICarInoutPaymentV1InnerServiceSMO carInoutPaymentV1InnerServiceSMOImpl;
+ @Autowired
+ private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -61,6 +68,16 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
CarInoutPaymentDto carInoutPaymentDto = BeanConvertUtil.covertBean(reqJson, CarInoutPaymentDto.class);
+ if(reqJson.containsKey("boxId")) {
+ carInoutPaymentDto.setPaIds(getPaIds(reqJson));
+ }else{
+ carInoutPaymentDto.setPaId(reqJson.getString("paId"));
+ }
+
+ if(!StringUtil.isEmpty(carInoutPaymentDto.getEndTime())){
+ Date endTime = DateUtil.getDateFromStringB(carInoutPaymentDto.getEndTime());
+ carInoutPaymentDto.setEndTime(DateUtil.getAddDayStringB(endTime,1));
+ }
int count = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPaymentsCount(carInoutPaymentDto);
@@ -72,10 +89,45 @@
carInoutPaymentDtos = new ArrayList<>();
}
+ if(carInoutPaymentDtos != null && carInoutPaymentDtos.size()>0){
+ List<CarInoutPaymentDto> tempCarInoutPaymentDtos = carInoutPaymentV1InnerServiceSMOImpl.queryCarInoutPaymentMarjor(carInoutPaymentDto);
+ for(CarInoutPaymentDto carInoutPaymentDto1: carInoutPaymentDtos){
+ carInoutPaymentDto1.setPayChargeTotal(tempCarInoutPaymentDtos.get(0).getPayChargeTotal());
+ carInoutPaymentDto1.setRealChargeTotal(tempCarInoutPaymentDtos.get(0).getRealChargeTotal());
+ }
+ }else{
+ for(CarInoutPaymentDto carInoutPaymentDto1: carInoutPaymentDtos){
+ carInoutPaymentDto1.setPayChargeTotal("0");
+ carInoutPaymentDto1.setRealChargeTotal("0");
+ }
+ }
+
+
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, carInoutPaymentDtos);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
+
+ 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;
+ }
}
--
Gitblit v1.8.0