优化车辆同步 考虑临时车问题

service-job/src/main/java/com/java110/job/adapt/hcIot/car/DeleteCarOwnerToIotAdapt.java

@@ -114,8 +114,11 @@ public class DeleteCarOwnerToIotAdapt extends DatabusAdaptImpl {
         OwnerCarDto ownerCarDto = new OwnerCarDto();
         ownerCarDto.setCarId(ownerCarPo.getCarId());
         ownerCarDto.setStatusCd(StatusConstant.STATUS_CD_INVALID);
+        ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_PRIMARY,OwnerCarDto.CAR_TYPE_MEMBER});
         List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
-        Assert.listOnlyOne(ownerCarDtos, "未找到停车场");
+        if(ownerCarDtos == null || ownerCarDtos.size() < 1){
+            throw new IllegalArgumentException("未找到车辆");
+        }
 
         //没有车位就不同步了
         if (StringUtil.isEmpty(ownerCarDtos.get(0).getPsId()) || "-1".equals(ownerCarDtos.get(0).getPsId())) {

service-job/src/main/java/com/java110/job/adapt/hcIot/car/DeleteCarToIotAdapt.java

@@ -98,8 +98,11 @@ public class DeleteCarToIotAdapt extends DatabusAdaptImpl {
         OwnerCarDto ownerCarDto = new OwnerCarDto();
         ownerCarDto.setCarId(ownerCarPo.getCarId());
         ownerCarDto.setStatusCd(StatusConstant.STATUS_CD_INVALID);
+        ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_PRIMARY,OwnerCarDto.CAR_TYPE_MEMBER});
         List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
-        Assert.listOnlyOne(ownerCarDtos, "未找到停车场");
+        if(ownerCarDtos == null || ownerCarDtos.size() < 1){
+            throw new IllegalArgumentException("未找到车辆");
+        }
 
         //没有车位就不同步了
         if (StringUtil.isEmpty(ownerCarDtos.get(0).getPsId()) || "-1".equals(ownerCarDtos.get(0).getPsId())) {

service-job/src/main/java/com/java110/job/adapt/hcIot/car/ModifyCarOwnerToIotAdapt.java

@@ -120,8 +120,6 @@ public class ModifyCarOwnerToIotAdapt extends DatabusAdaptImpl {
         ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_PRIMARY,OwnerCarDto.CAR_TYPE_MEMBER});
         List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
 
-        Assert.listOnlyOne(ownerCarDtos, "未找到停车场");
-
         if(ownerCarDtos == null || ownerCarDtos.size() < 1){
             throw new IllegalArgumentException("未找到车辆");
         }

service-job/src/main/java/com/java110/job/adapt/hcIot/car/ModifyCarToIotAdapt.java

@@ -105,10 +105,12 @@ public class ModifyCarToIotAdapt extends DatabusAdaptImpl {
         OwnerCarDto ownerCarDto = new OwnerCarDto();
         ownerCarDto.setCarNum(ownerCarPo.getCarNum());
         ownerCarDto.setCommunityId(ownerCarPo.getCommunityId());
+        ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_PRIMARY,OwnerCarDto.CAR_TYPE_MEMBER});
         List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
 
-        Assert.listOnlyOne(ownerCarDtos, "未找到车辆");
-
+        if(ownerCarDtos == null || ownerCarDtos.size() < 1){
+            throw new IllegalArgumentException("未找到车辆");
+        }
         //没有车位就不同步了
         if (StringUtil.isEmpty(ownerCarDtos.get(0).getPsId()) || "-1".equals(ownerCarDtos.get(0).getPsId())) {
             return;