Kaynağa Gözat

优化车辆同步bug

java110 3 yıl önce
ebeveyn
işleme
feac571cc7

+ 4 - 1
service-job/src/main/java/com/java110/job/adapt/hcIot/car/AddCarOwnerToIotAdapt.java

@@ -120,9 +120,12 @@ public class AddCarOwnerToIotAdapt extends DatabusAdaptImpl {
         OwnerCarDto ownerCarDto = new OwnerCarDto();
         OwnerCarDto ownerCarDto = new OwnerCarDto();
         ownerCarDto.setCarNum(ownerCarPo.getCarNum());
         ownerCarDto.setCarNum(ownerCarPo.getCarNum());
         ownerCarDto.setCommunityId(ownerCarPo.getCommunityId());
         ownerCarDto.setCommunityId(ownerCarPo.getCommunityId());
+        ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_PRIMARY,OwnerCarDto.CAR_TYPE_MEMBER});
         List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
         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())) {
         if (StringUtil.isEmpty(ownerCarDtos.get(0).getPsId()) || "-1".equals(ownerCarDtos.get(0).getPsId())) {

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

@@ -117,10 +117,14 @@ public class ModifyCarOwnerToIotAdapt extends DatabusAdaptImpl {
         OwnerCarDto ownerCarDto = new OwnerCarDto();
         OwnerCarDto ownerCarDto = new OwnerCarDto();
         ownerCarDto.setCarNum(ownerCarPo.getCarNum());
         ownerCarDto.setCarNum(ownerCarPo.getCarNum());
         ownerCarDto.setCommunityId(ownerCarPo.getCommunityId());
         ownerCarDto.setCommunityId(ownerCarPo.getCommunityId());
+        ownerCarDto.setCarTypeCds(new String[]{OwnerCarDto.CAR_TYPE_PRIMARY,OwnerCarDto.CAR_TYPE_MEMBER});
         List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
         List<OwnerCarDto> ownerCarDtos = ownerCarInnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
 
 
         Assert.listOnlyOne(ownerCarDtos, "未找到停车场");
         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())) {
         if (StringUtil.isEmpty(ownerCarDtos.get(0).getPsId()) || "-1".equals(ownerCarDtos.get(0).getPsId())) {
             return;
             return;