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/AddCarToIotAdapt.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/car/AddCarToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/car/AddCarToIotAdapt.java
old mode 100644
new mode 100755
index 4b66cfd..7a70c1b
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/car/AddCarToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/car/AddCarToIotAdapt.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;
@@ -35,7 +36,7 @@
import java.util.List;
/**
- * HC iot 鍋滆溅鍦哄悓姝ラ�傞厤鍣�
+ * HC iot 杞﹁締鍚屾閫傞厤鍣�
* <p>
* 鎺ュ彛鍗忚鍦板潃锛� https://gitee.com/java110/MicroCommunityThings/blob/master/back/docs/api.md
*
@@ -105,22 +106,36 @@
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("personId", ownerCarDtos.get(0).getOwnerId());
postParameters.put("personName", ownerCarDtos.get(0).getOwnerName());
postParameters.put("personTel", ownerCarDtos.get(0).getLink());
postParameters.put("extCarId", ownerCarDtos.get(0).getCarId());
+ postParameters.put("parkingNum", parkingSpaceCount);
postParameters.put("extCommunityId", ownerCarDtos.get(0).getCommunityId());
hcOwnerCarAsynImpl.addOwnerCar(postParameters);
}
--
Gitblit v1.8.0