From 2078aee230bc109d66da296da8b7f24377befa1b Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 20 十二月 2024 11:08:44 +0800
Subject: [PATCH] 1

---
 document/副本丽水市遂昌县智慧执法应用-资源开通表 -0228.xlsx                                               |    0 
 ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java                          |    4 +-
 ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java                  |   55 +++++++++++++++------------
 ycl-platform/src/main/java/com/dahua/netsdk/lib/callback/impl/AnalyzerDataCB.java      |    2 
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java |    2 
 ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java             |    2 
 ycl-common/src/main/java/com/ycl/service/oss/OssService.java                           |    4 +
 ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java |    2 
 ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java                             |    4 +-
 9 files changed, 41 insertions(+), 34 deletions(-)

diff --git "a/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx" "b/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
index 5554678..7b5c1d8 100644
--- "a/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
+++ "b/document/\345\211\257\346\234\254\344\270\275\346\260\264\345\270\202\351\201\202\346\230\214\345\216\277\346\231\272\346\205\247\346\211\247\346\263\225\345\272\224\347\224\250-\350\265\204\346\272\220\345\274\200\351\200\232\350\241\250 -0228.xlsx"
Binary files differ
diff --git a/ycl-common/src/main/java/com/ycl/service/oss/OssService.java b/ycl-common/src/main/java/com/ycl/service/oss/OssService.java
index cca9dce..841024c 100644
--- a/ycl-common/src/main/java/com/ycl/service/oss/OssService.java
+++ b/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);
 
diff --git a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
index 183c739..460c745 100644
--- a/ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java
+++ b/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 "";
         }
     }
 
diff --git a/ycl-platform/src/main/java/com/dahua/netsdk/lib/callback/impl/AnalyzerDataCB.java b/ycl-platform/src/main/java/com/dahua/netsdk/lib/callback/impl/AnalyzerDataCB.java
index 4db7b06..ffba0f9 100644
--- a/ycl-platform/src/main/java/com/dahua/netsdk/lib/callback/impl/AnalyzerDataCB.java
+++ b/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) {
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java b/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
index fcb1d8b..206ea90 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/dingding/DingController.java
+++ b/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();
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
index 9f4c791..95df9ac 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ViolationsServiceImpl.java
+++ b/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 "";
     }
diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
index 0d822f5..892873a 100644
--- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoAlarmReportServiceImpl.java
+++ b/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();
diff --git a/ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java b/ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java
index 39e59a6..c845b23 100644
--- a/ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java
+++ b/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();
diff --git a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java b/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
index 088f683..4455b51 100644
--- a/ycl-smoke/src/main/java/com/ycl/smoke/task/ScheduledTask.java
+++ b/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");

--
Gitblit v1.8.0