最新版本

jiangping

2024-08-28 42f57295f5fe64132c11a25f55cd25c3c8acf167

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

@@ -65,12 +65,12 @@
                param = new PrivilegeGroupRequest();
                param.setPageNo(curPage);
                param.setPageSize(100);
                BaseResponse<PrivilegeGroupListResponse> response = HKService.privilegeGroup(param);
//                BaseResponse<PrivilegeGroupListResponse> response = HKService.privilegeGroup(param);
//                if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
//                    response = HKService.privilegIccmeGroup(param);//接口V1版本不存在，调用iccm版本接口
//                }
                BaseResponse<PrivilegeGroupListResponse> response = HKService.privilegIccmeGroup(param);//接口V1版本不存在，调用iccm版本接口
                if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
                    response = HKService.privilegIccmeGroup(param);//接口V1版本不存在，调用iccm版本接口
                }
                if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
                    response = HKService.privilegIccmeGroup(param);
                    throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "对不起，海康同步数据失败~");
                }
                PrivilegeGroupListResponse r = response.getData();
@@ -120,11 +120,17 @@
                if(model !=null){
                    //如果已存在，则更新数据
                    model =  initDataByHkData(model,device,date);
                    if(allHkList.size()==1){
                        model.setIsDefault(Constants.ZERO);
                    }
                    editList.add(model);
                }else{
                    //如果不存在，则新增数据
                    model = new DeviceRole();
                    model =  initDataByHkData(model,device,date);
                    if(allHkList.size()==1){
                        model.setIsDefault(Constants.ZERO);
                    }
                    addList.add(model);
                }
            }