最新版本

jiangping

2024-08-15 6f42ab38a7752193aacd49cc1b301e2f106bff34

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java

@@ -444,12 +444,17 @@

    private Device initLedDataByHkData(Device model, LedRecordsInfoResponse door, Date date) {
        model.setIsdeleted(Constants.ZERO);
        model.setHkId(door.getIndexCode());
        model.setHkId(door.getModel_data_id());
        model.setHkDate(date);
        model.setHkStatus(Constants.ONE);
        model.setNo(door.getIndex_code());
        model.setType(Constants.TWO);
        model.setManufature(door.getManufacturer());
        model.setPort(door.getPort());
        model.setIp(door.getAddr());
        model.setResourceType(door.getDevice_type());
        model.setName(door.getScreen_name());
        model.setRemark(JSONObject.toJSONString(door));
        model.setDoorId(door.getIndexCode());
        return  model;
    }
    private Device initBroadcastDataByHkData(Device model, FetchAudioChannelInfoResponse device, Date date) {
@@ -596,7 +601,7 @@
    private Device getExistedLed(LedRecordsInfoResponse device, List<Device> allList) {
        if(allList.size()>0){
            for(Device r : allList){
                if(StringUtils.equals(r.getHkId(), device.getIndexCode())){
                if(StringUtils.equals(r.getHkId(), device.getModel_data_id())){
                    //表示未删除
                    return  r;
                }
@@ -687,7 +692,7 @@
    private boolean isDeletedLedDevice(Device device, List<LedRecordsInfoResponse> allHkList) {
        if(allHkList.size()>0){
            for(LedRecordsInfoResponse r : allHkList){
                if(StringUtils.equals(device.getDoorId(), r.getIndexCode())){
                if(StringUtils.equals(device.getDoorId(), r.getModel_data_id())){
                    //表示未删除
                    return  false;
                }