From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-job/src/main/java/com/java110/job/adapt/hcIot/car/ModifyCarToIotAdapt.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/car/ModifyCarToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/car/ModifyCarToIotAdapt.java
old mode 100644
new mode 100755
index 9bed4c8..2f73bee
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/car/ModifyCarToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/car/ModifyCarToIotAdapt.java
@@ -25,6 +25,7 @@
 import com.java110.job.adapt.DatabusAdaptImpl;
 import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
 import com.java110.po.car.OwnerCarPo;
+import com.java110.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
@@ -103,22 +104,34 @@
             return;
         }
 
+        //鐢靛姩杞�
+        //涓夎疆杞� 涓嶅悓姝ョ墿鑱旂綉绯荤粺
+        if ("9904,9905".contains(ownerCarDtos.get(0).getCarType())) {
+            return;
+        }
+
         ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
         parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
         parkingSpaceDto.setCommunityId(ownerCarDtos.get(0).getCommunityId());
         List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
         Assert.listOnlyOne(ownerCarDtos, "鏈壘鍒拌溅浣�");
 
-
+        ownerCarDto = new OwnerCarDto();
+        ownerCarDto.setOwnerId(ownerCarPo.getOwnerId());
+        ownerCarDto.setCommunityId(ownerCarPo.getCommunityId());
+        ownerCarDto.setStatusCd(StatusConstant.STATUS_CD_VALID);
+        long parkingSpaceCount = ownerCarInnerServiceSMOImpl.queryOwnerParkingSpaceCount(ownerCarDto);
         JSONObject postParameters = new JSONObject();
 
-        postParameters.put("carNum", ownerCarDtos.get(0).getNum());
+        postParameters.put("carNum", ownerCarDtos.get(0).getCarNum());
         postParameters.put("startTime", DateUtil.getFormatTimeString(ownerCarDtos.get(0).getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
         postParameters.put("endTime", DateUtil.getFormatTimeString(ownerCarDtos.get(0).getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
         postParameters.put("extPaId", parkingSpaceDtos.get(0).getPaId());
         postParameters.put("personName", ownerCarDtos.get(0).getOwnerName());
         postParameters.put("personTel", ownerCarDtos.get(0).getLink());
+        postParameters.put("personId", ownerCarDtos.get(0).getOwnerId());
         postParameters.put("extCarId", ownerCarDtos.get(0).getCarId());
+        postParameters.put("parkingNum", parkingSpaceCount);
         postParameters.put("extCommunityId", ownerCarDtos.get(0).getCommunityId());
         hcOwnerCarAsynImpl.updateOwnerCar(postParameters);
     }

--
Gitblit v1.8.0