1

zhanghua

2024-12-20 2078aee230bc109d66da296da8b7f24377befa1b

1

 document/¸±±¾ÀöË®ÊÐËì²ýÏØÖÇ»ÛÖ´·¨Ó¦ÓÃ-×ÊÔ´¿ªÍ¨±í -0228.xlsx

Binary files differ

 ycl-common/src/main/java/com/ycl/service/oss/OssService.java

@@ -7,6 +7,7 @@
public interface OssService {
    /**
     * ä¸Šä¼ å›¾ç‰‡
     *
     * @param file
     * @return
     */
@@ -14,12 +15,13 @@

    /**
     * åˆ é™¤å›¾ç‰‡
     *
     * @param fileUrl
     * @return
     */
    boolean deleteImages(String fileUrl);

    String uploadImages(InputStream inputStream, String ext);
    String uploadImages(InputStream inputStream, String ext, Integer times);

    String uploadVideo(MultipartFile file);


 ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java

@@ -165,43 +165,48 @@
    }

    @Override
    public String uploadImages(InputStream inputStream, String ext) {
        String endpoint = ConstantPropertiesUtils.END_POINT;
        String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID;
        String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
        String bucketName = ConstantPropertiesUtils.BUCKET_NAME;
    public String uploadImages(InputStream inputStream, String ext, Integer times) {
        if (times < 3) {
            String endpoint = ConstantPropertiesUtils.END_POINT;
            String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID;
            String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET;
            String bucketName = ConstantPropertiesUtils.BUCKET_NAME;

        DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
            DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

//        System.out.println("准备上传--" + dtf2.format(LocalDateTime.now()));
        // åˆ›å»ºOSSClient实例。
        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
        // ä¸Šä¼ æ–‡ä»¶æµ
        try {
            // èŽ·å–文件的名称
            LocalDate date = LocalDate.now();
            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
            String fileName = "sczf/" + date.format(formatter) + RandomUtils.generateRandomInt(8) + ext;
            // åˆ›å»ºOSSClient实例。
            OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
            // ä¸Šä¼ æ–‡ä»¶æµ
            try {
                // èŽ·å–文件的名称
                LocalDate date = LocalDate.now();
                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
                String fileName = "sczf/" + date.format(formatter) + RandomUtils.generateRandomInt(8) + ext;

            ObjectMetadata objectMetadata = new ObjectMetadata();
            objectMetadata.setContentType(getcontentType(ext));
                ObjectMetadata objectMetadata = new ObjectMetadata();
                objectMetadata.setContentType(getcontentType(ext));

//            System.out.println("开始上传--" + dtf2.format(LocalDateTime.now()));

            ossClient.putObject(bucketName, fileName, inputStream, objectMetadata);
            ossClient.shutdown();
                ossClient.putObject(bucketName, fileName, inputStream, objectMetadata);
                ossClient.shutdown();

            Date expiration = new Date(System.currentTimeMillis() + (long) 946080000 * 1000);
                Date expiration = new Date(System.currentTimeMillis() + (long) 946080000 * 1000);

            String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
                String url = ossClient.generatePresignedUrl(bucketName, fileName, expiration).toString();
//            System.out.println("oss上传成功：" + url);

//            System.out.println("上传完成--" + dtf2.format(LocalDateTime.now()));
            return url;
        } catch (Exception e) {
            System.out.println("oss异常：" + e.getMessage());
            // e.printStackTrace();
            return this.uploadImages(inputStream, ext);
                return url;

            } catch (Exception e) {
                System.out.println("oss异常：" + e.getMessage());
                // e.printStackTrace();
                return this.uploadImages(inputStream, ext, times + 1);
            }
        } else {
            return "";
        }
    }


 ycl-platform/src/main/java/com/dahua/netsdk/lib/callback/impl/AnalyzerDataCB.java

@@ -474,7 +474,7 @@
            try {

                String extension = "jpg";
                String picData = ossService.uploadImages(new ByteArrayInputStream(pBuffer.getByteArray(stPicInfo.dwOffSet, dwBufSize)), extension);
                String picData = ossService.uploadImages(new ByteArrayInputStream(pBuffer.getByteArray(stPicInfo.dwOffSet, dwBufSize)), extension, 0);
                videoAlarmReport.setPicData(picData);

            } catch (Exception ex) {

 ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java

@@ -221,7 +221,7 @@

//            MultipartFile file = getMultipartFile(is, fileName);

            String url = ossService.uploadImages(is, dto.getExtension());
            String url = ossService.uploadImages(is, dto.getExtension(),0);
            return CommonResult.success(url);
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -229,7 +229,7 @@
    private String saveOSS(String hkUrl) {
        InputStream inputStream = getImageStream(hkUrl);
        if (inputStream != null) {
            String picData = ossService.uploadImages(inputStream, ".png");
            String picData = ossService.uploadImages(inputStream, ".png",0);
            return picData;
        } else return "";
    }

 ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java

@@ -175,7 +175,7 @@
                        inputStream = new ByteArrayInputStream(os.toByteArray());

                    }
                    picData = ossService.uploadImages(inputStream, extension);
                    picData = ossService.uploadImages(inputStream, extension,0);
                } catch (Exception e) {
                    System.out.println("保存报警数据失败---图片上传失败：" + e.getMessage());
//                    e.printStackTrace();

 ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java

@@ -43,7 +43,7 @@
                ByteArrayOutputStream outs = new ByteArrayOutputStream();
                Thumbnails.of(in).scale(0.6).outputQuality(1).toOutputStream(outs);
                InputStream ins = new ByteArrayInputStream(outs.toByteArray());
                String picData = ossService.uploadImages(ins, ".png");
                String picData = ossService.uploadImages(ins, ".png",0);
                System.out.println(picData);
            }
        } catch (IOException e) {
@@ -83,7 +83,7 @@
        String PicData = br.readLine();
        byte[] data = DatatypeConverter.parseBase64Binary(PicData);
        InputStream inputStream = new ByteArrayInputStream(data);
        String s = ossService.uploadImages(inputStream, extension);
        String s = ossService.uploadImages(inputStream, extension,0);
        System.out.println(s);

        br.close();

 ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java

@@ -426,8 +426,8 @@
    /**
     * æ£€æµ‹ä»ªæ€»ä½“情况报表
     */
    @Scheduled(cron = "0 0 1 * * ?")   // æ¯å¤©é›¶ç‚¹æ‰§è¡Œ
//    @Scheduled(cron = "0/1 * * * * ?")   // æ¯ç§’执行
//    @Scheduled(cron = "0 0 1 * * ?")   // æ¯å¤©é›¶ç‚¹æ‰§è¡Œ
    @Scheduled(cron = "0/1 * * * * ?")   // æ¯ç§’执行
    public void listDataDetectorDailyStats() {
        try {
            DateFormat df = new SimpleDateFormat("yyyy-MM-dd");