From 82df1f24d8e8007cd55cb0c4ce2268f54cb6c619 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 八月 2022 15:08:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineGetFreeParkingSpaceCmd.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineGetFreeParkingSpaceCmd.java b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineGetFreeParkingSpaceCmd.java
index 656161c..0d99ad1 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineGetFreeParkingSpaceCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machineTranslate/MachineGetFreeParkingSpaceCmd.java
@@ -25,7 +25,6 @@
@Java110Cmd(serviceCode = "machineTranslate.machineGetFreeParkingSpace")
public class MachineGetFreeParkingSpaceCmd extends BaseMachineCmd {
-
private static final String MACHINE_DIRECTION_IN = "3306"; // 杩涘叆
private static final String MACHINE_DIRECTION_OUT = "3307"; //鍑哄幓
@@ -53,7 +52,6 @@
@Autowired
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
-
@Autowired
private ICommunityInnerServiceSMO communityInnerServiceSMOImpl;
@@ -64,7 +62,7 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
-//JSONObject outParam = null;
+ //JSONObject outParam = null;
String communityId = reqJson.getString("communityId");
//鏌ヨ鍑哄皬鍖哄唴杞︿綅鐘舵�佷负绌洪棽鐨勬暟閲�
@@ -72,7 +70,6 @@
parkingSpaceDto.setCommunityId(communityId);
parkingSpaceDto.setState("F");
int freeParkingSpaceCount = parkingSpaceInnerServiceSMOImpl.queryParkingSpacesCount(parkingSpaceDto);
-
//鏌ヨ鍑哄皬鍖哄唴鐨勫湪鍦鸿溅杈�
CarInoutDto carInoutDto = new CarInoutDto();
@@ -85,16 +82,16 @@
}
OwnerCarDto ownerCarDto = new OwnerCarDto();
ownerCarDto.setCommunityId(communityId);
- if(!carNums.isEmpty()){
+ if (!carNums.isEmpty()) {
ownerCarDto.setCarNums(carNums.toArray(new String[carNums.size()]));
}
List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
//浠樻鏂笽D-杞︾墝鍙�
- Map<String,String> psIdAndCarNumMap = new HashMap<>();
+ Map<String, String> psIdAndCarNumMap = new HashMap<>();
List<String> psIds = new ArrayList<>();
for (OwnerCarDto tmpOwnerCarDto : ownerCarDtos) {
psIds.add(tmpOwnerCarDto.getPsId());
- psIdAndCarNumMap.put(tmpOwnerCarDto.getPsId(),tmpOwnerCarDto.getCarNum());
+ psIdAndCarNumMap.put(tmpOwnerCarDto.getPsId(), tmpOwnerCarDto.getCarNum());
}
FeeDto feeDto = new FeeDto();
feeDto.setCommunityId(communityId);
@@ -103,8 +100,8 @@
// int communityCarCount = feeInnerServiceSMOImpl.queryFeesCount(feeDto);
List<FeeDto> communityCars = feeInnerServiceSMOImpl.queryFees(feeDto);//鏈夋晥鐨勬湀鎶ヨ溅浣嶄俊鎭紝宸茬粡鏀粯绉熼噾鐨�
- for(FeeDto communityCar:communityCars){
- if(psIdAndCarNumMap.containsKey(communityCar.getPayerObjId())){
+ for (FeeDto communityCar : communityCars) {
+ if (psIdAndCarNumMap.containsKey(communityCar.getPayerObjId())) {
carNums.remove(psIdAndCarNumMap.get(communityCar.getPayerObjId()));//鎶婂満鍐呮湀绉熻溅浣嶇殑涓氫富杞︾墝鍘绘帀锛屼笉绠楄繘鍦鸿溅杈�
}
}
--
Gitblit v1.8.0