提交

‘liusuyi’

2023-05-31 a67ffb9aa4c1b45391c082eaaaf48657ff21a13b

提交

 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java

@@ -87,7 +87,7 @@
    //手动录像
    String record(CameraCmd cmd);
    //手动录像
    void recordToMinio(CameraCmd cmd) throws IOException;
    void recordToMinio(CameraCmd cmd);
    //引导目标位置
    boolean setTargetPosition(CameraCmd cmd);
}

 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java

@@ -1297,7 +1297,8 @@

    @Override
    @SdkOperate
    public void recordToMinio(CameraCmd cmd) throws IOException {
    public void recordToMinio(CameraCmd cmd) {
        try {
        String cameraId = cmd.getCameraId();
        Integer channelNum = cmd.getChannelNum();
        boolean enable = cmd.isEnable();
@@ -1359,16 +1360,15 @@
            String ContentType = "video/MP4";
            FileInputStream stream = new FileInputStream(info.getRecordPath());
            String url = "";
            try {
                boolean b = MinioUtils.uploadObject(BucketName, ObjectName, stream, stream.available(), ContentType);
                if (b) {
                    url = BucketName + ObjectName;
                    log.info("上传文件成功!" + url);
                }
            } catch (IOException ex) {
                log.error("上传文件异常：" + ex.getMessage());
            }
            user_real_Map.remove(userId);
        }
    }
        } catch (Exception ex) {
            log.error("录像异常" + ex.getMessage());
        }
    }
}

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/PatrolInspectionTask.java

@@ -43,7 +43,7 @@
    @Resource
    IHikClientService hikClientService;

    public void scanRun() throws IOException {
    public void scanRun(){
        /*扫描所有可执行任务1-时间满足2-自动*/
        log.info("开始扫描所有可执行任务");
        ArdVideoInspectTask ardVideoInspectTask = new ArdVideoInspectTask();