From 384370341c75c0a8ae371f307dffcc83b5258a43 Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期五, 08 三月 2024 11:34:22 +0800 Subject: [PATCH] 整理 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java | 157 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 130 insertions(+), 27 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java index 1cca727..6cc4b9c 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncDeviceServiceImpl.java @@ -52,38 +52,15 @@ List<Device> deleteList = new ArrayList<>(); List<Device> addList = new ArrayList<>(); List<Device> editList = new ArrayList<>(); - List<AcsDeviceInfoResponse> allHkList = new ArrayList<>(); Date date = new Date(); //鏌ヨ鍏ㄩ儴闂ㄧ璁惧鏁版嵁 List<Device> allList = deviceMapper.selectList(null); - boolean hasNext = true; - int curTotal = 0; - int curPage = 1; - while (hasNext){ - //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹� - param = new AcsDeviceListRequest(); - param.setPageNo(curPage); - param.setPageSize(100); - BaseResponse<AcsDeviceListResponse> response = HKService.acsDeviceList(param); - if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){ - throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~"); - } - AcsDeviceListResponse r = response.getData(); - curTotal += 100; - if(curTotal >= r.getTotal()){ - hasNext = false; - } - if(r.getList() == null || r.getList().size()==0){ - hasNext =false; - }else{ - allHkList.addAll(r.getList()); - } - curPage++; - } + List<DoorsInfoResponse> allDoors = getAllDoorList(); + List<AcsDeviceInfoResponse> allHkList = getAllDeViceList(); /** * 鑾峰彇澧炲垹鏀规暟鎹泦鍚� */ - getDataChangeList(allList,allHkList,addList,editList,deleteList,date); + getDataChangeList(allList,allDoors,allHkList,addList,editList,deleteList,date); if(deleteList.size()>0){ //閫昏緫鍒犻櫎 for(Device d : deleteList){ @@ -105,6 +82,36 @@ }finally { Constants.DEALING_HK_SYNCDEVICE =false; } + } + + private List<AcsDeviceInfoResponse> getAllDeViceList() { + AcsDeviceListRequest param = new AcsDeviceListRequest(); + List<AcsDeviceInfoResponse> allHkList = new ArrayList<>(); + boolean hasNext = true; + int curTotal = 0; + int curPage = 1; + while (hasNext){ + //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹� + param = new AcsDeviceListRequest(); + param.setPageNo(curPage); + param.setPageSize(100); + BaseResponse<AcsDeviceListResponse> response = HKService.acsDeviceList(param); + if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){ + throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~"); + } + AcsDeviceListResponse r = response.getData(); + curTotal += 100; + if(curTotal >= r.getTotal()){ + hasNext = false; + } + if(r.getList() == null || r.getList().size()==0){ + hasNext =false; + }else{ + allHkList.addAll(r.getList()); + } + curPage++; + } + return allHkList; } public List<DoorsInfoResponse> getAllDoorList(){ @@ -137,6 +144,68 @@ return allDoorList; } + private void getDataChangeList(List<Device> allList, List<DoorsInfoResponse> hkDoorList , List<AcsDeviceInfoResponse> allHkList, List<Device> addList, List<Device> editList,List<Device> deleteList, Date date) { + if(hkDoorList!=null && hkDoorList.size()>0){ + //鑾峰彇娴峰悍鍏ㄩ儴闂ㄧ缁勬暟鎹� + for(DoorsInfoResponse device : hkDoorList){ + Device model = getExistedDoor(device,allList); + if(model !=null){ + //濡傛灉宸插瓨鍦紝鍒欐洿鏂版暟鎹� + model = initDoorDataByHkData(model,device,date,allHkList); + editList.add(model); + }else{ + //濡傛灉涓嶅瓨鍦紝鍒欐柊澧炴暟鎹� + model = new Device(); + model = initDoorDataByHkData(model,device,date,allHkList); + addList.add(model); + } + } + } + //鍒ゆ柇鑾峰彇鍒犻櫎鐨勯棬绂佽澶囷紝閫昏緫鍒犻櫎 + getDeleteDoorList(allList,hkDoorList,deleteList,date); + } + + private Device initDoorDataByHkData(Device model, DoorsInfoResponse door, Date date, List<AcsDeviceInfoResponse> allHkList) { + AcsDeviceInfoResponse device = getDeviceByDoorid(door.getParentIndexCode(),allHkList); + model.setIsdeleted(Constants.ZERO); + model.setIp(device.getIp()); + model.setHkDate(date); + model.setCreateDate(DateUtil.getISO8601DateByStr(device.getCreateTime())); + model.setEditDate(DateUtil.getISO8601DateByStr(device.getUpdateTime())); + model.setNo(device.getDevSerialNum()); + model.setHkId(device.getIndexCode()); + model.setName(device.getName()); + model.setHkStatus(Constants.ONE); + model.setManufature(device.getManufacturer()); + model.setType(Constants.ZERO); +// model.setNo(device.getDevSerialNum()); +// model.setChannelNo(getChannelNo(device.getIndexCode(),hkDoorList,model)); + model.setChannelNo(door.getChannelNo()); + model.setChannelInfo(door.getName()); + model.setResourceType(device.getResourceType()); + model.setDevTypeCode(device.getDevTypeCode()); + model.setDevTypeDesc(device.getDevTypeDesc()); + model.setManufature(device.getManufacturer()); + model.setPort(device.getPort()); + model.setRemark(JSONObject.toJSONString(device)); + model.setDoorId(door.getIndexCode()); + model.setDoorName(door.getName()); + model.setRegionName(door.getRegionName()); + model.setRegionPathName(door.getRegionPathName()); + model.setDoorNo(door.getDoorNo()); + return model; + } + private AcsDeviceInfoResponse getDeviceByDoorid(String indexCode, List<AcsDeviceInfoResponse> allHkList ) { + if(allHkList!=null && allHkList.size()>0){ + for(AcsDeviceInfoResponse info : allHkList){ + if(StringUtils.equals(indexCode,info.getIndexCode())){ + return info; + } + } + } + + return new AcsDeviceInfoResponse(); + } private void getDataChangeList(List<Device> allList, List<AcsDeviceInfoResponse> allHkList, List<Device> addList, List<Device> editList,List<Device> deleteList, Date date) { if(allHkList!=null && allHkList.size()>0){ //鑾峰彇娴峰悍鍏ㄩ儴闂ㄧ缁勬暟鎹� @@ -212,6 +281,17 @@ return str; } + private Device getExistedDoor(DoorsInfoResponse device, List<Device> allList) { + if(allList.size()>0){ + for(Device r : allList){ + if(StringUtils.equals(r.getDoorId(), device.getIndexCode())){ + //琛ㄧず鏈垹闄� + return r; + } + } + } + return null; + } private Device getExistedDevice(AcsDeviceInfoResponse device, List<Device> allList) { if(allList.size()>0){ for(Device r : allList){ @@ -235,7 +315,30 @@ } } } + private void getDeleteDoorList(List<Device> allList, List<DoorsInfoResponse> allHkList,List<Device> deleteList ,Date date) { + if(allList!=null && allList.size()>0){ + for(Device device : allList){ + if(isDeletedDoorDevice(device,allHkList)){ + device.setIsdeleted(Constants.ONE); + device.setEditDate(date); + deleteList.add(device); + } + } + } + } + private boolean isDeletedDoorDevice(Device device, List<DoorsInfoResponse> allHkList) { + if(allHkList.size()>0){ + for(DoorsInfoResponse r : allHkList){ + if(StringUtils.equals(device.getDoorId(), r.getIndexCode())){ + //琛ㄧず鏈垹闄� + return false; + } + } + } + return true; + + } private boolean isDeletedDevice(Device device, List<AcsDeviceInfoResponse> allHkList) { if(allHkList.size()>0){ for(AcsDeviceInfoResponse r : allHkList){ @@ -248,5 +351,5 @@ return true; } - + } -- Gitblit v1.9.3