From b8d8733ad9eeeb170a71897d1078acdbea7680f2 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期二, 04 三月 2025 15:23:38 +0800 Subject: [PATCH] 优化 --- ycl-platform/src/main/java/com/ycl/task/SynchronizeDHAlarm.java | 8 +--- ycl-common/src/main/java/com/ycl/controller/FileController.java | 8 +--- ycl-common/src/main/java/com/ycl/service/oss/impl/OssServiceImpl.java | 52 ++++++++++++++++---------- ycl-common/src/main/java/com/ycl/service/oss/OssService.java | 2 ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java | 49 +++++++++++------------- 5 files changed, 60 insertions(+), 59 deletions(-) diff --git a/ycl-common/src/main/java/com/ycl/controller/FileController.java b/ycl-common/src/main/java/com/ycl/controller/FileController.java index 76fbbbd..35511e0 100644 --- a/ycl-common/src/main/java/com/ycl/controller/FileController.java +++ b/ycl-common/src/main/java/com/ycl/controller/FileController.java @@ -66,12 +66,8 @@ @ApiOperation(value = "鍒犻櫎鍥剧墖") @PostMapping("media/delete") public CommonResult<Boolean> deleteImages(String fileUrl) { - boolean flag = false; - try { - flag = ossService.deleteImages(fileUrl); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } + boolean flag = ossService.deleteImages(fileUrl); + if (flag) { return CommonResult.success(true, "鍒犻櫎鎴愬姛"); } 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 0a93c31..1193518 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 @@ -20,7 +20,7 @@ * @param fileUrl * @return */ - boolean deleteImages(String fileUrl) throws UnsupportedEncodingException; + boolean deleteImages(String fileUrl); String uploadImages(InputStream inputStream, String ext, Integer times); 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 a4eb460..a66779b 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 @@ -154,29 +154,41 @@ } @Override - public boolean deleteImages(String fileUrl) throws UnsupportedEncodingException { - String endpoint = ConstantPropertiesUtils.END_POINT; - String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID; - String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET; - String bucketName = ConstantPropertiesUtils.BUCKET_NAME; - //鍒涘缓OSSClient瀹炰緥 - OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); + public boolean deleteImages(String fileUrl) { + try { - String imgFile = fileUrl.replace(ConstantPropertiesUtils.PREFIX_URL, ""); - String fileName = imgFile; - if (imgFile.contains("?")) { - fileName = imgFile.substring(0, imgFile.indexOf("?")); - } - fileName = URLDecoder.decode(fileName, "UTF-8"); + String endpoint = ConstantPropertiesUtils.END_POINT; + String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID; + String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET; + String bucketName = ConstantPropertiesUtils.BUCKET_NAME; + //鍒涘缓OSSClient瀹炰緥 + OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); - // 鏍规嵁BucketName,objectName鍒犻櫎鏂囦欢 - boolean b = ossClient.doesObjectExist(bucketName, fileName); - if (b) { - VoidResult voidResult = ossClient.deleteObject(bucketName, fileName); - System.out.println(voidResult.toString()); + String imgFile = fileUrl.replace(ConstantPropertiesUtils.PREFIX_URL, ""); + String fileName = imgFile; + if (imgFile.contains("?")) { + fileName = imgFile.substring(0, imgFile.indexOf("?")); + } + try { + + fileName = URLDecoder.decode(fileName, "UTF-8"); + } catch (UnsupportedEncodingException ex) { +// throw new RuntimeException(ex); + } + + // 鏍规嵁BucketName,objectName鍒犻櫎鏂囦欢 + boolean b = ossClient.doesObjectExist(bucketName, fileName); + if (b) { + VoidResult voidResult = ossClient.deleteObject(bucketName, fileName); + System.out.println(voidResult.toString()); + } + ossClient.shutdown(); + return true; + + } catch (Exception e) { + System.out.println("-------鍒犻櫎鍥剧墖澶辫触锛屽浘鐗囧湴鍧�:" + fileUrl); } - ossClient.shutdown(); - return true; + return false; } @Override diff --git a/ycl-platform/src/main/java/com/ycl/task/SynchronizeDHAlarm.java b/ycl-platform/src/main/java/com/ycl/task/SynchronizeDHAlarm.java index 157eedb..ac569d2 100644 --- a/ycl-platform/src/main/java/com/ycl/task/SynchronizeDHAlarm.java +++ b/ycl-platform/src/main/java/com/ycl/task/SynchronizeDHAlarm.java @@ -83,7 +83,7 @@ } - @Scheduled(cron = "0 0 15 * * ?") + @Scheduled(cron = "0 0 16 * * ?") @Transactional(rollbackFor = Exception.class) public void deleteAlarmTask() { System.out.println("----------------鎵ц娓呴櫎鏁版嵁浠诲姟:"); @@ -99,11 +99,7 @@ String picData = baseCaseVO.getPicData(); String[] urls = picData.split(","); for (String url : urls) { - try { - ossService.deleteImages(url); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } + ossService.deleteImages(url); } baseCaseService.removeById(baseCaseVO.getBaseId()); imageService.removeById(baseCaseVO.getImageId()); 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 58f9ca9..41ff749 100644 --- a/ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java +++ b/ycl-platform/src/test/java/com/ycl/sccgplatform/Test1.java @@ -233,32 +233,29 @@ // https://xshlivelesson.oss-accelerate.aliyuncs.com/sczf/2025-02-28%2015%3A53%3A293732..JPG?Expires=2686809213&OSSAccessKeyId=LTAIDlTWjHW0IVyW&Signature=Q5WO2kQcWRpq0SQiYjBCo6rGyJE%3D" - ossService.deleteImages("https://xshlivelesson.oss-cn-shenzhen.aliyuncs.com/sczf/2025022845414037.JPG?Expires=2686811218&OSSAccessKeyId=LTAIDlTWjHW0IVyW&Signature=5SQ7PInLkbd62zJ1aurljeO0c%2Bw%3D"); - - int i = 1; - while (true) { - String beginTime = "2025-01-01 00:00:00"; - String endTime = LocalDateTime.now().plusDays(-4).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - Page<BaseCaseVO> page = baseCaseService.selectVideoInspection(i, 10, null, null, beginTime, endTime, null); - if (page.getRecords().size() > 0) { - page.getRecords().forEach(baseCaseVO -> { - String picData = baseCaseVO.getPicData(); - String[] urls = picData.split(","); - for (String url : urls) { - try { - ossService.deleteImages(url); - } catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } - } - baseCaseService.removeById(baseCaseVO.getBaseId()); - violationsService.removeById(baseCaseVO.getBaseId()); - }); - } else { - break; - } - i++; - } +// ossService.deleteImages("https://xshlivelesson.oss-cn-shenzhen.aliyuncs.com/sczf/2025022845414037.JPG?Expires=2686811218&OSSAccessKeyId=LTAIDlTWjHW0IVyW&Signature=5SQ7PInLkbd62zJ1aurljeO0c%2Bw%3D"); +// +// int i = 1; +// while (true) { +// String beginTime = "2025-01-01 00:00:00"; +// String endTime = LocalDateTime.now().plusDays(-4).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); +// Page<BaseCaseVO> page = baseCaseService.selectVideoInspection(i, 10, null, null, beginTime, endTime, null); +// if (page.getRecords().size() > 0) { +// page.getRecords().forEach(baseCaseVO -> { +// String picData = baseCaseVO.getPicData(); +// String[] urls = picData.split(","); +// for (String url : urls) { +// ossService.deleteImages(url); +// +// } +// baseCaseService.removeById(baseCaseVO.getBaseId()); +// violationsService.removeById(baseCaseVO.getBaseId()); +// }); +// } else { +// break; +// } +// i++; +// } } -- Gitblit v1.8.0