From 0135e727a07e8834e7f2a4ee72b3edf73718cf78 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Fri, 24 Jun 2022 14:50:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/file/service/v2/IFileV2Service.java   | 16 ++++++++++++++++
 .../file/service/v2/impl/FileV2ServiceImpl.java  | 15 +++++++++++++++
 .../service/design/impl/FormServiceImpl.java     |  2 +-
 .../menu/service/impl/MenuServiceImpl.java       |  3 ---
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/module-file/src/main/java/ink/wgink/module/file/service/v2/IFileV2Service.java b/module-file/src/main/java/ink/wgink/module/file/service/v2/IFileV2Service.java
index f1a2d17a..e4700f25 100644
--- a/module-file/src/main/java/ink/wgink/module/file/service/v2/IFileV2Service.java
+++ b/module-file/src/main/java/ink/wgink/module/file/service/v2/IFileV2Service.java
@@ -2,6 +2,7 @@ package ink.wgink.module.file.service.v2;
 
 import ink.wgink.module.file.enums.UploadTypeEnum;
 import ink.wgink.module.file.pojo.dtos.FileUploadSuccessDTO;
+import ink.wgink.pojo.pos.FilePO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Map;
@@ -47,4 +48,19 @@ public interface IFileV2Service {
      */
     FileUploadSuccessDTO uploadSingleByUserId(String userId, MultipartFile uploadFile, UploadTypeEnum uploadTypeEnum, Map<String, Object> requestParams);
 
+    /**
+     * 获取文件
+     *
+     * @param params
+     * @return
+     */
+    FilePO getPO(Map<String, Object> params);
+
+    /**
+     * 获取文件
+     *
+     * @param fileId
+     * @return
+     */
+    FilePO getPO(String fileId);
 }
diff --git a/module-file/src/main/java/ink/wgink/module/file/service/v2/impl/FileV2ServiceImpl.java b/module-file/src/main/java/ink/wgink/module/file/service/v2/impl/FileV2ServiceImpl.java
index e0647a62..e234047d 100644
--- a/module-file/src/main/java/ink/wgink/module/file/service/v2/impl/FileV2ServiceImpl.java
+++ b/module-file/src/main/java/ink/wgink/module/file/service/v2/impl/FileV2ServiceImpl.java
@@ -1,10 +1,12 @@
 package ink.wgink.module.file.service.v2.impl;
 
 import ink.wgink.common.base.DefaultBaseService;
+import ink.wgink.module.file.dao.IFileDao;
 import ink.wgink.module.file.enums.UploadTypeEnum;
 import ink.wgink.module.file.pojo.dtos.FileUploadSuccessDTO;
 import ink.wgink.module.file.service.IFileService;
 import ink.wgink.module.file.service.v2.IFileV2Service;
+import ink.wgink.pojo.pos.FilePO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -23,6 +25,8 @@ public class FileV2ServiceImpl extends DefaultBaseService implements IFileV2Serv
 
     @Autowired
     private IFileService fileService;
+    @Autowired
+    private IFileDao fileDao;
 
     @Override
     public FileUploadSuccessDTO uploadSingle(MultipartFile uploadFile, UploadTypeEnum uploadTypeEnum, Map<String, Object> requestParams) {
@@ -54,5 +58,16 @@ public class FileV2ServiceImpl extends DefaultBaseService implements IFileV2Serv
         return fileUploadSuccessDTO;
     }
 
+    @Override
+    public FilePO getPO(Map<String, Object> params) {
+        return fileDao.getPO(params);
+    }
+
+    @Override
+    public FilePO getPO(String fileId) {
+        Map<String, Object> params = getHashMap(2);
+        params.put("fileId", fileId);
+        return getPO(params);
+    }
 
 }
diff --git a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java
index f8456452..191f30ea 100644
--- a/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java
+++ b/module-form/src/main/java/ink/wgink/module/form/service/design/impl/FormServiceImpl.java
@@ -242,7 +242,7 @@ public class FormServiceImpl extends DefaultBaseService implements IFormService
         saveMenuBO.setMenuParentId(menuParentId);
         saveMenuBO.setMenuName(formPO.getFormName());
         saveMenuBO.setMenuUrl(menuUrl);
-        saveMenuBO.setMenuStatus("0");
+        saveMenuBO.setMenuStatus(0);
         saveMenuBO.setMenuOrder("9999");
         menuBaseService.saveAndReturnId(saveMenuBO);
     }
diff --git a/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java b/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java
index 58477415..8a04ec84 100644
--- a/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java
+++ b/service-menu/src/main/java/ink/wgink/module/menu/service/impl/MenuServiceImpl.java
@@ -160,9 +160,6 @@ public class MenuServiceImpl extends DefaultBaseService implements IMenuService
     public String saveAndReturnId(SaveMenuBO saveMenuBO) {
         MenuVO menuVO = new MenuVO();
         BeanUtils.copyProperties(saveMenuBO, menuVO);
-        menuVO.setMenuType(1);
-        menuVO.setMenuIcon("fa fa-list");
-        menuVO.setOpenType(1);
         return saveAndReturnId(menuVO);
     }