From 4901af59a86acffbc5b59b41979e4c30676be1f5 Mon Sep 17 00:00:00 2001
From: ant <antordragon@163.con>
Date: Wed, 31 Jul 2024 16:13:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=A8=A1=E7=89=88=E7=AE=A1=E7=90=86=202.?=
 =?UTF-8?q?=20=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=20=E5=BC=82=E5=B8=B8=20?=
 =?UTF-8?q?3.=20=E5=88=86=E6=9C=9F=20token=20=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/ins/GeneratedInsFactory.java        |  2 +-
 .../project/controller/TemplateController.java     |  6 ++++--
 .../project/service/TbTemplateService.java         |  4 +++-
 .../project/service/impl/TemplateServiceImpl.java  | 14 +++++++++-----
 .../work/service/impl/WrkInfoPhoneServiceImpl.java |  2 +-
 .../com/chushang/oss/entity/FileSourceInfo.java    |  4 ++++
 .../com/chushang/oss/entity/dto/UploadFileDTO.java |  8 +++++++-
 .../com/chushang/oss/feign/RemoteOssService.java   |  3 ++-
 .../chushang/oss/remote/RemoteFileController.java  |  6 +++---
 9 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/ins/GeneratedInsFactory.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/ins/GeneratedInsFactory.java
