bug修改

zhanghua

2023-03-09 f1c38047fad7066bc5f981521bb88641cff7507d

bug修改

 ycl-platform/src/main/java/com/ycl/controller/cockpit/aiIot/AIIotController.java

@@ -71,17 +71,24 @@
    public CommonResult video(@Validated CockpitVO params) {
        checkApiUtil.cockpit(params);
        /// TODO: 2022/12/13  视频点位设备为空 没数据
        return CommonResult.success(iVideoPointService.list(new LambdaQueryWrapper<VideoPoint>().eq(params.getStreetId() != null, VideoPoint::getStreetId, params.getStreetId()).isNotNull(VideoPoint::getPlatResourceId)).stream().map(item -> {
        List<VideoPoint> list = iVideoPointService.list(new LambdaQueryWrapper<VideoPoint>()
                .eq(params.getStreetId() != null, VideoPoint::getStreetId, params.getStreetId())
                .isNotNull(VideoPoint::getPlatResourceId));

        List<VideoVO> vos = list.stream().map(item -> {
            VideoVO videoVO = new VideoVO();
            videoVO.setName(item.getName());
            videoVO.setBrand(item.getEquipmentBrand());
            videoVO.setModel(item.getEquipmentModel());
            videoVO.setIp(item.getEquipmentIp());
            videoVO.setLatitude(item.getLatitude().toString());
            videoVO.setLongitude(item.getLongitude().toString());
            videoVO.setLatitude(item.getLatitude() != null ? item.getLatitude().toString() : "");
            videoVO.setLongitude(item.getLongitude() != null ? item.getLongitude().toString() : "");
            videoVO.setResourceId(item.getPlatResourceId());
            return videoVO;
        }).collect(Collectors.toList()));
        }).collect(Collectors.toList());

        return CommonResult.success(vos);

    }

    @ApiOperation(value = "AI算法效能")

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java

@@ -42,6 +42,7 @@
    public void setVideoPointService(IVideoPointService videoPointService) {
        this.videoPointService = videoPointService;
    }

    @Autowired
    public void setBaseCaseService(IBaseCaseService baseCaseService) {
        this.baseCaseService = baseCaseService;
@@ -65,18 +66,19 @@
                baseCase.setStreetId(videoPoint.getStreetId());
                baseCase.setCommunityId(videoPoint.getCommunityId());
                baseCase.setSite(videoPoint.getAddress());

                baseCaseService.save(baseCase);
                violations.setId(baseCase.getId());
                violations.setVideoAlarmReportId(videoAlarmReport.getId());
                violations.setVideoPointId(videoPoint.getId());
                violations.setDescription(videoAlarmReport.getAlgoName());
                baseMapper.insert(violations);
            }
            baseCaseService.save(baseCase);
            violations.setId(baseCase.getId());
            violations.setVideoAlarmReportId(videoAlarmReport.getId());
            violations.setVideoPointId(videoPoint.getId());
            violations.setDescription(videoAlarmReport.getAlgoName());
            baseMapper.insert(violations);
        }
    }

    @Override
    public List<VideoAndAreaVO> selectType() {
        return  baseCaseMapper.selectType();
        return baseCaseMapper.selectType();
    }
}

 ycl-platform/src/main/java/com/ycl/util/VideoUtil.java

@@ -40,6 +40,7 @@
     **/
    @SneakyThrows
    public String getVideo(String code, String scheme, Integer subType) {
        System.out.println("开始视频请求：" + code);
        String clientType = "winpc";
        String reqUrl = "/videoService/accounts/authorize";
        String deviceUrl = "/videoService/devicesManager/devices";
@@ -78,7 +79,7 @@

        HttpEntity<String> firstEntity = new HttpEntity<>(objectMapper.writeValueAsString(firstReq), httpHeaders);
        ResponseEntity<String> responseEntity = restTemplate.postForEntity(url + reqUrl, firstEntity, String.class);

        System.out.println("开始视频身份请求结果：" + responseEntity.getBody());
        FirstRes firstRes = objectMapper.readValue(responseEntity.getBody(), FirstRes.class);

        String signature = MD5Util.md5Encrypt(passWord);
@@ -102,7 +103,9 @@
        HttpEntity<Object> deviceEntity = new HttpEntity<>(deviceHeaders);
        ResponseEntity<String> exchange = restTemplate.exchange(url + deviceUrl + "/" + code, HttpMethod.GET, deviceEntity, String.class);
        String channelId = objectMapper.readTree(objectMapper.readTree(objectMapper.readTree(exchange.getBody()).get("encoderUnit").toString()).get("channels").get(0).toString()).get("channelId").textValue();
        System.out.println("视频请求地址：" + url + monitorUrl + channelId);
        ResponseEntity<String> monitorReq = restTemplate.exchange(url + monitorUrl + channelId, HttpMethod.GET, deviceEntity, String.class);
        System.out.println("视频请求返回参数：" + monitorReq.getBody());
        return objectMapper.readTree(monitorReq.getBody()).get("url").textValue();
    }
}

 ycl-platform/src/main/resources/application-dev.yml

@@ -67,8 +67,8 @@
  url: http://localhost:8082/sccg/text/sms_res

videoPoint:
  url: http://172.28.194.180:7902
  port: 7902
  url: http://183.245.159.161:8281
  port: 8281
  userName: suichang
  passWord: a12345677
  ip: 10.10.10.10

 ycl-platform/src/main/resources/application-prod.yml

@@ -66,8 +66,8 @@
  url: http://localhost:8082/sccg/text/sms_res

videoPoint:
  url: http://172.28.194.180:7902
  port: 7902
  url: http://172.28.194.180:7901
  port: 7901
  userName: suichang
  passWord: a12345677
  ip: 10.10.10.10