From e8aad6f9685aa50c6b472ee5012ff0e627bebeae Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Mon, 12 May 2025 14:48:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4:=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusinessAlertController.java | 9 +- .../manage/service/impl/SDKDeviceService.java | 1 + .../storage/config/OssTianyiConfig.java | 79 -------- .../controller/OssTianyiController.java | 58 ------ .../storage/util/OssTianyiClientUtils.java | 174 ------------------ 5 files changed, 6 insertions(+), 315 deletions(-) delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/storage/config/OssTianyiConfig.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/storage/controller/OssTianyiController.java delete mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/storage/util/OssTianyiClientUtils.java diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java index 564022a..e3e3d51 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java +++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java @@ -120,13 +120,14 @@ public class BusinessAlertController extends BaseController { remoteNoticeBo.setIsRead(0); remoteNoticeBo.setCreateBy(1L); remoteNoticeBo.setCreateDept(1L); - remoteNoticeBo.setCreateTime(vo.getCreateTime()); - if (vo.getBusinessType() == 2){ - vo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, vo.getImages(), 3600).toString()); + remoteNoticeBo.setCreateTime(businessAlert.getCreateTime()); + if (businessAlert.getBusinessType() == 2){ + businessAlert.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, vo.getImages(), 3600).toString()); } remoteNoticeBo.setDeviceSn(vo.getDeviceSn()); - remoteNoticeBo.setParam(JSON.toJSONString(vo)); + remoteNoticeBo.setParam(JSON.toJSONString(businessAlert)); remoteNoticeService.saveNotice(remoteNoticeBo); + remoteSubmailConfigService.remoteCmdSend("smsMultixsend", JSON.toJSONString(vo)); return R.ok(); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java index 87c84bb..b31211a 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java @@ -176,6 +176,7 @@ public class SDKDeviceService extends AbstractDeviceService { public void osdDockDrone(TopicOsdRequest request, MessageHeaders headers) { String from = request.getFrom(); Optional deviceOpt = deviceRedisService.getDeviceOnline(from); + log.error(deviceOpt.get().getDeviceSn()); if (deviceOpt.isEmpty()) { deviceOpt = deviceService.getDeviceBySn(from); if (deviceOpt.isEmpty()) { diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/storage/config/OssTianyiConfig.java b/dk-modules/sample/src/main/java/org/dromara/sample/storage/config/OssTianyiConfig.java deleted file mode 100644 index 3fcf366..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/storage/config/OssTianyiConfig.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.dromara.sample.storage.config; - -import io.minio.MinioClient; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * Minio 配置信息 - * - * @author ruoyi - */ -@Configuration -@ConfigurationProperties(prefix = "osstianyi") -public class OssTianyiConfig -{ - - private String endPoint; - private String accessKey; - private String secretKey; - private String bucketName; - - public String getEndPoint() { - return endPoint; - } - - public void setEndPoint(String endPoint) { - this.endPoint = endPoint; - } - - public String getAccessKey() - { - return accessKey; - } - - public void setAccessKey(String accessKey) - { - this.accessKey = accessKey; - } - - public String getSecretKey() - { - return secretKey; - } - - public void setSecretKey(String secretKey) - { - this.secretKey = secretKey; - } - - public String getBucketName() - { - return bucketName; - } - - public void setBucketName(String bucketName) - { - this.bucketName = bucketName; - } - - @Override - public String toString() { - return "OssTianyiConfig{" + - "endPoint='" + endPoint + '\'' + - ", accessKey='" + accessKey + '\'' + - ", secretKey='" + secretKey + '\'' + - ", bucketName='" + bucketName + '\'' + - '}'; - } - - @Bean - public MinioClient getMinioClient() - { -// System.out.println("OssTianyiConfig"); -// System.out.println("OssTianyiConfig" + endPoint); - System.out.println(toString()); - return MinioClient.builder().endpoint(endPoint).credentials(accessKey, secretKey).build(); - } -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/storage/controller/OssTianyiController.java b/dk-modules/sample/src/main/java/org/dromara/sample/storage/controller/OssTianyiController.java deleted file mode 100644 index 0f29fee..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/storage/controller/OssTianyiController.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.dromara.sample.storage.controller; - - -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.sample.storage.domain.SysUploadFile; -import org.dromara.sample.storage.util.OssTianyiClientUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.util.HashMap; - -/** - * 系统上传文件Controller - * - * @author tom - * @date 2024-12-21 - */ -@RestController -@RequestMapping("/ossTianyi") -public class OssTianyiController extends BaseController -{ - - @Autowired - private OssTianyiClientUtils ossTianyiClientUtils; - - /** - * 查询系统上传文件列表 （实际是上传接口） - */ - @SaCheckPermission("file:sysUploadFile:list") - @GetMapping("/list") - public TableDataInfo list(SysUploadFile sysUploadFile) - { - String localFilePath = "D:\\123pan\\page.html"; - try{ - ossTianyiClientUtils.uploadFileTest("page.html","dev/temp",localFilePath); - }catch (Exception e){ - e.printStackTrace(); - } - - return null; - } - - @GetMapping("/upload") - public R> upload(@RequestPart("file") MultipartFile file) { - try { - ossTianyiClientUtils.uploadFile("page.html", "dev/temp", file); - } catch (Exception e) { - e.printStackTrace(); - } - - return null; - } - -} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/storage/util/OssTianyiClientUtils.java b/dk-modules/sample/src/main/java/org/dromara/sample/storage/util/OssTianyiClientUtils.java deleted file mode 100644 index e952f4a..0000000 --- a/dk-modules/sample/src/main/java/org/dromara/sample/storage/util/OssTianyiClientUtils.java +++ /dev/null @@ -1,174 +0,0 @@ -package org.dromara.sample.storage.util; - -import cn.hutool.core.io.FileUtil; -import io.minio.*; -import io.minio.errors.*; -import io.minio.messages.Item; -import org.dromara.sample.storage.config.OssTianyiConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; - -@Component -public class OssTianyiClientUtils { - - private static MinioClient minioClient; - -// private static String endPoint = "https://jiangsu-10.zos.ctyun.cn"; //地域节点，可访问 -// // private static String endPoint = "https://dk-ty-oss-bucket.jiangsu-10.zos.ctyun.cn"; //说是桶的域名地址，支持公网访问ZOS，实测报错 -// private static String minioAccessKey = "22e3f37368a242b38f4f25d98c9baf1f"; -// private static String minioSecretKey = "0d858850666248e59830d9a596847062"; - -// private static String bucketName = "dk-ty-oss-bucket"; -// private String bucketName = "dkossbucket"; - private String objectName = "page.html"; - //注意，天翼云里默认路径就是文件名，不需要在前面加根路径/ - private String filePath = "dev/temp/"; - private String fileDir = "dev"; - - - @Autowired - OssTianyiConfig ossTianyiConfig; - - @Autowired - public OssTianyiClientUtils(OssTianyiConfig ossTianyiConfig) { - this.ossTianyiConfig = ossTianyiConfig; - init(); - } - - private void init() { - this.minioClient = MinioClient.builder() - .endpoint(ossTianyiConfig.getEndPoint()) - .credentials(ossTianyiConfig.getAccessKey(), ossTianyiConfig.getSecretKey()) - .build(); - } - - /** - * 天翼云OSS初始化（采用S3 Compatible Storage） - */ -// public void tianyiOssInit() { -// minioClient = MinioClient.builder() -// .endpoint(ossTianyiConfig.getEndPoint()) -// .credentials(ossTianyiConfig.getAccessKey(), ossTianyiConfig.getSecretKey()) -// .build(); -// } - - /** - * 文件上传 (固定) - */ - public void uploadFileTest(String objectName, String filePath, String localFilePath) throws Exception { - File file = new File(localFilePath); - BufferedInputStream inputStream = FileUtil.getInputStream(file); - String contentType = Files.probeContentType(file.toPath()); - if (contentType == null) { - contentType = "application/octet-stream"; - } - PutObjectArgs args = PutObjectArgs.builder() - .bucket(ossTianyiConfig.getBucketName()) - .object(filePath + objectName) - .stream(inputStream, FileUtil.size(file), -1) - .contentType(contentType) - .build(); - minioClient.putObject(args); - } - - public void uploadFile(String s, String s1, MultipartFile file) { - try { - PutObjectArgs args = PutObjectArgs.builder() - .bucket(ossTianyiConfig.getBucketName()) - .object( file.getName()) - .stream(file.getInputStream(), file.getSize(), -1) - .contentType(file.getContentType()) - .build(); - minioClient.putObject(args); - } catch (Exception e) { - e.printStackTrace(); - } - - } - - - - /** - * 文件删除 - */ - public void deleteFile(String bucketName, String objectName) throws Exception { - minioClient.removeObject( - RemoveObjectArgs.builder() - .bucket(bucketName) - .object(objectName) - .build()); - } - - /** - * 文件下载 - */ - public void downloadFile(String bucketName, String objectName, String downloadPath) throws Exception { - InputStream inputStream = minioClient.getObject( - GetObjectArgs.builder() - .bucket(bucketName) - .object(objectName) - .build() - ); - FileUtil.writeFromStream(inputStream, new File(downloadPath)); - } - - /** - * 文件列表 - * @param bucketName - * @param prefix - */ - public void listFiles(String bucketName, String prefix) { - Iterable> results = minioClient.listObjects( - ListObjectsArgs.builder() - .bucket(bucketName) - .prefix(prefix) - .recursive(true) - .build() - ); - - try { - for (Result result : results) { - try { -// System.out.println("文件名：" + result.get().objectName()); // 获取对象名称（文件路径） - System.out.println(result.get().objectName()); // 获取对象名称（文件路径） - } catch (Exception e) { - e.printStackTrace(); - } - } - - } catch (Exception e) { - System.err.println("文件读取异常: " + e.getMessage()); - } - - } - - - - -// public void updateFile(String bucketName, String objectName, String filePath, String localFilePath) throws Exception { -// uploadFile(bucketName, objectName, filePath, localFilePath); -// } - - -// public static void main(String[] args) throws Exception { -// String localFilePath = "D:\\123pan\\page.html"; -// -// tianyiOssInit("", "", ""); -// uploadFile(bucketName, objectName, filePath, localFilePath);//正常 -//// deleteFile(bucketName, filePath + objectName);//正常 -//// listFiles(bucketName, fileDir + "/"); // 正常 -// -//// downloadFile(bucketName, filePath + objectName, "D:\\123pan\\downloaded_page.html"); //正常 -// -// } - -}