From 12a0dcf99b69ed311f87f06c5b8d3d94c7f99214 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 12 六月 2023 15:16:04 +0800
Subject: [PATCH] optimize code
---
service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java | 122 +++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 51 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java
index e5c19aa..0cb37a4 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java
@@ -18,8 +18,8 @@
import com.java110.dto.machine.MachineDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
-import com.java110.dto.parkingCouponCar.ParkingCouponCarDto;
+import com.java110.dto.parking.ParkingBoxAreaDto;
+import com.java110.dto.parkingCoupon.ParkingCouponCarDto;
import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigDto;
import com.java110.intf.acct.IParkingCouponCarOrderV1InnerServiceSMO;
import com.java110.intf.acct.IParkingCouponCarV1InnerServiceSMO;
@@ -40,9 +40,7 @@
import com.java110.po.car.CarInoutDetailPo;
import com.java110.po.car.CarInoutPo;
import com.java110.po.car.OwnerCarPo;
-import com.java110.po.carInoutPayment.CarInoutPaymentPo;
import com.java110.po.fee.FeeAttrPo;
-import com.java110.po.fee.PayFeeDetailPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.owner.OwnerPo;
import com.java110.po.parkingCouponCar.ParkingCouponCarPo;
@@ -51,6 +49,7 @@
import com.java110.utils.lock.DistributedLock;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
@@ -185,7 +184,22 @@
tempCarName = tmpOwnerCarDto.getLeaseTypeName();
}
}
+
+ //涓诲壇杞﹁締涓� 鏈変竴涓溅杈嗗湪鍦猴紝杩欎釜杞﹀満褰撳仛涓存椂杞﹀鐞�
+ if (hasInParkingArea(ownerCarDtos.get(0).getCarId(), reqJson.getString("carNum"), reqJson.getString("communityId"), paIds)) {
+ tempCar = CAR_TYPE_NO_DATA;
+ tempCarName = "涓存椂杞�";
+ }
+
+ int day = DateUtil.differentDaysUp(DateUtil.getCurrentDate(),ownerCarDtos.get(0).getEndTime());
+
+ if(day <= -5){
+ tempCar = CAR_TYPE_NO_DATA;
+ tempCarName = "涓存椂杞�";
+ }
}
+
+
//杩涘満澶勭悊
@@ -194,6 +208,50 @@
} else {
carOut(reqJson, machineDtos.get(0), tempCar, tempCarName);
}
+
+ }
+
+ private boolean hasInParkingArea(String carId, String carNum, String communityId, List<String> paIds) {
+ if (StringUtil.isEmpty(carId) || "-1".equals(carId)) {
+ return false;
+ }
+
+ // 鍒ゆ柇鏄惁涓轰富鍓溅杈�
+ OwnerCarDto carDto = new OwnerCarDto();
+ carDto.setPaIds(paIds.toArray(new String[paIds.size()]));
+ carDto.setCarNum(carNum);
+ carDto.setCarId(carId);
+ List<OwnerCarDto> tmpCarDtos = ownerCarV1InnerServiceSMOImpl.queryOwnerCars(carDto);
+ if (tmpCarDtos == null || tmpCarDtos.size() < 2) {
+ return false;
+ }
+
+ List<String> otherCarNums = new ArrayList<>();
+
+ for (OwnerCarDto tempCarDto : tmpCarDtos) {
+ if (tempCarDto.getCarNum().equals(carNum)) {
+ continue;
+ }
+ otherCarNums.add(tempCarDto.getCarNum());
+ }
+
+ if (otherCarNums.size() < 1) {
+ return false;
+ }
+
+ for (String otherCarNum : otherCarNums) {
+ //鍒ゆ柇杞﹁締鏄惁鍦� 鍦哄唴
+ CarInoutDto inoutDto = new CarInoutDto();
+ inoutDto.setCarNum(otherCarNum);
+ inoutDto.setPaIds(paIds.toArray(new String[paIds.size()]));
+ inoutDto.setState(CarInoutDto.STATE_IN);
+ List<CarInoutDto> carInoutDtos = carInoutV1InnerServiceSMOImpl.queryCarInouts(inoutDto);
+ if (carInoutDtos != null && carInoutDtos.size() > 0) {
+ return true;
+ }
+ }
+
+ return false;
}
@@ -246,7 +304,7 @@
carInoutDetailPo.setCarInout(CarInoutDetailDto.CAR_INOUT_OUT);
carInoutDetailPo.setCarNum(reqJson.getString("carNum"));
carInoutDetailPo.setCommunityId(reqJson.getString("communityId"));
- carInoutDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ carInoutDetailPo.setDetailId(GenerateCodeFactory.getDetailId(CODE_PREFIX_ID));
carInoutDetailPo.setInoutId("-1");
carInoutDetailPo.setMachineCode(machineDto.getMachineCode());
carInoutDetailPo.setMachineId(machineDto.getMachineId());
@@ -263,6 +321,9 @@
if (CarInoutDto.STATE_IN_FAIL.equals(state)) {
return;
}
+
+ carInoutDtos = carInoutV1InnerServiceSMOImpl.queryCarInouts(carInoutDto);
+
}
//淇濆瓨鍑哄満鏄庣粏
@@ -270,7 +331,7 @@
carInoutDetailPo.setCarInout(CarInoutDetailDto.CAR_INOUT_OUT);
carInoutDetailPo.setCarNum(reqJson.getString("carNum"));
carInoutDetailPo.setCommunityId(reqJson.getString("communityId"));
- carInoutDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ carInoutDetailPo.setDetailId(GenerateCodeFactory.getDetailId(CODE_PREFIX_ID));
carInoutDetailPo.setInoutId(carInoutDtos.get(0).getInoutId());
carInoutDetailPo.setMachineCode(machineDto.getMachineCode());
carInoutDetailPo.setMachineId(machineDto.getMachineId());
@@ -316,15 +377,15 @@
updateCarInoutState(reqJson, carInoutDtos.get(0));
//澶勭悊鍋滆溅鍔�
- if(!reqJson.containsKey("pccIds") || reqJson.getJSONArray("pccIds").size()<1){
- return ;
+ if (!reqJson.containsKey("pccIds") || reqJson.getJSONArray("pccIds").size() < 1) {
+ return;
}
JSONArray pccIds = reqJson.getJSONArray("pccIds");
String pccId = "";
ParkingCouponCarPo parkingCouponCarPo = null;
ParkingCouponCarOrderPo parkingCouponCarOrderPo = null;
- for(int pccIdIndex = 0 ;pccIdIndex < pccIds.size();pccIdIndex++){
+ for (int pccIdIndex = 0; pccIdIndex < pccIds.size(); pccIdIndex++) {
pccId = pccIds.getString(pccIdIndex);
parkingCouponCarPo = new ParkingCouponCarPo();
@@ -387,47 +448,6 @@
}
}
- private boolean hasFeeAndPayFee(CarInoutDto carInoutDto, JSONObject reqJson, CarInoutPo carInoutPo, CarInoutPaymentPo carInoutPaymentPo) {
-
- FeeAttrDto feeAttrDto = new FeeAttrDto();
- feeAttrDto.setCommunityId(carInoutPo.getCommunityId());
- feeAttrDto.setSpecCd(FeeAttrDto.SPEC_CD_CAR_INOUT_ID);
- feeAttrDto.setValue(carInoutPo.getInoutId());
- feeAttrDto.setState(FeeDto.STATE_DOING);
- List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFeeByAttr(feeAttrDto);
- if (feeDtos == null || feeDtos.size() < 1) {
- return false;
- }
- PayFeePo payFeePo = new PayFeePo();
- payFeePo.setState(FeeDto.STATE_FINISH);
- payFeePo.setFeeId(feeDtos.get(0).getFeeId());
- payFeePo.setEndTime(carInoutPo.getOutTime());
- payFeePo.setCommunityId(feeDtos.get(0).getCommunityId());
- int flag = feeInnerServiceSMOImpl.updateFee(payFeePo);
- if (flag < 1) {
- throw new CmdException("鏇存柊璐圭敤澶辫触");
- }
-
-
- PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
- payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
- payFeeDetailPo.setPrimeRate("1.00");
- FeeDto feeDto = feeDtos.get(0);
- payFeeDetailPo.setStartTime(DateUtil.getFormatTimeString(feeDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
- payFeeDetailPo.setEndTime(carInoutPo.getOutTime());
- payFeeDetailPo.setCommunityId(carInoutDto.getCommunityId());
- payFeeDetailPo.setCycles("1");
- payFeeDetailPo.setReceivableAmount(carInoutPaymentPo.getPayCharge());
- payFeeDetailPo.setReceivedAmount(carInoutPaymentPo.getRealCharge());
- payFeeDetailPo.setFeeId(feeDto.getFeeId());
-
- flag = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);
- if (flag < 1) {
- throw new CmdException("鏇存柊璐圭敤澶辫触");
- }
- return true;
- }
-
/**
* 杞﹁締鍏ュ満
*
@@ -475,7 +495,7 @@
carInoutDetailPo.setCarInout(CarInoutDetailDto.CAR_INOUT_IN);
carInoutDetailPo.setCarNum(reqJson.getString("carNum"));
carInoutDetailPo.setCommunityId(reqJson.getString("communityId"));
- carInoutDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ carInoutDetailPo.setDetailId(GenerateCodeFactory.getDetailId(CODE_PREFIX_ID));
carInoutDetailPo.setInoutId(carInoutPo.getInoutId());
carInoutDetailPo.setMachineCode(machineDto.getMachineCode());
carInoutDetailPo.setMachineId(machineDto.getMachineId());
--
Gitblit v1.8.0