From 14f7888f7705642f99ea90b16b2765ca22316bdd Mon Sep 17 00:00:00 2001 From: wuyuan <15505152113@163.com> Date: Fri, 18 Jul 2025 14:23:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=92=AD=E6=94=BE=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/common/oss/core/OssClient.java | 8 ++++++++ .../dromara/sample/CloudApiSampleApplication.java | 2 ++ .../sample/job/WaylineDeviceJobExecutor.java | 13 +++++++------ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dk-common/common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/dk-common/common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java index 311ac1f..6c801d8 100644 --- a/dk-common/common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java +++ b/dk-common/common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java @@ -397,6 +397,10 @@ public class OssClient { return upload(inputStream, getPath(properties.getPrefix(), suffix), length, contentType); } + public UploadResult uploadSuffixNew(InputStream inputStream, String suffix, Long length, String contentType) { + return upload(inputStream, suffix, length, contentType); + } + public UploadResult uploadSuffix(InputStream inputStream, String suffix, String fileName,Long length, String contentType) { @@ -527,6 +531,10 @@ public class OssClient { return path + suffix; } + public String getPathNew(String prefix, String suffix) { + return prefix + suffix; + } + public String getPath(String prefix,String fileName, String suffix) { // 生成uuid diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java b/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java index 14cacd6..504c05f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java @@ -1,5 +1,6 @@ package org.dromara.sample; +import com.aizuda.snailjob.client.starter.EnableSnailJob; import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -12,6 +13,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableScheduling @ComponentScan("org.dromara") @EnableFeignClients +@EnableSnailJob public class CloudApiSampleApplication { public static void main(String[] args) { diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/job/WaylineDeviceJobExecutor.java b/dk-modules/sample/src/main/java/org/dromara/sample/job/WaylineDeviceJobExecutor.java index 6dbc9e0..1283efb 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/job/WaylineDeviceJobExecutor.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/job/WaylineDeviceJobExecutor.java @@ -1,5 +1,6 @@ package org.dromara.sample.job; +import cn.hutool.json.JSONUtil; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; import com.aizuda.snailjob.client.job.core.dto.JobArgs; import com.aizuda.snailjob.client.job.core.executor.AbstractJobExecutor; @@ -34,7 +35,7 @@ public class WaylineDeviceJobExecutor { @Autowired private IWaylineFileService waylineFileService; @JobExecutor(name = "mediaFileJob") - protected ExecuteResult doMediaFileJobJobExecute(JobArgs jobArgs) { + public ExecuteResult doMediaFileJobJobExecute(JobArgs jobArgs) { WaylineDeviceJobBo waylineDeviceJobBo = JsonUtils.parseObject(jobArgs.getJobParams().toString(), WaylineDeviceJobBo.class); List mediaFileEntitys = fileService.getListBywaylineDeviceJobBo(waylineDeviceJobBo); OssClient mediafile = OssFactory.instance("mediafile"); @@ -53,17 +54,17 @@ public class WaylineDeviceJobExecutor { } @JobExecutor(name = "waylineFileJob") - protected ExecuteResult doWaylineFileJobExecute(JobArgs jobArgs) { + public ExecuteResult doWaylineFileJobExecute(JobArgs jobArgs) { System.out.println("狗从-------------------------》"); - WaylineDeviceJobBo waylineDeviceJobBo = JsonUtils.parseObject(jobArgs.getJobParams().toString(), WaylineDeviceJobBo.class); + WaylineDeviceJobBo waylineDeviceJobBo = JSONUtil.toBean(JSONUtil.parseObj(jobArgs.getJobParams()),WaylineDeviceJobBo.class); List waylineFileEntities = waylineFileService.getListBywaylineDeviceJobBo(waylineDeviceJobBo); OssClient waylinefile = OssFactory.instance("waylinefile"); OssClient waylinefileNW = OssFactory.instance("waylinefileNW"); for (WaylineFileEntity waylineFileEntity:waylineFileEntities){ - String privateUrl = waylinefile.getPrivateUrl(waylineFileEntity.getObjectKey(), 3600); + //String privateUrl = waylinefile.getPrivateUrl(waylineFileEntity.getObjectKey(), 3600); try { - InputStream inputStream = waylinefile.getObjectContent(privateUrl); - waylinefileNW.uploadSuffix(inputStream,waylineFileEntity.getObjectKey(), Long.getLong(String.valueOf(inputStream.available())), "kmz"); + InputStream inputStream = waylinefile.getObjectContent(waylineFileEntity.getObjectKey()); + waylinefileNW.uploadSuffixNew(inputStream,waylineFileEntity.getObjectKey(), Long.getLong(String.valueOf(inputStream.available())), "kmz"); } catch (IOException e) { throw new RuntimeException(e); }