最新版本541200007

doum

14 小时以前 418322636d57d26b220bffd10cbe1a223f2d153b

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java

@@ -282,12 +282,11 @@
        if(carmeraListVOList!=null && carmeraListVOList.size()>0){
            for(PageRegionInfoResponse p : allList){
                for(CarmeraListVO c : carmeraListVOList){
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
                            && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
                        if(p.getCarmeraList()==null){
                            p.setCarmeraList(new ArrayList<>());
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode()) ){
                        if(p.getDeviceList()==null){
                            p.setDeviceList(new ArrayList<>());
                        }
                        p.getCarmeraList().add(c);
                        p.getDeviceList().add(c);
                    }
                }
            }
@@ -299,12 +298,11 @@
        if(carmeraListVOList!=null && carmeraListVOList.size()>0){
            for(PageRegionInfoResponse p : allList){
                for(CarmeraListVO c : carmeraListVOList){
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
                            && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
                        if(p.getCarmeraList()==null){
                            p.setCarmeraList(new ArrayList<>());
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())){
                        if(p.getSensorList()==null){
                            p.setSensorList(new ArrayList<>());
                        }
                        p.getCarmeraList().add(c);
                        p.getSensorList().add(c);
                    }
                }
            }
@@ -316,6 +314,7 @@
        try {
            CarmeraListVO param  =new CarmeraListVO();
            param.setWithCameras(2);
            param.setRefresh(1);
            List<PageRegionInfoResponse>  resultTree = getRegionTree(param);
            List<PageRegionInfoResponse>  result = getAllRegionList();
            List<CarmeraListVO> carmeraListVOList = initAllReginCameralList(result);
@@ -454,6 +453,7 @@
            //分页遍历循环查询所有门禁设备数据
            SensorStatusListRequest param = new SensorStatusListRequest();
            param.setRegionIndexCode("-1");
            param.setIncludeSubNode(1);
            param.setPageSize(100);
            param.setPageNo(curPage);
            BaseResponse<BaseListPageResponse<SensorStatusListResponse>> response = HKService.sensorStatusSearch(param);
@@ -508,6 +508,7 @@
            FireDeviceStatuslListRequest param = new FireDeviceStatuslListRequest();
            param.setRegionIndexCode("-1");
            param.setPageSize(100);
            param.setIncludeSubNode(1);
            param.setPageNo(curPage);
            BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> response = HKService.fireDeviceStatusSearch(param);
            if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){