From 75bf0fa6a3e113bd77191ace7e46f557b27552ee Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 19 九月 2022 18:55:42 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineUploadCarLogCmd.java | 102 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 30 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 e8afa79..55b512d 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
@@ -42,6 +42,7 @@
import com.java110.po.fee.PayFeePo;
import com.java110.po.owner.OwnerPo;
import com.java110.utils.exception.CmdException;
+import com.java110.utils.lock.DistributedLock;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -127,7 +128,7 @@
//鏄惁鏄复鏃惰溅
String tempCar = OwnerCarDto.LEASE_TYPE_TEMP;
- String tempCarName ="涓存椂杞�";
+ String tempCarName = "涓存椂杞�";
//鏌ヨ璁惧淇℃伅
@@ -138,10 +139,21 @@
Assert.listOnlyOne(machineDtos, "璁惧涓嶅瓨鍦�");
+ List<String> paIds = new ArrayList<>();
+ ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
+ parkingBoxAreaDto.setBoxId(machineDto.getLocationObjId());
+ List<ParkingBoxAreaDto> parkingBoxAreaDtos = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxAreaDto);
+ if (parkingBoxAreaDtos != null && parkingBoxAreaDtos.size() > 0) {
+ for (ParkingBoxAreaDto parkingBoxAreaDto1 : parkingBoxAreaDtos) {
+ paIds.add(parkingBoxAreaDto1.getPaId());
+ }
+ }
+
//鏌ヨ杞﹁締
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setCarNum(reqJson.getString("carNum"));
ownerCarDto.setCommunityId(reqJson.getString("communityId"));
+ ownerCarDto.setPaIds(paIds.toArray(new String[paIds.size()]));
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
//璇存槑鏄复鏃惰溅
@@ -152,10 +164,10 @@
reqJson.put("carId", ownerCarDtos.get(0).getCarId());
tempCar = ownerCarDtos.get(0).getLeaseType();
tempCarName = ownerCarDtos.get(0).getLeaseTypeName();
- if(ownerCarDtos.size()>1){
- for(OwnerCarDto tmpOwnerCarDto : ownerCarDtos){
- if(OwnerCarDto.LEASE_TYPE_TEMP.equals(tmpOwnerCarDto.getLeaseType())){
- continue;
+ if (ownerCarDtos.size() > 1) {
+ for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
+ if (OwnerCarDto.LEASE_TYPE_TEMP.equals(tmpOwnerCarDto.getLeaseType())) {
+ continue;
}
tempCar = tmpOwnerCarDto.getLeaseType();
tempCarName = tmpOwnerCarDto.getLeaseTypeName();
@@ -166,9 +178,9 @@
//杩涘満澶勭悊
if (MachineDto.DIRECTION_IN.equals(machineDtos.get(0).getDirection())) {
- carIn(reqJson, machineDtos.get(0), tempCar,tempCarName);
+ carIn(reqJson, machineDtos.get(0), tempCar, tempCarName);
} else {
- carOut(reqJson, machineDtos.get(0), tempCar,tempCarName);
+ carOut(reqJson, machineDtos.get(0), tempCar, tempCarName);
}
}
@@ -180,7 +192,7 @@
* @param machineDto
* @param tempCar
*/
- private void carOut(JSONObject reqJson, MachineDto machineDto, String tempCar,String tempCarName) {
+ private void carOut(JSONObject reqJson, MachineDto machineDto, String tempCar, String tempCarName) {
String state = CarInoutDto.STATE_OUT;
//杩涘満澶辫触璁板綍
@@ -230,6 +242,7 @@
carInoutDetailPo.setRemark(reqJson.getString("remark"));
carInoutDetailPo.setState(state);
carInoutDetailPo.setCarType(CAR_TYPE_NO_DATA.equals(tempCar) ? OwnerCarDto.LEASE_TYPE_TEMP + "" : tempCar + "");
+ carInoutDetailPo.setCarTypeName(CAR_TYPE_NO_DATA.equals(tempCar) ? "涓存椂杞�" : tempCarName);
int flag = carInoutDetailV1InnerServiceSMOImpl.saveCarInoutDetail(carInoutDetailPo);
if (flag < 1) {
throw new CmdException("淇濆瓨鍑鸿褰曟槑缁嗗け璐�");
@@ -253,7 +266,7 @@
carInoutDetailPo.setRemark(reqJson.getString("remark"));
carInoutDetailPo.setPhotoJpg(reqJson.getString("photoJpg"));
carInoutDetailPo.setState(state);
- if(CAR_TYPE_NO_DATA.equals(tempCar)){
+ if (CAR_TYPE_NO_DATA.equals(tempCar)) {
carInoutDetailPo.setCarType(OwnerCarDto.LEASE_TYPE_TEMP);
carInoutDetailPo.setCarTypeName("涓存椂杞�");
//妫�鏌ユ槸鍚︿负榛戠櫧鍚嶅崟
@@ -262,16 +275,16 @@
carBlackWhiteDto.setPaId(carInoutDtos.get(0).getPaId());
carBlackWhiteDto.setValidity("Y");
List<CarBlackWhiteDto> carBlackWhiteDtos = carBlackWhiteV1InnerServiceSMOImpl.queryCarBlackWhites(carBlackWhiteDto);
- if(carBlackWhiteDtos != null && carBlackWhiteDtos.size() >0 ){
- if(CarBlackWhiteDto.BLACK_WHITE_BLACK.equals(carBlackWhiteDtos.get(0).getBlackWhite())){
+ if (carBlackWhiteDtos != null && carBlackWhiteDtos.size() > 0) {
+ if (CarBlackWhiteDto.BLACK_WHITE_BLACK.equals(carBlackWhiteDtos.get(0).getBlackWhite())) {
carInoutDetailPo.setCarType("B");
carInoutDetailPo.setCarTypeName("榛戝悕鍗�");
- }else{
+ } else {
carInoutDetailPo.setCarType("W");
carInoutDetailPo.setCarTypeName("鐧藉悕鍗�");
}
}
- }else{
+ } else {
carInoutDetailPo.setCarType(tempCar);
carInoutDetailPo.setCarTypeName(tempCarName);
}
@@ -288,17 +301,7 @@
//灏嗙姸鎬佹洿鏂颁负 鍑哄満鐘舵��
- CarInoutPo carInoutPo = new CarInoutPo();
- carInoutPo.setPaId(carInoutDtos.get(0).getPaId());
- carInoutPo.setOutTime(reqJson.getString("outTime"));
- carInoutPo.setInoutId(carInoutDtos.get(0).getInoutId());
- carInoutPo.setCommunityId(carInoutDtos.get(0).getCommunityId());
- carInoutPo.setState(CarInoutDto.STATE_OUT);
- flag = carInoutV1InnerServiceSMOImpl.updateCarInout(carInoutPo);
-
- if (flag < 1) {
- throw new CmdException("鏇存柊鍑哄満鏃堕棿澶辫触");
- }
+ updateCarInoutState(reqJson, carInoutDtos.get(0));
//鍐欐敮浠樿褰�
// CarInoutPaymentPo carInoutPaymentPo = new CarInoutPaymentPo();
@@ -350,6 +353,45 @@
// hasFeeAndPayFee(carInoutDtos.get(0), reqJson, carInoutPo, carInoutPaymentPo);
}
+ private void updateCarInoutState(JSONObject reqJson, CarInoutDto carInoutDto) {
+ int flag;
+ String requestId = DistributedLock.getLockUUID();
+ String key = "updateInoutState_" + carInoutDto.getInoutId();
+ try {
+ DistributedLock.waitGetDistributedLock(key, requestId);
+
+
+ CarInoutDto newCarInoutDto = new CarInoutDto();
+ newCarInoutDto.setCommunityId(reqJson.getString("communityId"));
+ newCarInoutDto.setCarNum(reqJson.getString("carNum"));
+ newCarInoutDto.setPaId(carInoutDto.getPaId());
+ newCarInoutDto.setStates(new String[]{
+ CarInoutDto.STATE_IN,
+ CarInoutDto.STATE_PAY,
+ CarInoutDto.STATE_REPAY
+ });
+ List<CarInoutDto> carInoutDtos = carInoutV1InnerServiceSMOImpl.queryCarInouts(newCarInoutDto);
+
+ if(carInoutDtos == null || carInoutDtos.size()<1){
+ return ;
+ }
+
+ CarInoutPo carInoutPo = new CarInoutPo();
+ carInoutPo.setPaId(carInoutDto.getPaId());
+ carInoutPo.setOutTime(reqJson.getString("outTime"));
+ carInoutPo.setInoutId(carInoutDto.getInoutId());
+ carInoutPo.setCommunityId(carInoutDto.getCommunityId());
+ carInoutPo.setState(CarInoutDto.STATE_OUT);
+ flag = carInoutV1InnerServiceSMOImpl.updateCarInout(carInoutPo);
+
+ if (flag < 1) {
+ throw new CmdException("鏇存柊鍑哄満鏃堕棿澶辫触");
+ }
+ } finally {
+ DistributedLock.releaseDistributedLock(requestId, key);
+ }
+ }
+
private boolean hasFeeAndPayFee(CarInoutDto carInoutDto, JSONObject reqJson, CarInoutPo carInoutPo, CarInoutPaymentPo carInoutPaymentPo) {
FeeAttrDto feeAttrDto = new FeeAttrDto();
@@ -398,7 +440,7 @@
* @param machineDto
* @param tempCar
*/
- private void carIn(JSONObject reqJson, MachineDto machineDto, String tempCar,String tempCarName) {
+ private void carIn(JSONObject reqJson, MachineDto machineDto, String tempCar, String tempCarName) {
String state = CarInoutDto.STATE_IN;
//杩涘満澶辫触璁板綍
if (reqJson.containsKey("state") && "5".equals(reqJson.getString("state"))) {
@@ -446,7 +488,7 @@
carInoutDetailPo.setState(state);
carInoutDetailPo.setRemark(reqJson.getString("remark"));
carInoutDetailPo.setPhotoJpg(reqJson.getString("photoJpg"));
- if(CAR_TYPE_NO_DATA.equals(tempCar)){
+ if (CAR_TYPE_NO_DATA.equals(tempCar)) {
carInoutDetailPo.setCarType(OwnerCarDto.LEASE_TYPE_TEMP);
carInoutDetailPo.setCarTypeName("涓存椂杞�");
//妫�鏌ユ槸鍚︿负榛戠櫧鍚嶅崟
@@ -455,16 +497,16 @@
carBlackWhiteDto.setPaId(paId);
carBlackWhiteDto.setValidity("Y");
List<CarBlackWhiteDto> carBlackWhiteDtos = carBlackWhiteV1InnerServiceSMOImpl.queryCarBlackWhites(carBlackWhiteDto);
- if(carBlackWhiteDtos != null && carBlackWhiteDtos.size() >0 ){
- if(CarBlackWhiteDto.BLACK_WHITE_BLACK.equals(carBlackWhiteDtos.get(0).getBlackWhite())){
+ if (carBlackWhiteDtos != null && carBlackWhiteDtos.size() > 0) {
+ if (CarBlackWhiteDto.BLACK_WHITE_BLACK.equals(carBlackWhiteDtos.get(0).getBlackWhite())) {
carInoutDetailPo.setCarType("B");
carInoutDetailPo.setCarTypeName("榛戝悕鍗�");
- }else{
+ } else {
carInoutDetailPo.setCarType("W");
carInoutDetailPo.setCarTypeName("鐧藉悕鍗�");
}
}
- }else{
+ } else {
carInoutDetailPo.setCarType(tempCar);
carInoutDetailPo.setCarTypeName(tempCarName);
}
--
Gitblit v1.8.0