index 2a312e0..be236cc 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/ins/GeneratedInsFactory.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/ins/GeneratedInsFactory.java
@@ -82,7 +82,7 @@ public class GeneratedInsFactory {
                         null,
                         false,
                         "",
-                        "downFile", SecurityConstants.INNER);
+                        "wrkGen", SecurityConstants.INNER);
                 // 不为空时, 说明 上传成功
                 if (listResult.isSuccess() && CollectionUtil.isNotEmpty(listResult.getData())){
                     log.info("上传成功");
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java
index 2b03e90..ff2b3c9 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 
 /**
  * 模板相关管理
@@ -90,8 +91,9 @@ public class TemplateController {
     @SysLog(value = "模板", businessType = BusinessType.UPLOAD)
     @PostMapping(value = "/upload")
     @RequiresPermissions(value = "ins:template:upload")
-    public AjaxResult uploadTemplate(@RequestParam MultipartFile file){
-        return AjaxResult.success(tbTemplateService.uploadFile(file));
+    public AjaxResult uploadTemplate(@RequestPart(name = "file") MultipartFile file,
+                                     @RequestParam String templateType) throws IOException {
+        return AjaxResult.success(tbTemplateService.uploadFile(file, templateType));
     }
 
 }
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/TbTemplateService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/TbTemplateService.java
index c1e3540..e8a6efd 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/TbTemplateService.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/TbTemplateService.java
@@ -8,6 +8,8 @@ import com.chushang.inspection.project.po.Template;
 import com.chushang.oss.entity.vo.FileSourceVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+
 /**
  * @auther: zhao
  * @date: 2024/7/2 11:04
@@ -27,5 +29,5 @@ public interface TbTemplateService extends IService<Template> {
         );
     }
 
-    FileSourceVo uploadFile(MultipartFile file);
+    FileSourceVo uploadFile(MultipartFile file, String templateType) throws IOException;
 }
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/TemplateServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/TemplateServiceImpl.java
index 7e9d73a..b725157 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/TemplateServiceImpl.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/TemplateServiceImpl.java
@@ -14,7 +14,7 @@ import com.chushang.common.mybatis.utils.WrapperUtils;
 import com.chushang.inspection.project.mapper.TemplateMapper;
 import com.chushang.inspection.project.po.Template;
 import com.chushang.inspection.project.service.TbTemplateService;
-import com.chushang.oss.entity.dto.UploadFileDTO;
+import com.chushang.oss.entity.dto.UploadBytesDTO;
 import com.chushang.oss.entity.vo.FileSourceVo;
 import com.chushang.oss.feign.RemoteOssService;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -72,12 +73,15 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
     }
 
     @Override
-    public FileSourceVo uploadFile(MultipartFile file) {
+    public FileSourceVo uploadFile(MultipartFile file, String templateType) throws IOException {
         // 上传模板信息
         Result<List<FileSourceVo>> listResult =
-                remoteOssService.uploadFile(UploadFileDTO.builder()
-                        .files(new MultipartFile[]{file})
-                        .build(), null, false, null, "template", SecurityConstants.INNER);
+                remoteOssService.uploadBytes(
+                        UploadBytesDTO.builder()
+                                .bytes(file.getBytes())
+                                .build(),
+                        file.getOriginalFilename(),
+                        false, null, templateType, SecurityConstants.INNER);
         if (listResult.isSuccess() && CollectionUtil.isNotEmpty(listResult.getData())){
             FileSourceVo fileSourceVo = listResult.getData().get(0);
             Template template = new Template();
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoPhoneServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoPhoneServiceImpl.java
index 0682dac..cc42c5d 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoPhoneServiceImpl.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoPhoneServiceImpl.java
@@ -331,7 +331,7 @@ public class WrkInfoPhoneServiceImpl extends ServiceImpl<WrkInfoPhoneMapper, Wrk
                 ExcelUtils.exportList(outputStream, WrkInfoPhoneImportDTO.class, errList,"电话工单导入异常");
                 Result<List<FileSourceVo>> ossResult = remoteOssService.uploadBytes(
                         UploadBytesDTO.builder().bytes(outputStream.toByteArray()).build()
-                        , "", null, null, "importFile", SecurityConstants.INNER);
+                        , "", null, null, "phoneWrk", SecurityConstants.INNER);
                 if (ossResult.isSuccess() && CollectionUtil.isNotEmpty(ossResult.getData())){
                     List<FileSourceVo> data = ossResult.getData();
                     FileSourceVo fileSourceVo = data.get(0);
diff --git a/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/FileSourceInfo.java b/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/FileSourceInfo.java
index fbb7ece..975aaf6 100644
--- a/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/FileSourceInfo.java
+++ b/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/FileSourceInfo.java
@@ -1,6 +1,8 @@
 package com.chushang.oss.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.chushang.common.dict.annotation.DictFormat;
+import com.chushang.common.mybatis.annotation.Condition;
 import com.chushang.common.mybatis.base.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -34,6 +36,8 @@ public class FileSourceInfo extends BaseEntity{
      * 查看字典 sys_file_type
      */
     @TableField("file_type")
+    @Condition(name = "file_type")
+    @DictFormat(dictType = "sys_file_type")
     private String fileType;
     /**
      * 文件大小
diff --git a/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/dto/UploadFileDTO.java b/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/dto/UploadFileDTO.java
index 01392f8..0fcba81 100644
--- a/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/dto/UploadFileDTO.java
+++ b/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/dto/UploadFileDTO.java
@@ -4,13 +4,19 @@ import lombok.Builder;
 import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @auther: zhao
  * @date: 2024/6/29 18:09
  */
 @Data
 @Builder
-public class UploadFileDTO {
+public class UploadFileDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     private MultipartFile[] files;
 
diff --git a/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/feign/RemoteOssService.java b/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/feign/RemoteOssService.java
index 1b174a4..ff3358e 100644
--- a/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/feign/RemoteOssService.java
+++ b/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/feign/RemoteOssService.java
@@ -9,6 +9,7 @@ import com.chushang.oss.entity.dto.UploadStreamDTO;
 import com.chushang.oss.entity.vo.FileSourceVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.Set;
@@ -20,7 +21,7 @@ import java.util.Set;
 public interface RemoteOssService {
 
     @PostMapping(value = "/upload")
-    Result<List<FileSourceVo>> uploadFile(@RequestBody UploadFileDTO uploadFile,
+    Result<List<FileSourceVo>> uploadFile(@RequestPart(name = "files") MultipartFile[] files,
                                             @RequestParam(value = "ocrType", required = false) String ocrType,
                                             @RequestParam(value = "sealFlag", required = false, defaultValue= "false") Boolean sealFlag,
                                             @RequestParam(value = "formats", required = false) String formats,
diff --git a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/remote/RemoteFileController.java b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/remote/RemoteFileController.java
index ab151c8..1f9a928 100644
--- a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/remote/RemoteFileController.java
+++ b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/remote/RemoteFileController.java
@@ -33,13 +33,12 @@ public class RemoteFileController implements RemoteOssService {
     @SysLog(value = "feign文件上传", businessType = BusinessType.INSERT)
     @PostMapping(value = "/upload")
     @InnerAuth
-    public Result<List<FileSourceVo>> uploadFile(@RequestBody UploadFileDTO uploadFile,
+    public Result<List<FileSourceVo>> uploadFile(@RequestPart(name = "files") MultipartFile[] files,
                                                    @RequestParam(value = "ocrType", required = false) String ocrType,
                                                    @RequestParam(value = "sealFlag", required = false, defaultValue= "false") Boolean sealFlag,
                                                    @RequestParam(value = "formats", required = false) String formats,
                                                    @RequestHeader(SecurityConstants.FROM_SOURCE)String source,
                                                    @RequestParam(value = "fileType", required = false) String fileType) {
-        MultipartFile[] files = uploadFile.getFiles();
         return Result.ok(fileSourceService.addFile(files, ocrType, sealFlag, formats, fileType));
     }
 
@@ -106,7 +105,8 @@ public class RemoteFileController implements RemoteOssService {
     }
 
     @Override
-    public Result<List<FileSourceVo>> uploadStream(UploadStreamDTO uploadStream, String fileName, Boolean sealFlag, String formats, String fileType, String source)
+    @PostMapping(value = "/upload/stream")
+    public Result<List<FileSourceVo>> uploadStream(@RequestBody UploadStreamDTO uploadStream, String fileName, Boolean sealFlag, String formats, String fileType, String source)
     {
         InputStream is = uploadStream.getIs();
         return Result.ok(fileSourceService.uploadFile(is, fileName, sealFlag, formats, fileType));