From deb977cfae04e5aca02d465cdea4cbc23f22af32 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sat, 31 Aug 2024 17:38:28 +0800
Subject: [PATCH] 1、附件管理模块修改2

---
 dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java
index 1d1ab60..3a2b7ce 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/controller/web/FileInfoWebController.java
@@ -14,6 +14,7 @@
 import cn.huge.module.file.service.FileRelateService;
 import cn.huge.module.file.utils.FileUtils;
 import cn.huge.module.file.utils.FtpUtils;
+import cn.huge.module.sys.constant.FileBaseConsts;
 import cn.huge.module.sys.constant.FileOwnerTypeBaseEnum;
 import cn.huge.module.sys.dto.FileInfoBaseDTO;
 import com.google.common.collect.Maps;
@@ -66,22 +67,25 @@
 
     /**
      * 页面附件上传-文件流方式
-     * @url {ctx}/api/web/fileInfo/upload/{mainId}/{ownerId}/{ownerType}
+     * @url {ctx}/api/web/fileInfo/upload?mainId=&ownerId=&ownerType=
      * @param mainId 所属业务主体编号
      * @param ownerId 所属业务编号
      * @param ownerType 所属业务类型
      * @param request 请求头
      * @return Object
      */
-    @PostMapping("/upload/{ownerId}/{ownerType}")
-    public Object upload(@PathVariable(value = "mainId") String mainId,
-                         @PathVariable(value = "ownerId") String ownerId,
-                         @PathVariable(value = "ownerType") String ownerType,
+    @PostMapping("/upload")
+    public Object upload(@RequestParam(value = "mainId") String mainId,
+                         @RequestParam(value = "ownerId") String ownerId,
+                         @RequestParam(value = "ownerType") String ownerType,
                          @CurrentUser String userId, MultipartHttpServletRequest request) {
         try{
             CtUserDTO loginUser = custClient.clientGetUser(userId);
             UploaderDTO uploaderDTO = new UploaderDTO();
-            BeanUtils.copyProperties(loginUser, uploaderDTO);
+            uploaderDTO.setUploaderId(loginUser.getId());
+            uploaderDTO.setUploaderName(loginUser.getTrueName());
+            uploaderDTO.setUploaderType(FileBaseConsts.UPLOADER_TYPE_1);
+            uploaderDTO.setCustId(loginUser.getCustId());
             List<FileInfoBaseDTO> files = new ArrayList<>();
             Iterator<String> itr = request.getFileNames();
             int fileCount = fileRelateService.countByOwnerIdAndType(ownerId, ownerType)+1;

--
Gitblit v1.8.0