最新版本541200007

doum

10 小时以前 cef5f19b9dbe6487942086c9e8896eac40b21e4f

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

@@ -283,7 +283,7 @@
            for(PageRegionInfoResponse p : allList){
                for(CarmeraListVO c : carmeraListVOList){
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode()) ){
                        if(p.getCarmeraList()==null){
                        if(p.getDeviceList()==null){
                            p.setDeviceList(new ArrayList<>());
                        }
                        p.getDeviceList().add(c);
@@ -314,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);
@@ -326,6 +327,7 @@
            stringRedisTemplate.opsForValue().set(Constants.RedisKeys.HK_SENSOR,sensorList);//所有传感器
            log.error("===============缓存海康平台区域设备信息======成功============");
        }catch (Exception e){
            e.printStackTrace();
            log.error("===============缓存海康平台区域设备信息失败==================");
        }
    }
@@ -338,7 +340,7 @@
            for(PageRegionInfoResponse p : allList){
                for(CarmeraListVO c : carmeraListVOList){
                    if(StringUtils.equals(p.getIndexCode(),c.getReginCode())
                            && (StringUtils.contains(c.getName(),name) ||StringUtils.isBlank(name))){
                            && (StringUtils.isBlank(name) || StringUtils.contains(c.getName(),name))){
                        if(p.getCarmeraList()==null){
                            p.setCarmeraList(new ArrayList<>());
                        }