Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-09-04 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8

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

old mode 100644
new mode 100755
@@ -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,12 +106,24 @@
            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();

@@ -118,9 +131,11 @@
        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);
    }