From 44eac7915a1d7ef7d49dbada0d5bd7581f70d291 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Fri, 23 Oct 2020 16:35:17 +0800
Subject: [PATCH 01/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/VfileMenuController.java  | 20 +++++++++++++++++--
 .../java/com/cetc32/dh/entity/VfileMenu.java  | 11 ++++++++++
 .../cetc32/dh/mybatis/VfileMenuMapper.java    |  2 ++
 .../dh/service/impl/VfileMenuServiceImpl.java |  5 +++++
 src/main/resources/mapper/VfileMenuMapper.xml |  1 +
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 21743d7..c7c1567 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -21,6 +21,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -213,8 +214,15 @@ public class VfileMenuController {
         for(int i=0;i<vfileMenuList.size();i++){
             yearList.add(vfileMenuList.get(i).getFileYear());
         }
+        Collections.sort(yearList);
+        Collections.reverse(yearList);
+        List<String> resultList =new ArrayList<String>();
+        resultList.add("全部年份");
+        for(int i=0;i<yearList.size();i++){
+            resultList.add(yearList.get(i).toString());
+        }
 
-        return ResponseResult.success(yearList);
+        return ResponseResult.success(resultList);
     }
 
     /**查询数据库中所有的不同区域
@@ -225,10 +233,18 @@ public class VfileMenuController {
     public ResponseResult distinctAllRegion(){
         List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllRegion();
         List<String> regionList = new ArrayList<String>();
+
         for(int i=0;i<vfileMenuList.size();i++){
             regionList.add(vfileMenuList.get(i).getRegion());
         }
+        Collections.sort(regionList);
+
+        List<String> resultList =new ArrayList<String>();
+        resultList.add("全部区域");
+        for(int i=0;i<regionList.size();i++){
+            resultList.add(regionList.get(i));
+        }
 
-        return ResponseResult.success(regionList);
+        return ResponseResult.success(resultList);
     }
 }
diff --git a/src/main/java/com/cetc32/dh/entity/VfileMenu.java b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
index 21256ef..1423eba 100644
--- a/src/main/java/com/cetc32/dh/entity/VfileMenu.java
+++ b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
@@ -261,6 +261,17 @@ public class VfileMenu extends NumberS{
     public void setFileYear(Integer fileYear) {
         this.fileYear = fileYear;
     }
+    /**
+     * @param fileYear
+     */
+    public void setFileYear(String f) {
+        try {
+            fileYear=Integer.valueOf(f);
+        }catch (Exception e){
+            fileYear=null;
+        }
+
+    }
 
     /**
      * @return numberId
diff --git a/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java b/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
index b58e079..e23b37b 100644
--- a/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
@@ -44,4 +44,6 @@ public interface VfileMenuMapper extends Mapper<VfileMenu> {
 
     public List<VfileMenu> distinctAllRegion();
 
+    public List<VfileMenu> distinctAllFileType();
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
index 9a71fd4..a1bd3c4 100644
--- a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
@@ -91,6 +91,9 @@ public class VfileMenuServiceImpl implements VfileMenuService {
      */
     @Override
     public List<VfileMenu> queryFilesByObj(Integer offset, Integer limit, VfileMenu vfileMenu){
+        if(vfileMenu.getRegion().equals("全部区域")){
+            vfileMenu.setRegion(null);
+        }
         return  vfileMenuMapper.queryFilesByObj(offset,limit,vfileMenu);
     }
 
@@ -118,4 +121,6 @@ public class VfileMenuServiceImpl implements VfileMenuService {
     public List<VfileMenu> distinctAllRegion(){
         return vfileMenuMapper.distinctAllRegion();
     }
+
+
 }
diff --git a/src/main/resources/mapper/VfileMenuMapper.xml b/src/main/resources/mapper/VfileMenuMapper.xml
index d7e2f25..64a54eb 100644
--- a/src/main/resources/mapper/VfileMenuMapper.xml
+++ b/src/main/resources/mapper/VfileMenuMapper.xml
@@ -118,4 +118,5 @@
 
 
 
+
 </mapper>
\ No newline at end of file
-- 
Gitee


From ebe359401203782afd57d5edd6be459f8b901af4 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Tue, 27 Oct 2020 16:34:37 +0800
Subject: [PATCH 02/26] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=96=E5=86=99=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java | 81 ++++++++++++++-----
 .../controller/rest/VfileMenuController.java  | 33 +++++++-
 .../java/com/cetc32/dh/entity/DataSubmit.java | 24 ++++++
 .../cetc32/dh/mybatis/VfileMenuMapper.java    |  2 +-
 .../cetc32/dh/service/DataSubmitService.java  |  1 -
 .../com/cetc32/dh/service/OptionsService.java |  9 +++
 .../cetc32/dh/service/impl/OptionsImpl.java   | 20 +++++
 .../dh/service/impl/VfileMenuServiceImpl.java |  3 +
 .../java/com/cetc32/dh/utils/FileUtil.java    | 57 ++++++++++++-
 src/main/resources/application-xwy.yml        |  5 +-
 src/main/resources/generator.xml              |  2 +-
 11 files changed, 205 insertions(+), 32 deletions(-)
 create mode 100644 src/main/java/com/cetc32/dh/service/OptionsService.java
 create mode 100644 src/main/java/com/cetc32/dh/service/impl/OptionsImpl.java

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index 4331a34..f54ffaa 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -16,37 +16,44 @@ import com.cetc32.dh.service.DataSubmitService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-@Component
+
 import java.util.ArrayList;
 import java.util.List;
 
+
 @RestController
 @RequestMapping("/rest/import/")
 public class FileSubmitController {
-    DataSubmitService dataSubmitService;
 
     @Autowired
-    public void setDataSubmitService(DataSubmitService dataSubmitService) {
-        this.dataSubmitService = dataSubmitService;
-    }
+    DataSubmitService dataSubmitService;
 
-    @Value("${upload-path}")
-    public String uploadPath;
+    public String uploadPath="/root/upLoad/";
 
-    @RequestMapping(value = "/uploadFolder", method = RequestMethod.POST)
-    public String uploadFolder(MultipartFile[] folder) {
-        System.out.println(uploadPath);
-        FileUtil.saveMultiFile(uploadPath, folder);
-        return "ok";
-    }
+//    /**
+//     * 批量文件夹上传服务器
+//     * @param folder  批量文件
+//     * @param dataSubmit  数据信息
+//     * @return ResponseResult   网页返回结果
+//     * **/
+//    @ApiOperation(value="批量文件上传")
+//    @PostMapping("/uploadFolder")
+//    public ResponseResult  uploadFolder(MultipartFile[] folder,DataSubmit dataSubmit) {
+//        dataSubmit=new DataSubmit(1,2,2,2,"SDF","DSF",3,"FG","DDD","DF",2011);
+//        System.out.println(uploadPath);
+//        System.out.println(folder.length);
+//        FileUtil.saveMultiFile(uploadPath, folder);
+//        dataSubmit.setSubtype(1);
+//        dataSubmit.setStatus(1);
+//        int count = dataSubmitService.insertDataSubmit(dataSubmit);
+//        if(0<=count){
+//            return ResponseResult.success("数据提交成功！");
+//        }
+//        return ResponseResult.error("数据提交失败！");
+//    }
 
     /**
      * 查询当前用户提交的所有导入请求
@@ -107,6 +114,7 @@ public class FileSubmitController {
             return ResponseResult.success();
         return ResponseResult.error();
     }
+
     /**
      * @param page 页码
      * @param results 每页显示条数
@@ -132,9 +140,10 @@ public class FileSubmitController {
     @ApiOperation(value="提交数据")
     @PostMapping("/sub")
     public ResponseResult DataSub(DataSubmit dataSubmit){
-
+//        dataSubmit =new DataSubmit(3,null,1,2,"fdg","sw",4,null,null,"c://file",2017);
+        dataSubmit.setSubtype(2);
+        dataSubmit.setStatus(1);
         int count = dataSubmitService.insertDataSubmit(dataSubmit);
-
         if(0<=count){
             return ResponseResult.success("数据提交成功！");
         }
@@ -142,4 +151,34 @@ public class FileSubmitController {
 
     }
 
+
+    @ApiOperation(value="文件上传")
+    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
+    public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") MultipartFile file) {
+        String filepath = uploadPath;
+        String result = FileUtil.uploadFile(file,filepath);
+        if(result.equals("文件数据提交成功！"))
+            return ResponseResult.success(result);
+        return ResponseResult.error(result);
+
+    }
+
+
+//    /**
+//     * 获取当前系统路径
+//     */
+//    private String getUploadPath() {
+//        File path = null;
+//        try {
+//            path = new File(ResourceUtils.getURL("classpath:").getPath());
+//        } catch (FileNotFoundException e) {
+//            e.printStackTrace();
+//        }
+//        if (!path.exists()) path = new File("");
+//        File upload = new File(path.getAbsolutePath(), "static/upload/");
+//        if (!upload.exists()) upload.mkdirs();
+//        return upload.getAbsolutePath();
+//    }
+
+
 }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index c7c1567..774b292 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -11,19 +11,18 @@ package com.cetc32.dh.controller.rest;
 import com.cetc32.dh.common.response.PageDataResult;
 import com.cetc32.dh.common.response.ResponseResult;
 import com.cetc32.dh.entity.VfileMenu;
+import com.cetc32.dh.entity.Options;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.cetc32.dh.service.VfileMenuService;
+import com.cetc32.dh.service.OptionsService;
 import springfox.documentation.annotations.ApiIgnore;
 
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 数据管理文件目录视图类
@@ -40,6 +39,8 @@ public class VfileMenuController {
 
     @Autowired
     public VfileMenuService vfileMenuService;
+    @Autowired
+    public OptionsService optionsService;
 
     /**
      * 根据目录节点id和文件安全性查询文件
@@ -247,4 +248,28 @@ public class VfileMenuController {
 
         return ResponseResult.success(resultList);
     }
+
+    /**查询数据库中所有的不同文件类型
+     * @return List<String>
+     */
+    @ApiOperation(value="查询文件类型",notes="不需要传参数")
+    @PostMapping("/AllFtype")
+    public ResponseResult optFType(){
+
+        List<Options> optionsList = optionsService.selectByCategory("file_type");
+        List<Map> hashMapList=new ArrayList<>();
+        Map<String,String> hashmap = new HashMap<>();
+        hashmap.put("value","全部类型");
+        hashmap.put("label","全部类型");
+        hashMapList.add(hashmap);
+        for(int i=0;i<optionsList.size();i++){
+            Map<String,String> hashmap2 = new HashMap<>();
+            hashmap2.put("value",optionsList.get(i).getValue());
+            hashmap2.put("label",optionsList.get(i).getValueName());
+            hashMapList.add(hashmap2);
+        }
+        return ResponseResult.success(hashMapList);
+    }
+
+
 }
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 52ecf8f..9bcc369 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -21,6 +21,29 @@ import javax.persistence.Table;
 @Table(name="data_submit")
 public class DataSubmit extends NumberS{
 
+    /**
+     * 无参构造函数
+     * */
+    public DataSubmit(){}
+
+    /**
+     * 有参构造函数
+     * */
+    public DataSubmit(Integer id,Integer subtype,Integer plevel,Integer status,String submitor,
+                      String approver, Integer menuId,String title,String area,String path,Integer year){
+        this.id=id;
+        this.subtype=subtype;
+        this.plevel=plevel;
+        this.status=status;
+        this.submitor=submitor;
+        this.approver=approver;
+        this.menuId=menuId;
+        this.title=title;
+        this.area=area;
+        this.path=path;
+        this.year=year;
+    }
+
     /**
      * id
      * */
@@ -29,6 +52,7 @@ public class DataSubmit extends NumberS{
 
     /**
      * 数据上报类型
+     * 状态：1表示一按文件数组形式提交，2一按路径提交
      * **/
     @Column(name = "subtype")
     Integer subtype;
diff --git a/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java b/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
index e23b37b..4d45449 100644
--- a/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
@@ -44,6 +44,6 @@ public interface VfileMenuMapper extends Mapper<VfileMenu> {
 
     public List<VfileMenu> distinctAllRegion();
 
-    public List<VfileMenu> distinctAllFileType();
+
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/service/DataSubmitService.java b/src/main/java/com/cetc32/dh/service/DataSubmitService.java
index 4e1ce5f..648b97a 100644
--- a/src/main/java/com/cetc32/dh/service/DataSubmitService.java
+++ b/src/main/java/com/cetc32/dh/service/DataSubmitService.java
@@ -10,7 +10,6 @@
 package com.cetc32.dh.service;
 
 import com.cetc32.dh.entity.DataSubmit;
-
 import java.util.List;
 
 public interface DataSubmitService {
diff --git a/src/main/java/com/cetc32/dh/service/OptionsService.java b/src/main/java/com/cetc32/dh/service/OptionsService.java
new file mode 100644
index 0000000..6af6448
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/service/OptionsService.java
@@ -0,0 +1,9 @@
+package com.cetc32.dh.service;
+
+import java.util.List;
+import com.cetc32.dh.entity.Options;
+
+public interface OptionsService {
+
+    public List<Options> selectByCategory(String category);
+}
diff --git a/src/main/java/com/cetc32/dh/service/impl/OptionsImpl.java b/src/main/java/com/cetc32/dh/service/impl/OptionsImpl.java
new file mode 100644
index 0000000..8105b64
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/service/impl/OptionsImpl.java
@@ -0,0 +1,20 @@
+package com.cetc32.dh.service.impl;
+
+import com.cetc32.dh.service.OptionsService;
+import com.cetc32.dh.entity.Options;
+import com.cetc32.dh.mybatis.OptionsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class OptionsImpl  implements OptionsService {
+
+    @Autowired
+    public OptionsMapper optionsMapper;
+
+    public List<Options> selectByCategory(String category){
+        return optionsMapper.selectByCategory(category);
+    }
+}
diff --git a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
index a1bd3c4..bf6e6e7 100644
--- a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
@@ -94,6 +94,9 @@ public class VfileMenuServiceImpl implements VfileMenuService {
         if(vfileMenu.getRegion().equals("全部区域")){
             vfileMenu.setRegion(null);
         }
+        if(vfileMenu.getFileType().equals("全部类型")){
+            vfileMenu.setFileType(null);
+        }
         return  vfileMenuMapper.queryFilesByObj(offset,limit,vfileMenu);
     }
 
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index 57a0a29..d85e123 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -1,9 +1,16 @@
 package com.cetc32.dh.utils;
 
+import com.cetc32.dh.common.response.ResponseResult;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class FileUtil {
 
@@ -13,7 +20,13 @@ public class FileUtil {
      * @param files
      */
     public static void saveMultiFile(String basePath, MultipartFile[] files) {
+
         if (files == null || files.length == 0) {
+            if(files==null){
+                System.out.println("files为空！！");
+                return;
+            }
+            System.out.println("files长度为0");
             return;
         }
         if (basePath.endsWith("/")) {
@@ -32,6 +45,7 @@ public class FileUtil {
         }
     }
 
+
     /**
      * 确保目录存在，不存在则创建
      * @param filePath
@@ -45,4 +59,41 @@ public class FileUtil {
             }
         }
     }
-}
\ No newline at end of file
+
+    public static String uploadFile(MultipartFile file, String filepath) {
+        String fileName = file.getOriginalFilename();//获取文件名
+        makeDir(filepath);
+        if (!file.isEmpty()) {
+            try (BufferedOutputStream out = new BufferedOutputStream(
+                    new FileOutputStream(new File(filepath + File.separator + fileName)))) {
+                out.write(file.getBytes());
+                out.flush();
+                return "文件数据提交成功！";
+            } catch (FileNotFoundException e) {
+                return "文件数据提交失败！"+e.getMessage();
+            } catch (IOException e) {
+                return "文件数据提交失败！"+e.getMessage();
+            }
+        } else {
+            return "文件数据提交失败！" + "文件为空！";
+        }
+
+    }
+
+
+    /**
+     * 文件名后缀前添加一个时间戳
+     */
+    private static String getFileName(String fileName) {
+        int index = fileName.lastIndexOf(".");
+        final SimpleDateFormat sDateFormate = new SimpleDateFormat("yyyymmddHHmmss");  //设置时间格式
+        String nowTimeStr = sDateFormate.format(new Date()); // 当前时间
+        fileName = fileName.substring(0, index) + "_" + nowTimeStr + fileName.substring(index);
+        return fileName;
+    }
+
+
+
+
+}
+
diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml
index f3a65e9..b44ad20 100644
--- a/src/main/resources/application-xwy.yml
+++ b/src/main/resources/application-xwy.yml
@@ -48,6 +48,8 @@ mybatis:
 #设置静态资源路径，多个以逗号分隔
 spring.resources.static-locations: classpath:static/,file:static/
 
+upload-path: //home//dhUpload//
+
 generator:
   targetProject: src/main/java
   mappers: tk.mybatis.mapper.common.Mapper
@@ -56,4 +58,5 @@ generator:
   javaClient-targetPackage: com.cetc32.dh.mybatis
 logging:
   level:
-    com.cetc32.dh.mybatis: debug
\ No newline at end of file
+    com.cetc32.dh.mybatis: debug
+
diff --git a/src/main/resources/generator.xml b/src/main/resources/generator.xml
index 11876e3..7266739 100644
--- a/src/main/resources/generator.xml
+++ b/src/main/resources/generator.xml
@@ -54,7 +54,7 @@
                              type="XMLMAPPER"/>
 
         <!-- table可以有多个,每个数据库中的表都可以写一个table，tableName表示要匹配的数据库表,也可以在tableName属性中通过使用%通配符来匹配所有数据库表,只有匹配的表才会自动生成文件 -->
-        <table tableName="vfile_menu"></table>
+        <table tableName="options"></table>
 
     </context>
 </generatorConfiguration>
\ No newline at end of file
-- 
Gitee


From 220a79e9c7479d636d9f084d56fe104d7cf97349 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Tue, 27 Oct 2020 16:35:34 +0800
Subject: [PATCH 03/26] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=96=E5=86=99=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cetc32/dh/entity/Options.java    | 71 +++++++++++++++++++
 .../com/cetc32/dh/mybatis/OptionsMapper.java  | 14 ++++
 src/main/resources/mapper/OptionsMapper.xml   | 19 +++++
 3 files changed, 104 insertions(+)
 create mode 100644 src/main/java/com/cetc32/dh/entity/Options.java
 create mode 100644 src/main/java/com/cetc32/dh/mybatis/OptionsMapper.java
 create mode 100644 src/main/resources/mapper/OptionsMapper.xml

diff --git a/src/main/java/com/cetc32/dh/entity/Options.java b/src/main/java/com/cetc32/dh/entity/Options.java
new file mode 100644
index 0000000..d74d923
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/entity/Options.java
@@ -0,0 +1,71 @@
+package com.cetc32.dh.entity;
+
+import javax.persistence.*;
+
+public class Options {
+    @Id
+    private Integer id;
+
+    @Column(name = "value_name")
+    private String valueName;
+
+    private String value;
+
+    private String category;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * @return value_name
+     */
+    public String getValueName() {
+        return valueName;
+    }
+
+    /**
+     * @param valueName
+     */
+    public void setValueName(String valueName) {
+        this.valueName = valueName == null ? null : valueName.trim();
+    }
+
+    /**
+     * @return value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * @param value
+     */
+    public void setValue(String value) {
+        this.value = value == null ? null : value.trim();
+    }
+
+    /**
+     * @return category
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    /**
+     * @param category
+     */
+    public void setCategory(String category) {
+        this.category = category == null ? null : category.trim();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/mybatis/OptionsMapper.java b/src/main/java/com/cetc32/dh/mybatis/OptionsMapper.java
new file mode 100644
index 0000000..3f7457b
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/mybatis/OptionsMapper.java
@@ -0,0 +1,14 @@
+package com.cetc32.dh.mybatis;
+
+import com.cetc32.dh.entity.FileToMenu;
+import com.cetc32.dh.entity.Options;
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.common.Mapper;
+import java.util.List;
+
+@Repository
+public interface OptionsMapper extends Mapper<Options> {
+
+    public List<Options> selectByCategory(String category);
+
+}
\ No newline at end of file
diff --git a/src/main/resources/mapper/OptionsMapper.xml b/src/main/resources/mapper/OptionsMapper.xml
new file mode 100644
index 0000000..83f1911
--- /dev/null
+++ b/src/main/resources/mapper/OptionsMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cetc32.dh.mybatis.OptionsMapper">
+  <resultMap id="BaseResultMap" type="com.cetc32.dh.entity.Options">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="value_name" jdbcType="VARCHAR" property="valueName" />
+    <result column="value" jdbcType="VARCHAR" property="value" />
+    <result column="category" jdbcType="VARCHAR" property="category" />
+  </resultMap>
+
+  <select id="selectByCategory" resultType="com.cetc32.dh.entity.Options" >
+        select * from options
+        where  category= #{category,jdbcType=VARCHAR}
+    </select>
+
+</mapper>
\ No newline at end of file
-- 
Gitee


From 0a32bbef8ffbe8280dfc36f813ab94d4c4794ef8 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Thu, 29 Oct 2020 16:40:14 +0800
Subject: [PATCH 04/26] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3=20=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dh/common/response/PageDataResult.java    |   3 +-
 .../controller/rest/DataMenuController.java   |  26 ++
 .../controller/rest/FileSubmitController.java |  37 ++-
 .../controller/rest/VfileMenuController.java  |  12 +-
 .../system/PermissionController.java          |   2 +-
 .../dh/controller/system/RoleController.java  |   2 +-
 .../dh/controller/system/UserController.java  |  10 +-
 .../java/com/cetc32/dh/entity/DataSubmit.java | 233 +++++++++---------
 .../com/cetc32/dh/mybatis/DataMenuMapper.java |   2 +
 .../cetc32/dh/service/DataMenuService.java    |   2 +
 .../cetc32/dh/service/DataSubmitService.java  |   4 +-
 .../impl/AdminPermissionServiceImpl.java      |   2 +-
 .../dh/service/impl/AdminUserServiceImpl.java |   4 +-
 .../dh/service/impl/DataMenuServiceImpl.java  |   4 +
 .../java/com/cetc32/dh/utils/FileUtil.java    |  16 +-
 src/main/resources/application-dev.yml        |   5 +-
 src/main/resources/application-xwy.yml        |   7 +-
 src/main/resources/application.yml            |   2 +-
 src/main/resources/generator.xml              |   2 +-
 src/main/resources/mapper/DataMenuMapper.xml  |   4 +
 .../resources/mapper/DataSubmitMapper.xml     | 157 ------------
 21 files changed, 217 insertions(+), 319 deletions(-)
 delete mode 100644 src/main/resources/mapper/DataSubmitMapper.xml

diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
index b8477b3..950101d 100644
--- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
+++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
@@ -10,6 +10,7 @@
 
 package com.cetc32.dh.common.response;
 
+import com.cetc32.dh.entity.DataSubmit;
 import com.cetc32.dh.entity.NumberS;
 
 import java.util.List;
@@ -29,7 +30,7 @@ public class PageDataResult {
 
     private List<? extends NumberS> list;
 
-    public PageDataResult(){};
+    public PageDataResult(Integer count, List<DataSubmit> list, int offset){};
     public PageDataResult(int totals,List<? extends NumberS> list){
         this.totals=totals;
         this.list=list;
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
index 3f9692c..fd3bca0 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
@@ -13,13 +13,22 @@ import com.cetc32.dh.entity.DataFile;
 import com.cetc32.dh.entity.DataMenu;
 import com.cetc32.dh.service.DataMenuService;
 import com.cetc32.dh.dto.DataMenuDTO;
+import com.cetc32.dh.utils.FileUtil;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据管理目录类
@@ -180,6 +189,23 @@ public class DataMenuController {
             return ResponseResult.success(dataMenuDTO);
     }
 
+    /**
+     * (目录名称)编目名称和编目id
+     * @return 返回编目名称和编目id
+     * */
+    @ApiOperation(value="查询编目名称和对应的id")
+    @RequestMapping(value = "/menuidname", method = RequestMethod.POST)
+    public ResponseResult menuIdName() {
+        List<DataMenu> dataMenuList = dataMenuService.selectAll();
+        List<Map> hashMapList=new ArrayList<>();
+        for(int i=0;i<dataMenuList.size();i++){
+            Map<String,String> hashmap = new HashMap<>();
+            hashmap.put("value",dataMenuList.get(i).getId().toString());
+            hashmap.put("label",dataMenuList.get(i).getMenuName());
+            hashMapList.add(hashmap);
+        }
+        return ResponseResult.success(hashMapList);
+    }
 }
 
 
diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index f54ffaa..acae6e5 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -16,6 +16,7 @@ import com.cetc32.dh.service.DataSubmitService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -31,7 +32,8 @@ public class FileSubmitController {
     @Autowired
     DataSubmitService dataSubmitService;
 
-    public String uploadPath="/root/upLoad/";
+    @Value("${upLoadPath}")
+    String upLoadPath;
 
 //    /**
 //     * 批量文件夹上传服务器
@@ -68,6 +70,7 @@ public class FileSubmitController {
         Integer count =0;
         list= dataSubmitService.selectMySubmit(ds);
         count= dataSubmitService.countMineSubmit(ds);
+//        return new PageDataResult(count,list, (page - 1) * results);
         return new PageDataResult(count,list);
     }
 
@@ -84,6 +87,7 @@ public class FileSubmitController {
         Integer count =0;
         list= dataSubmitService.selectMyApprove(ds);
         count= dataSubmitService.countMineApprov(ds);
+//        return new PageDataResult(count,list, (page - 1) * results);
         return new PageDataResult(count,list);
     }
 
@@ -134,16 +138,17 @@ public class FileSubmitController {
 
     /**
      * 提交数据
-     * @param dataSubmit 数据信息
+//     * @param dataSubmit 数据信息
      * @return 返回提交结果
      * */
     @ApiOperation(value="提交数据")
     @PostMapping("/sub")
-    public ResponseResult DataSub(DataSubmit dataSubmit){
-//        dataSubmit =new DataSubmit(3,null,1,2,"fdg","sw",4,null,null,"c://file",2017);
+    public ResponseResult DataSub(){
+        DataSubmit dataSubmit =new DataSubmit(null,null,1,2,"fdg","sw",4,null,null,"c://file",2017);
         dataSubmit.setSubtype(2);
         dataSubmit.setStatus(1);
         int count = dataSubmitService.insertDataSubmit(dataSubmit);
+        System.out.println(count);
         if(0<=count){
             return ResponseResult.success("数据提交成功！");
         }
@@ -152,10 +157,16 @@ public class FileSubmitController {
     }
 
 
+    /**
+     * 目录/文件上传
+     * @param file 目录，文件
+     * @return 返回提交结果
+     * */
     @ApiOperation(value="文件上传")
     @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
     public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") MultipartFile file) {
-        String filepath = uploadPath;
+//        String filepath = "/root/upLoad";
+        String filepath = upLoadPath;
         String result = FileUtil.uploadFile(file,filepath);
         if(result.equals("文件数据提交成功！"))
             return ResponseResult.success(result);
@@ -164,21 +175,5 @@ public class FileSubmitController {
     }
 
 
-//    /**
-//     * 获取当前系统路径
-//     */
-//    private String getUploadPath() {
-//        File path = null;
-//        try {
-//            path = new File(ResourceUtils.getURL("classpath:").getPath());
-//        } catch (FileNotFoundException e) {
-//            e.printStackTrace();
-//        }
-//        if (!path.exists()) path = new File("");
-//        File upload = new File(path.getAbsolutePath(), "static/upload/");
-//        if (!upload.exists()) upload.mkdirs();
-//        return upload.getAbsolutePath();
-//    }
-
 
 }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 774b292..b10f2c6 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -19,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.cetc32.dh.service.VfileMenuService;
 import com.cetc32.dh.service.OptionsService;
-import springfox.documentation.annotations.ApiIgnore;
 
 
 import java.util.*;
@@ -52,7 +51,7 @@ public class VfileMenuController {
      */
     @PostMapping("/queryByFileSecurityAndMenuId")
     public PageDataResult queryByFileSecurityAndMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, String fileSecurity){
-        PageDataResult pdr = new PageDataResult();
+        PageDataResult pdr = new PageDataResult(count, list);
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
         }
@@ -75,7 +74,7 @@ public class VfileMenuController {
      */
     @PostMapping("/queryFilesByMenuId")
     public PageDataResult queryFilesByMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId){
-        PageDataResult pdr = new PageDataResult();
+        PageDataResult pdr = new PageDataResult(count, list);
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
         }
@@ -100,7 +99,7 @@ public class VfileMenuController {
      */
     @PostMapping("/queryFilesByTime")
     public PageDataResult queryFilesByTime(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, Date time){
-        PageDataResult pdr = new PageDataResult();
+        PageDataResult pdr = new PageDataResult(count, list);
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
         }
@@ -125,7 +124,7 @@ public class VfileMenuController {
      */
     @PostMapping("/queryFilesByRegion")
     public PageDataResult queryFilesByRegion(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, String region){
-        PageDataResult pdr = new PageDataResult();
+        PageDataResult pdr = new PageDataResult(count, list);
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
         }
@@ -153,7 +152,7 @@ public class VfileMenuController {
      */
     @PostMapping("/queryFilesByChoose")
     public PageDataResult queryFilesByChoose(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,String fileName, Integer fileYear,String region,String fileType,String fileSecurity){
-        PageDataResult pdr = new PageDataResult();
+        PageDataResult pdr = new PageDataResult(count, list);
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
         }
@@ -255,7 +254,6 @@ public class VfileMenuController {
     @ApiOperation(value="查询文件类型",notes="不需要传参数")
     @PostMapping("/AllFtype")
     public ResponseResult optFType(){
-
         List<Options> optionsList = optionsService.selectByCategory("file_type");
         List<Map> hashMapList=new ArrayList<>();
         Map<String,String> hashmap = new HashMap<>();
diff --git a/src/main/java/com/cetc32/dh/controller/system/PermissionController.java b/src/main/java/com/cetc32/dh/controller/system/PermissionController.java
index ed869ae..267bc95 100644
--- a/src/main/java/com/cetc32/dh/controller/system/PermissionController.java
+++ b/src/main/java/com/cetc32/dh/controller/system/PermissionController.java
@@ -65,7 +65,7 @@ public class PermissionController {
     public PageDataResult permissionList(@RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize){
         logger.info("获取权限菜单列表");
-        PageDataResult pdr = new PageDataResult();
+        PageDataResult pdr = new PageDataResult(count, list);
         try {
             if(null == pageNum) {
                 pageNum = 1;
diff --git a/src/main/java/com/cetc32/dh/controller/system/RoleController.java b/src/main/java/com/cetc32/dh/controller/system/RoleController.java
index bad228f..8276cd6 100644
--- a/src/main/java/com/cetc32/dh/controller/system/RoleController.java
+++ b/src/main/java/com/cetc32/dh/controller/system/RoleController.java
@@ -59,7 +59,7 @@ public class RoleController {
     public PageDataResult getRoleList(@RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize) {
         logger.info("获取角色列表");
-        PageDataResult pdr = new PageDataResult();
+        PageDataResult pdr = new PageDataResult(count, list);
         try {
             if(null == pageNum) {
                 pageNum = 1;
diff --git a/src/main/java/com/cetc32/dh/controller/system/UserController.java b/src/main/java/com/cetc32/dh/controller/system/UserController.java
index 11204e7..90c1bd0 100644
--- a/src/main/java/com/cetc32/dh/controller/system/UserController.java
+++ b/src/main/java/com/cetc32/dh/controller/system/UserController.java
@@ -14,22 +14,18 @@ import com.cetc32.dh.dto.LoginDTO;
 import com.cetc32.dh.dto.UserSearchDTO;
 import com.cetc32.dh.entity.BaseAdminUser;
 import com.cetc32.dh.service.AdminUserService;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.DisabledAccountException;
 import org.apache.shiro.authc.UnknownAccountException;
 import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.subject.Subject;
-import org.apache.shiro.web.servlet.ShiroHttpServletRequest;
-import org.apache.shiro.web.util.WebUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import javax.management.ValueExp;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.HashMap;
@@ -177,7 +173,7 @@ public class UserController {
                                       @RequestParam("pageSize") Integer pageSize,/*@Valid PageRequest page,*/ UserSearchDTO userSearch) {
         /*logger.info("分页查询用户列表！搜索条件：userSearch：" + userSearch + ",pageNum:" + page.getPageNum()
                 + ",每页记录数量pageSize:" + page.getPageSize());*/
-        PageDataResult pdr = new PageDataResult();
+        PageDataResult pdr = new PageDataResult(count, list);
         try {
             if(null == pageNum) {
                 pageNum = 1;
@@ -253,7 +249,7 @@ public class UserController {
     @ResponseBody
     public PageDataResult getUserList(@RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,Integer roleId){
-        PageDataResult pdr = new PageDataResult();
+        PageDataResult pdr = new PageDataResult(count, list);
         try {
             if(null == pageNum) {
                 pageNum = 1;
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 9bcc369..8743325 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -1,201 +1,208 @@
-/**
- * Copyright(C)版权所有 中国电子科技集团公司第三十二研究所
- * @Title: 数据库实体类
- * @author: 徐文远
- * @version: 1.0
- * @date: 2020/10/15
- * 备注:无
- */
 package com.cetc32.dh.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Table;
+import javax.persistence.*;
 
-/**
- * 数据库实体类
- * @author: xiao
- * @version: 徐文远
- * @date: 2020/10/15
- * 备注:无
- */
-@Table(name="data_submit")
-public class DataSubmit extends NumberS{
+@Table(name = "data_submit")
+public class DataSubmit {
+    @Id
+    private Integer id;
 
     /**
-     * 无参构造函数
-     * */
-    public DataSubmit(){}
+     * '报送类型,外部接口上报或本地路径上报'
+     */
+    private Integer subtype;
 
-    /**
-     * 有参构造函数
-     * */
-    public DataSubmit(Integer id,Integer subtype,Integer plevel,Integer status,String submitor,
-                      String approver, Integer menuId,String title,String area,String path,Integer year){
-        this.id=id;
-        this.subtype=subtype;
-        this.plevel=plevel;
-        this.status=status;
-        this.submitor=submitor;
-        this.approver=approver;
-        this.menuId=menuId;
-        this.title=title;
-        this.area=area;
-        this.path=path;
-        this.year=year;
-    }
+    private Integer plevel;
 
-    /**
-     * id
-     * */
-    @Column(name = "id ")
-    Integer id ;
+    private Integer status;
 
-    /**
-     * 数据上报类型
-     * 状态：1表示一按文件数组形式提交，2一按路径提交
-     * **/
-    @Column(name = "subtype")
-    Integer subtype;
+    private String submitor;
 
-    /**
-     * 权限级别
-     * */
-    @Column(name = "plevel")
-    Integer plevel;
+    private String approver;
 
-    /**
-     * 状态：1表示一提交待审核，2一审核通过，3一审核拒绝
-     * */
-    @Column(name = "status")
-    Integer status;
+    @Column(name = "menuId")
+    private Integer menuid;
 
-    /**
-     * 提交者
-     * */
-    @Column(name = "sumbitor")
-    String submitor;
+    private Integer year;
 
-    /**
-     * 审核人
-     * */
-    @Column(name = "approver")
-    String approver;
+    private String title;
 
-    /**
-     * 所属菜单
-     * */
-    @Column(name = "menuId")
-    Integer menuId;
+    private String area;
 
-    /**
-     * 标题
-     * */
-    @Column(name = "title")
-    String title;
+    private String path;
 
-    /**
-     * 区域
-     * */
-    @Column(name = "area")
-    String area;
+    public  DataSubmit(){}
 
-    /**
-     * 存储路径
-     * */
-    @Column(name = "path")
-    String path;
+    public DataSubmit(Integer id,Integer subtype,Integer plevel,Integer status,String submitor,String approver,
+                      Integer menuid,Integer year,String title,String area,String path) {
+        this.id=id;
+        this.subtype=subtype;
+        this.plevel=plevel;
+        this.status=status;
+        this.submitor=submitor;
+        this.approver=approver;
+        this.menuid=menuid;
+        this.year=year;
+        this.title=title;
+        this.area=area;
+        this.path=path;
+    }
 
     /**
-     * 所属年分
-     * */
-    @Column(name = "year")
-    Integer year;
-
+     * @return id
+     */
     public Integer getId() {
         return id;
     }
 
+    /**
+     * @param id
+     */
     public void setId(Integer id) {
         this.id = id;
     }
 
+    /**
+     * 获取'报送类型,外部接口上报或本地路径上报'
+     *
+     * @return subtype - '报送类型,外部接口上报或本地路径上报'
+     */
     public Integer getSubtype() {
         return subtype;
     }
 
+    /**
+     * 设置'报送类型,外部接口上报或本地路径上报'
+     *
+     * @param subtype '报送类型,外部接口上报或本地路径上报'
+     */
     public void setSubtype(Integer subtype) {
         this.subtype = subtype;
     }
 
+    /**
+     * @return plevel
+     */
     public Integer getPlevel() {
         return plevel;
     }
 
+    /**
+     * @param plevel
+     */
     public void setPlevel(Integer plevel) {
         this.plevel = plevel;
     }
 
+    /**
+     * @return status
+     */
     public Integer getStatus() {
         return status;
     }
 
+    /**
+     * @param status
+     */
     public void setStatus(Integer status) {
         this.status = status;
     }
 
+    /**
+     * @return submitor
+     */
     public String getSubmitor() {
         return submitor;
     }
 
+    /**
+     * @param submitor
+     */
     public void setSubmitor(String submitor) {
-        this.submitor = submitor;
+        this.submitor = submitor == null ? null : submitor.trim();
     }
 
+    /**
+     * @return approver
+     */
     public String getApprover() {
         return approver;
     }
 
+    /**
+     * @param approver
+     */
     public void setApprover(String approver) {
-        this.approver = approver;
+        this.approver = approver == null ? null : approver.trim();
     }
 
-    public Integer getMenuId() {
-        return menuId;
+    /**
+     * @return menuId
+     */
+    public Integer getMenuid() {
+        return menuid;
+    }
+
+    /**
+     * @param menuid
+     */
+    public void setMenuid(Integer menuid) {
+        this.menuid = menuid;
+    }
+
+    /**
+     * @return year
+     */
+    public Integer getYear() {
+        return year;
     }
 
-    public void setMenuId(Integer menuId) {
-        this.menuId = menuId;
+    /**
+     * @param year
+     */
+    public void setYear(Integer year) {
+        this.year = year;
     }
 
+    /**
+     * @return title
+     */
     public String getTitle() {
         return title;
     }
 
+    /**
+     * @param title
+     */
     public void setTitle(String title) {
-        this.title = title;
+        this.title = title == null ? null : title.trim();
     }
 
+    /**
+     * @return area
+     */
     public String getArea() {
         return area;
     }
 
+    /**
+     * @param area
+     */
     public void setArea(String area) {
-        this.area = area;
+        this.area = area == null ? null : area.trim();
     }
 
+    /**
+     * @return path
+     */
     public String getPath() {
         return path;
     }
 
+    /**
+     * @param path
+     */
     public void setPath(String path) {
-        this.path = path;
-    }
-
-    public Integer getYear() {
-        return year;
-    }
-
-    public void setYear(Integer year) {
-        this.year = year;
+        this.path = path == null ? null : path.trim();
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java
index 3692602..0638f71 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataMenuMapper.java
@@ -35,5 +35,7 @@ public interface DataMenuMapper extends Mapper<DataMenu> {
 
     public DataMenu queryByPid(Long pid);
 
+    public List<DataMenu>  selectAll();
+
     public List<DataMenu> queryByPIdSatisfyId(Long id);
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/service/DataMenuService.java b/src/main/java/com/cetc32/dh/service/DataMenuService.java
index 78a8b0f..04d6a63 100644
--- a/src/main/java/com/cetc32/dh/service/DataMenuService.java
+++ b/src/main/java/com/cetc32/dh/service/DataMenuService.java
@@ -42,6 +42,8 @@ public interface DataMenuService {
 
     public String addDataMenu(DataMenu dataMenu );
 
+    public List<DataMenu>  selectAll();
+
     public List<DataFile> showFilesByMenuId(Long menuId);
 
 }
diff --git a/src/main/java/com/cetc32/dh/service/DataSubmitService.java b/src/main/java/com/cetc32/dh/service/DataSubmitService.java
index 648b97a..1589da4 100644
--- a/src/main/java/com/cetc32/dh/service/DataSubmitService.java
+++ b/src/main/java/com/cetc32/dh/service/DataSubmitService.java
@@ -15,10 +15,10 @@ import java.util.List;
 public interface DataSubmitService {
     /**
      * 提交请求后数据插入操作
-     * @param ds 更新到数库的数据
+     * @param dataSubmit 更新到数库的数据
      * @return 反馈是否成功
      * **/
-    public Integer insertDataSubmit(DataSubmit ds);
+    public Integer insertDataSubmit(DataSubmit dataSubmit);
 
     /**
      * 拒绝用户此时数据导入申请
diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java
index c53a9d5..843acee 100644
--- a/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java
@@ -113,7 +113,7 @@ public class AdminPermissionServiceImpl implements AdminPermissionService {
      */
     @Override
     public PageDataResult getPermissionList(Integer pageNum, Integer pageSize) {
-        PageDataResult pageDataResult = new PageDataResult();
+        PageDataResult pageDataResult = new PageDataResult(count, list);
         PageHelper.startPage(pageNum, pageSize);
         List<PermissionDTO> permissions = permissionMapper.getPermissionList();
 
diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
index d0fc710..7c75d65 100644
--- a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
@@ -50,7 +50,7 @@ public class AdminUserServiceImpl implements AdminUserService {
      */
     @Override
     public PageDataResult getUserList(UserSearchDTO userSearch, Integer pageNum, Integer pageSize) {
-        PageDataResult pageDataResult = new PageDataResult();
+        PageDataResult pageDataResult = new PageDataResult(count, list);
         PageHelper.startPage(pageNum, pageSize);
         List<AdminUserDTO> baseAdminUsers = baseAdminUserMapper.getUserList(userSearch);
 
@@ -243,7 +243,7 @@ public class AdminUserServiceImpl implements AdminUserService {
      */
     @Override
     public PageDataResult getUserRole(Integer roleId,Integer pageNum, Integer pageSize){
-        PageDataResult pageDataResult = new PageDataResult();
+        PageDataResult pageDataResult = new PageDataResult(count, list);
         PageHelper.startPage(pageNum, pageSize);
         List<AdminUserDTO> baseAdminUsers = baseAdminUserMapper.getUserRole(roleId);
 
diff --git a/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java
index 10e9209..429664d 100644
--- a/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/DataMenuServiceImpl.java
@@ -198,5 +198,9 @@ public class DataMenuServiceImpl implements DataMenuService {
             return message;
     }
 
+    public List<DataMenu>  selectAll(){
+        return dataMenuMapper.selectAll();
+    }
+
 
 }
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index d85e123..509ebcb 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -3,6 +3,7 @@ package com.cetc32.dh.utils;
 import com.cetc32.dh.common.response.ResponseResult;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.http.entity.ContentType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -60,15 +61,23 @@ public class FileUtil {
         }
     }
 
+
+    /**
+     * 确保目录文件上传
+     * @param file
+     * @param  filepath
+     */
     public static String uploadFile(MultipartFile file, String filepath) {
         String fileName = file.getOriginalFilename();//获取文件名
-        makeDir(filepath);
+        String dirName = filepath  + fileName ;
+        System.out.println(dirName);
+        makeDir(dirName);
         if (!file.isEmpty()) {
             try (BufferedOutputStream out = new BufferedOutputStream(
                     new FileOutputStream(new File(filepath + File.separator + fileName)))) {
                 out.write(file.getBytes());
                 out.flush();
-                return "文件数据提交成功！";
+                return dirName;
             } catch (FileNotFoundException e) {
                 return "文件数据提交失败！"+e.getMessage();
             } catch (IOException e) {
@@ -95,5 +104,8 @@ public class FileUtil {
 
 
 
+
+
+
 }
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index e8029e8..d31c181 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -36,4 +36,7 @@ generator:
   javaClient-targetPackage: com.cetc32.dh.mybatis
 logging:
   level:
-    com.cetc32.dh.mybatis: debug
\ No newline at end of file
+    com.cetc32.dh.mybatis: debug
+
+storePath: /root/
+upLoadPath: ${storePath}upLoad/
\ No newline at end of file
diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml
index b44ad20..b46a6cb 100644
--- a/src/main/resources/application-xwy.yml
+++ b/src/main/resources/application-xwy.yml
@@ -20,6 +20,7 @@ spring:
     multipart:
       max-file-size: 500MB
       max-request-size: 500MB
+
   redis:
     database: 0
 # Redis服务器地址
@@ -39,6 +40,8 @@ spring:
       min-idle: 0
 # 连接超时时间（毫秒）
     timeout: 1000
+
+
 mybatis:
     mapper-locations: classpath:mapper/*.xml
     type-aliases-package: com.cetc32.dh.entity.*         #对应实体类的包名
@@ -48,7 +51,9 @@ mybatis:
 #设置静态资源路径，多个以逗号分隔
 spring.resources.static-locations: classpath:static/,file:static/
 
-upload-path: //home//dhUpload//
+storePath: /root/
+upLoadPath: ${storePath}upLoad/
+
 
 generator:
   targetProject: src/main/java
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2ac5fe7..4f5137e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 #spring:
 #  profiles:
 #    active: dev
-    #热部署生效
\ No newline at end of file
+#    #热部署生效
\ No newline at end of file
diff --git a/src/main/resources/generator.xml b/src/main/resources/generator.xml
index 7266739..b64343a 100644
--- a/src/main/resources/generator.xml
+++ b/src/main/resources/generator.xml
@@ -54,7 +54,7 @@
                              type="XMLMAPPER"/>
 
         <!-- table可以有多个,每个数据库中的表都可以写一个table，tableName表示要匹配的数据库表,也可以在tableName属性中通过使用%通配符来匹配所有数据库表,只有匹配的表才会自动生成文件 -->
-        <table tableName="options"></table>
+        <table tableName="data_submit"></table>
 
     </context>
 </generatorConfiguration>
\ No newline at end of file
diff --git a/src/main/resources/mapper/DataMenuMapper.xml b/src/main/resources/mapper/DataMenuMapper.xml
index f58fddb..bb69c7c 100644
--- a/src/main/resources/mapper/DataMenuMapper.xml
+++ b/src/main/resources/mapper/DataMenuMapper.xml
@@ -106,6 +106,10 @@
         where  pid= #{pid,jdbcType=BIGINT}
     </select>
 
+  <select id="selectAll" resultType="com.cetc32.dh.entity.DataMenu" >
+        select * from data_menu
+    </select>
+
 
 
   <delete id="deleteById" parameterType="java.lang.Long">
diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml
deleted file mode 100644
index 1d352bf..0000000
--- a/src/main/resources/mapper/DataSubmitMapper.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cetc32.dh.mybatis.DataSubmitMapper">
-
-  <insert id="insertOne" keyProperty="id" useGeneratedKeys="true" parameterType="com.cetc32.dh.entity.DataSubmit">
-    insert into data_submit
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-
-      <if test="id != null">
-        id,
-      </if>
-
-      <if test="subtype!= null">
-        subtype,
-      </if>
-
-      <if test="plevel!= null">
-        plevel,
-      </if>
-
-      <if test="submitor!= null">
-        submitor,
-      </if>
-
-      <if test="approver!= null">
-        approver,
-      </if>
-
-      <if test="menuId!= null">
-        menuId,
-      </if>
-
-      <if test="title!= null">
-        title,
-      </if>
-
-      <if test="area!= null">
-        area,
-      </if>
-
-      <if test="year!= null">
-        year,
-      </if>
-    </trim>
-
-
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-
-      <if test="id != null">
-        #{id},
-      </if>
-
-      <if test="subtype!= null">
-        #{subtype},
-      </if>
-
-      <if test="plevel!= null">
-        #{plevel},
-      </if>
-
-      <if test="submitor!= null">
-        #{submitor},
-      </if>
-
-      <if test="approver!= null">
-        #{approver},
-      </if>
-
-      <if test="menuId!= null">
-        #{menuId},
-      </if>
-
-      <if test="title!= null">
-        #{title},
-      </if>
-
-      <if test="area!= null">
-        #{area},
-      </if>
-
-      <if test="year!= null">
-        #{year},
-      </if>
-    </trim>
-  </insert>
-
-
-  <update id="updateById" parameterType="com.cetc32.dh.entity.DataSubmit">
-    update data_submit
-    <set>
-      <if test="status != null">
-        status = #{status},
-      </if>
-      <if test="plevel != null">
-        plevel = #{plevel},
-      </if>
-      <if test="menuId != null">
-        menuId = #{menuId},
-      </if>
-
-      <if test="year != null">
-        year = #{year},
-      </if>
-
-      <if test="area != null">
-        area = #{area},
-      </if>
-    </set>
-    where id = #{id}
-  </update>
-
-  <select id="selectMine" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="com.cetc32.dh.entity.DataSubmit">
-    select * from data_submit
-    <where>
-      <if test="submitor!=null">
-        submitor = #{submitor}
-      </if>
-      <if test="approver!=null">
-        and approver = #{approver}
-      </if>
-    </where>
-  </select>
-
-  <select id="countMine" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="java.lang.Integer">
-    select count (*) from data_submit
-    <where>
-      <if test="submitor!=null">
-        submitor = #{submitor}
-      </if>
-      <if test="approver!=null">
-        and approver = #{approver}
-      </if>
-    </where>
-  </select>
-  <select id="selectByStatusAndUser" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="com.cetc32.dh.entity.DataSubmit">
-    select * from data_submit
-    <where>
-      <if test="status!=null">
-        status = #{status}
-      </if>
-      <if test="approver!=null">
-        and approver = #{approver}
-      </if>
-    </where>
-  </select>
-  <select id="countByStatusAndUser" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="java.lang.Integer">
-    select count(*) from data_submit
-    <where>
-      <if test="status!=null">
-        status = #{status}
-      </if>
-      <if test="approver!=null">
-        and approver = #{approver}
-      </if>
-    </where>
-  </select>
-</mapper>
\ No newline at end of file
-- 
Gitee


From 2cf90d71642ec92bdd92baca4a7c97dc4f9b2aaf Mon Sep 17 00:00:00 2001
From: root <123>
Date: Thu, 29 Oct 2020 17:13:36 +0800
Subject: [PATCH 05/26] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3=20=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cetc32/dh/common/response/PageDataResult.java  |  4 ++++
 .../dh/controller/rest/FileSubmitController.java   | 14 +++++++-------
 .../dh/controller/rest/VfileMenuController.java    | 10 +++++-----
 .../dh/controller/system/PermissionController.java |  2 +-
 .../dh/controller/system/RoleController.java       |  2 +-
 .../dh/controller/system/UserController.java       |  4 ++--
 .../service/impl/AdminPermissionServiceImpl.java   |  2 +-
 .../dh/service/impl/AdminUserServiceImpl.java      |  4 ++--
 8 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
index 950101d..49bda85 100644
--- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
+++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
@@ -44,6 +44,10 @@ public class PageDataResult {
         }
     }
 
+    public PageDataResult() {
+
+    }
+
     public Integer getCode() {
         return code;
     }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index acae6e5..00a7ece 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -63,15 +63,15 @@ public class FileSubmitController {
      * **/
     @ApiOperation(value="当前用户名提交的数据")
     @PostMapping("/request")
-    public PageDataResult mySubmits(){
+    public PageDataResult mySubmits(Integer page,Integer results){
         DataSubmit ds=new DataSubmit();
         ds.setSubmitor("admin");
         List<DataSubmit> list =new ArrayList<>();
         Integer count =0;
         list= dataSubmitService.selectMySubmit(ds);
         count= dataSubmitService.countMineSubmit(ds);
-//        return new PageDataResult(count,list, (page - 1) * results);
-        return new PageDataResult(count,list);
+        return new PageDataResult(count,list, (page - 1) * results);
+
     }
 
     /**
@@ -80,15 +80,15 @@ public class FileSubmitController {
      * **/
     @ApiOperation(value="当前用户名下需要审核及已审核的所有任务")
     @PostMapping("/task")
-    public PageDataResult myApproves(){
+    public PageDataResult myApproves(Integer page,Integer results){
         DataSubmit ds=new DataSubmit();
         ds.setSubmitor("admin");
         List<DataSubmit> list =new ArrayList<>();
         Integer count =0;
         list= dataSubmitService.selectMyApprove(ds);
         count= dataSubmitService.countMineApprov(ds);
-//        return new PageDataResult(count,list, (page - 1) * results);
-        return new PageDataResult(count,list);
+        return new PageDataResult(count,list, (page - 1) * results);
+//        return new PageDataResult(count,list);
     }
 
     /**
@@ -144,7 +144,7 @@ public class FileSubmitController {
     @ApiOperation(value="提交数据")
     @PostMapping("/sub")
     public ResponseResult DataSub(){
-        DataSubmit dataSubmit =new DataSubmit(null,null,1,2,"fdg","sw",4,null,null,"c://file",2017);
+        DataSubmit dataSubmit =new DataSubmit(666,null,1,2,"fdg","sw",4,2017,null,"中国","c://dd");
         dataSubmit.setSubtype(2);
         dataSubmit.setStatus(1);
         int count = dataSubmitService.insertDataSubmit(dataSubmit);
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index b10f2c6..e2b47d9 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -51,7 +51,7 @@ public class VfileMenuController {
      */
     @PostMapping("/queryByFileSecurityAndMenuId")
     public PageDataResult queryByFileSecurityAndMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, String fileSecurity){
-        PageDataResult pdr = new PageDataResult(count, list);
+        PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
         }
@@ -74,7 +74,7 @@ public class VfileMenuController {
      */
     @PostMapping("/queryFilesByMenuId")
     public PageDataResult queryFilesByMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId){
-        PageDataResult pdr = new PageDataResult(count, list);
+        PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
         }
@@ -99,7 +99,7 @@ public class VfileMenuController {
      */
     @PostMapping("/queryFilesByTime")
     public PageDataResult queryFilesByTime(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, Date time){
-        PageDataResult pdr = new PageDataResult(count, list);
+        PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
         }
@@ -124,7 +124,7 @@ public class VfileMenuController {
      */
     @PostMapping("/queryFilesByRegion")
     public PageDataResult queryFilesByRegion(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, String region){
-        PageDataResult pdr = new PageDataResult(count, list);
+        PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
         }
@@ -152,7 +152,7 @@ public class VfileMenuController {
      */
     @PostMapping("/queryFilesByChoose")
     public PageDataResult queryFilesByChoose(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,String fileName, Integer fileYear,String region,String fileType,String fileSecurity){
-        PageDataResult pdr = new PageDataResult(count, list);
+        PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
         }
diff --git a/src/main/java/com/cetc32/dh/controller/system/PermissionController.java b/src/main/java/com/cetc32/dh/controller/system/PermissionController.java
index 267bc95..ed869ae 100644
--- a/src/main/java/com/cetc32/dh/controller/system/PermissionController.java
+++ b/src/main/java/com/cetc32/dh/controller/system/PermissionController.java
@@ -65,7 +65,7 @@ public class PermissionController {
     public PageDataResult permissionList(@RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize){
         logger.info("获取权限菜单列表");
-        PageDataResult pdr = new PageDataResult(count, list);
+        PageDataResult pdr = new PageDataResult();
         try {
             if(null == pageNum) {
                 pageNum = 1;
diff --git a/src/main/java/com/cetc32/dh/controller/system/RoleController.java b/src/main/java/com/cetc32/dh/controller/system/RoleController.java
index 8276cd6..bad228f 100644
--- a/src/main/java/com/cetc32/dh/controller/system/RoleController.java
+++ b/src/main/java/com/cetc32/dh/controller/system/RoleController.java
@@ -59,7 +59,7 @@ public class RoleController {
     public PageDataResult getRoleList(@RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize) {
         logger.info("获取角色列表");
-        PageDataResult pdr = new PageDataResult(count, list);
+        PageDataResult pdr = new PageDataResult();
         try {
             if(null == pageNum) {
                 pageNum = 1;
diff --git a/src/main/java/com/cetc32/dh/controller/system/UserController.java b/src/main/java/com/cetc32/dh/controller/system/UserController.java
index 90c1bd0..ea1d0fe 100644
--- a/src/main/java/com/cetc32/dh/controller/system/UserController.java
+++ b/src/main/java/com/cetc32/dh/controller/system/UserController.java
@@ -173,7 +173,7 @@ public class UserController {
                                       @RequestParam("pageSize") Integer pageSize,/*@Valid PageRequest page,*/ UserSearchDTO userSearch) {
         /*logger.info("分页查询用户列表！搜索条件：userSearch：" + userSearch + ",pageNum:" + page.getPageNum()
                 + ",每页记录数量pageSize:" + page.getPageSize());*/
-        PageDataResult pdr = new PageDataResult(count, list);
+        PageDataResult pdr = new PageDataResult();
         try {
             if(null == pageNum) {
                 pageNum = 1;
@@ -249,7 +249,7 @@ public class UserController {
     @ResponseBody
     public PageDataResult getUserList(@RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,Integer roleId){
-        PageDataResult pdr = new PageDataResult(count, list);
+        PageDataResult pdr = new PageDataResult();
         try {
             if(null == pageNum) {
                 pageNum = 1;
diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java
index 843acee..c53a9d5 100644
--- a/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/AdminPermissionServiceImpl.java
@@ -113,7 +113,7 @@ public class AdminPermissionServiceImpl implements AdminPermissionService {
      */
     @Override
     public PageDataResult getPermissionList(Integer pageNum, Integer pageSize) {
-        PageDataResult pageDataResult = new PageDataResult(count, list);
+        PageDataResult pageDataResult = new PageDataResult();
         PageHelper.startPage(pageNum, pageSize);
         List<PermissionDTO> permissions = permissionMapper.getPermissionList();
 
diff --git a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
index 7c75d65..d0fc710 100644
--- a/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/AdminUserServiceImpl.java
@@ -50,7 +50,7 @@ public class AdminUserServiceImpl implements AdminUserService {
      */
     @Override
     public PageDataResult getUserList(UserSearchDTO userSearch, Integer pageNum, Integer pageSize) {
-        PageDataResult pageDataResult = new PageDataResult(count, list);
+        PageDataResult pageDataResult = new PageDataResult();
         PageHelper.startPage(pageNum, pageSize);
         List<AdminUserDTO> baseAdminUsers = baseAdminUserMapper.getUserList(userSearch);
 
@@ -243,7 +243,7 @@ public class AdminUserServiceImpl implements AdminUserService {
      */
     @Override
     public PageDataResult getUserRole(Integer roleId,Integer pageNum, Integer pageSize){
-        PageDataResult pageDataResult = new PageDataResult(count, list);
+        PageDataResult pageDataResult = new PageDataResult();
         PageHelper.startPage(pageNum, pageSize);
         List<AdminUserDTO> baseAdminUsers = baseAdminUserMapper.getUserRole(roleId);
 
-- 
Gitee


From b42b3450fca0cac740484646e9846cdb6e32057a Mon Sep 17 00:00:00 2001
From: root <123>
Date: Thu, 29 Oct 2020 17:14:04 +0800
Subject: [PATCH 06/26] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3=20=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/DataSubmitMapper.xml     | 176 ++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 src/main/resources/mapper/DataSubmitMapper.xml

diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml
new file mode 100644
index 0000000..3fe4473
--- /dev/null
+++ b/src/main/resources/mapper/DataSubmitMapper.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cetc32.dh.mybatis.DataSubmitMapper">
+  <resultMap id="BaseResultMap" type="com.cetc32.dh.entity.DataSubmit">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="subtype" jdbcType="INTEGER" property="subtype" />
+    <result column="plevel" jdbcType="INTEGER" property="plevel" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="submitor" jdbcType="VARCHAR" property="submitor" />
+    <result column="approver" jdbcType="VARCHAR" property="approver" />
+    <result column="menuId" jdbcType="INTEGER" property="menuid" />
+    <result column="year" jdbcType="INTEGER" property="year" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="area" jdbcType="VARCHAR" property="area" />
+    <result column="path" jdbcType="VARCHAR" property="path" />
+  </resultMap>
+
+  <insert id="insertOne" keyProperty="id" useGeneratedKeys="true" parameterType="com.cetc32.dh.entity.DataSubmit">
+    insert into data_submit
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+
+            <if test="id != null">
+              id,
+            </if>
+
+      <if test="subtype!= null">
+        subtype,
+      </if>
+
+      <if test="plevel!= null">
+        plevel,
+      </if>
+
+      <if test="submitor!= null">
+        submitor,
+      </if>
+
+      <if test="approver!= null">
+        approver,
+      </if>
+
+      <if test="menuid!= null">
+        menuid,
+      </if>
+
+      <if test="title!= null">
+        title,
+      </if>
+
+      <if test="area!= null">
+        area,
+      </if>
+
+      <if test="year!= null">
+        year,
+      </if>
+    </trim>
+
+
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+
+      <if test="id != null">
+        id = #{id},
+      </if>
+
+      <if test="subtype!= null">
+        subtype = #{subtype},
+      </if>
+
+      <if test="plevel!= null">
+        plevel = #{plevel},
+      </if>
+
+      <if test="submitor!= null">
+        submitor = #{submitor},
+      </if>
+
+      <if test="approver!= null">
+        approver = #{approver},
+      </if>
+
+      <if test="menuid!= null">
+        menuId = #{menuid},
+      </if>
+
+      <if test="title!= null">
+        title = #{title},
+      </if>
+
+      <if test="area!= null">
+        area = #{area},
+      </if>
+
+      <if test="year!= null">
+        #{year},
+      </if>
+    </trim>
+  </insert>
+
+
+  <update id="updateById" parameterType="com.cetc32.dh.entity.DataSubmit">
+    update data_submit
+    <set>
+      <if test="status != null">
+        status = #{status},
+      </if>
+      <if test="plevel != null">
+        plevel = #{plevel},
+      </if>
+      <if test="menuid != null">
+        menuId = #{menuid},
+      </if>
+
+      <if test="year != null">
+        year = #{year},
+      </if>
+
+      <if test="area != null">
+        area = #{area},
+      </if>
+    </set>
+    where id = #{id}
+  </update>
+
+  <select id="selectMine" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="com.cetc32.dh.entity.DataSubmit">
+    select * from data_submit
+    <where>
+      <if test="submitor!=null">
+        submitor = #{submitor}
+      </if>
+      <if test="approver!=null">
+        and approver = #{approver}
+      </if>
+    </where>
+  </select>
+
+  <select id="countMine" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="java.lang.Integer">
+    select count (*) from data_submit
+    <where>
+      <if test="submitor!=null">
+        submitor = #{submitor}
+      </if>
+      <if test="approver!=null">
+        and approver = #{approver}
+      </if>
+    </where>
+  </select>
+
+  <select id="selectByStatusAndUser" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="com.cetc32.dh.entity.DataSubmit">
+    select * from data_submit
+    <where>
+      <if test="status!=null">
+        status = #{status}
+      </if>
+      <if test="approver!=null">
+        and approver = #{approver}
+      </if>
+    </where>
+  </select>
+
+  <select id="countByStatusAndUser" parameterType="com.cetc32.dh.entity.DataSubmit" resultType="java.lang.Integer">
+    select count(*) from data_submit
+    <where>
+      <if test="status!=null">
+        status = #{status}
+      </if>
+      <if test="approver!=null">
+        and approver = #{approver}
+      </if>
+    </where>
+  </select>
+
+</mapper>
\ No newline at end of file
-- 
Gitee


From 3685400575910c24f7fd4f9b72c42ac7084d8392 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Fri, 30 Oct 2020 16:36:13 +0800
Subject: [PATCH 07/26] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=92=8C=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java | 46 +++++++++++++++----
 .../java/com/cetc32/dh/entity/DataSubmit.java | 37 +++++++++++++--
 .../dh/service/impl/VfileMenuServiceImpl.java |  5 ++
 .../resources/mapper/DataSubmitMapper.xml     | 42 ++++++++++++-----
 src/main/resources/mapper/VfileMenuMapper.xml |  4 +-
 5 files changed, 108 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index 00a7ece..2da45dc 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -13,6 +13,8 @@ import com.cetc32.dh.common.response.PageDataResult;
 import com.cetc32.dh.common.response.ResponseResult;
 import com.cetc32.dh.entity.DataSubmit;
 import com.cetc32.dh.service.DataSubmitService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -136,24 +138,50 @@ public class FileSubmitController {
                 dataSubmitService.selectReadyApprove(ds),(page-1)*results);
     }
 
+
+
+
     /**
      * 提交数据
 //     * @param dataSubmit 数据信息
      * @return 返回提交结果
      * */
-    @ApiOperation(value="提交数据")
+    @ApiOperation(value="提交数据",notes="id不传参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="id",value ="记录id号(不传参)",paramType = "body",dataType = "Integer",required =false),
+            @ApiImplicitParam(name="subtype",value ="提交类型",paramType = "body",dataType = "String",defaultValue = ""),
+            @ApiImplicitParam(name="plevel",value ="文件等级",paramType = "body",dataType = "Integer",defaultValue = ""),
+            @ApiImplicitParam(name="status",value ="文件状态",paramType = "body",dataType = "Integer",defaultValue = ""),
+            @ApiImplicitParam(name="submitor",value ="提交者",paramType = "body",dataType = "String",defaultValue = ""),
+            @ApiImplicitParam(name="approver",value ="审核人",paramType = "body",dataType = "String",defaultValue = ""),
+            @ApiImplicitParam(name="menuid",value ="编目",paramType = "body",dataType = "Integer",defaultValue = ""),
+            @ApiImplicitParam(name="year",value ="年份",paramType = "body",dataType = "Integer",defaultValue = ""),
+            @ApiImplicitParam(name="title",value ="标题",paramType = "body",dataType = "String",defaultValue = ""),
+            @ApiImplicitParam(name="area",value ="区域",paramType = "body",dataType = "String",defaultValue = ""),
+            @ApiImplicitParam(name="path",value ="提交路径(不传参)",paramType = "body",dataType = "String",defaultValue = ""),
+            @ApiImplicitParam(name="pathList",value ="文件路径list",paramType = "body",dataType = "List",defaultValue = "")
+    })
     @PostMapping("/sub")
-    public ResponseResult DataSub(){
-        DataSubmit dataSubmit =new DataSubmit(666,null,1,2,"fdg","sw",4,2017,null,"中国","c://dd");
-        dataSubmit.setSubtype(2);
+    public ResponseResult DataSub( @RequestBody DataSubmit dataSubmit){
+
+        System.out.println(dataSubmit.getPathList()[1]);
+
+        dataSubmit.setSubtype("2");
         dataSubmit.setStatus(1);
-        int count = dataSubmitService.insertDataSubmit(dataSubmit);
-        System.out.println(count);
-        if(0<=count){
-            return ResponseResult.success("数据提交成功！");
+        dataSubmit.setApprover("未审核");
+        int sum=0;
+        for(int i=0;i<dataSubmit.getPathList().length;i++){
+            DataSubmit dataSubmit_new = dataSubmit;
+            dataSubmit_new.setPath(dataSubmit.getPathList()[i].toString());
+            System.out.println(dataSubmit_new);
+            int count = dataSubmitService.insertDataSubmit(dataSubmit_new);
+            sum+=count;
+            dataSubmit.setId(dataSubmit.getId()+sum);
+        }
+        if(sum==dataSubmit.getPathList().length){
+            return ResponseResult.success("所有数据提交成功！");
         }
         return ResponseResult.error("数据提交失败！");
-
     }
 
 
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 8743325..9f34618 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -1,6 +1,7 @@
 package com.cetc32.dh.entity;
 
 import javax.persistence.*;
+import java.util.List;
 
 @Table(name = "data_submit")
 public class DataSubmit {
@@ -10,7 +11,9 @@ public class DataSubmit {
     /**
      * '报送类型,外部接口上报或本地路径上报'
      */
-    private Integer subtype;
+    private String subtype;
+
+    private String[] pathList;
 
     private Integer plevel;
 
@@ -33,7 +36,7 @@ public class DataSubmit {
 
     public  DataSubmit(){}
 
-    public DataSubmit(Integer id,Integer subtype,Integer plevel,Integer status,String submitor,String approver,
+    public DataSubmit(Integer id,String subtype,Integer plevel,Integer status,String submitor,String approver,
                       Integer menuid,Integer year,String title,String area,String path) {
         this.id=id;
         this.subtype=subtype;
@@ -62,12 +65,23 @@ public class DataSubmit {
         this.id = id;
     }
 
+    /**
+     * @param pathList
+     */
+    public void setPathList(String[] pathList) {
+        this.pathList = pathList;
+    }
+
+    public String[]  getPathList() {
+        return this.pathList;
+    }
+
     /**
      * 获取'报送类型,外部接口上报或本地路径上报'
      *
      * @return subtype - '报送类型,外部接口上报或本地路径上报'
      */
-    public Integer getSubtype() {
+    public String getSubtype() {
         return subtype;
     }
 
@@ -76,7 +90,7 @@ public class DataSubmit {
      *
      * @param subtype '报送类型,外部接口上报或本地路径上报'
      */
-    public void setSubtype(Integer subtype) {
+    public void setSubtype(String subtype) {
         this.subtype = subtype;
     }
 
@@ -205,4 +219,19 @@ public class DataSubmit {
     public void setPath(String path) {
         this.path = path == null ? null : path.trim();
     }
+
+    public String toString() {
+        return "{" +
+                "id=" + id +'\'' +
+                ",subtype=" + subtype +'\'' +
+                ",plevel=" + plevel + '\'' +
+                ",status=" + status+'\'' +
+                ",submitor=" + submitor +'\'' +
+                ",approver=" + approver + '\'' +
+                ",path=" + path+'\'' +
+                ",year=" + year+'\'' +
+                ",title=" + title+'\'' +
+                ",area=" + area +
+                '}';
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
index bf6e6e7..52c00b0 100644
--- a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java
@@ -80,6 +80,7 @@ public class VfileMenuServiceImpl implements VfileMenuService {
      */
     @Override
     public List<VfileMenu> queryFilesByChoose(String fileName, Integer fileYear,String region,String fileType,String fileSecurity){
+        fileName="%"+fileName+"%";
         return vfileMenuMapper.queryFilesByChoose(fileName,fileYear,region,fileType,fileSecurity);
     }
 
@@ -91,6 +92,10 @@ public class VfileMenuServiceImpl implements VfileMenuService {
      */
     @Override
     public List<VfileMenu> queryFilesByObj(Integer offset, Integer limit, VfileMenu vfileMenu){
+        if(vfileMenu.getFileName()!=null){
+            String fileName="%"+vfileMenu.getFileName()+"%";
+            vfileMenu.setFileName(fileName);
+        }
         if(vfileMenu.getRegion().equals("全部区域")){
             vfileMenu.setRegion(null);
         }
diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml
index 3fe4473..a12ab64 100644
--- a/src/main/resources/mapper/DataSubmitMapper.xml
+++ b/src/main/resources/mapper/DataSubmitMapper.xml
@@ -22,9 +22,9 @@
     insert into data_submit
     <trim prefix="(" suffix=")" suffixOverrides=",">
 
-            <if test="id != null">
-              id,
-            </if>
+      <if test="id != null">
+        id,
+      </if>
 
       <if test="subtype!= null">
         subtype,
@@ -38,6 +38,14 @@
         submitor,
       </if>
 
+      <if test="status!= null">
+        status,
+      </if>
+
+      <if test="path!= null">
+        path,
+      </if>
+
       <if test="approver!= null">
         approver,
       </if>
@@ -57,47 +65,59 @@
       <if test="year!= null">
         year,
       </if>
+
     </trim>
 
 
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
       <if test="id != null">
-        id = #{id},
+       #{id},
       </if>
 
       <if test="subtype!= null">
-        subtype = #{subtype},
+        #{subtype},
       </if>
 
       <if test="plevel!= null">
-        plevel = #{plevel},
+        #{plevel},
       </if>
 
       <if test="submitor!= null">
-        submitor = #{submitor},
+        #{submitor},
+      </if>
+
+
+      <if test="status!= null">
+        #{status},
+      </if>
+
+      <if test="path!= null">
+        #{path},
       </if>
 
       <if test="approver!= null">
-        approver = #{approver},
+        #{approver},
       </if>
 
       <if test="menuid!= null">
-        menuId = #{menuid},
+        #{menuid},
       </if>
 
       <if test="title!= null">
-        title = #{title},
+        #{title},
       </if>
 
       <if test="area!= null">
-        area = #{area},
+        #{area},
       </if>
 
       <if test="year!= null">
         #{year},
       </if>
+
     </trim>
+
   </insert>
 
 
diff --git a/src/main/resources/mapper/VfileMenuMapper.xml b/src/main/resources/mapper/VfileMenuMapper.xml
index 64a54eb..4bcca41 100644
--- a/src/main/resources/mapper/VfileMenuMapper.xml
+++ b/src/main/resources/mapper/VfileMenuMapper.xml
@@ -41,7 +41,7 @@
         select * from vfile_menu
         <trim prefix="where" prefixOverrides="and |or ">
             <if test="fileName != null">
-                and file_name = #{fileName}
+                and file_name  like #{fileName}
             </if>
             <if test="fileYear!=null">
                 and file_year = #{fileYear}
@@ -65,7 +65,7 @@
                 and menu_id = #{vfileMenu.menuId}
             </if>
             <if test="vfileMenu.fileName != null">
-                and file_name = #{vfileMenu.fileName}
+                and file_name like #{vfileMenu.fileName}
             </if>
             <if test="vfileMenu.fileYear!=null">
                 and file_year = #{vfileMenu.fileYear}
-- 
Gitee


From 419a577e825ef6e82aea78c5d1252f00fbe2f6c6 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Mon, 2 Nov 2020 12:19:39 +0800
Subject: [PATCH 08/26] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=92=8C=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cetc32/dh/controller/rest/FileSubmitController.java | 6 +++---
 .../com/cetc32/dh/controller/rest/VfileMenuController.java  | 1 +
 src/main/java/com/cetc32/dh/utils/FileUtil.java             | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index 2da45dc..e9eec8b 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -179,7 +179,7 @@ public class FileSubmitController {
             dataSubmit.setId(dataSubmit.getId()+sum);
         }
         if(sum==dataSubmit.getPathList().length){
-            return ResponseResult.success("所有数据提交成功！");
+            return ResponseResult.success("所有表单文件数据提交成功！");
         }
         return ResponseResult.error("数据提交失败！");
     }
@@ -196,9 +196,9 @@ public class FileSubmitController {
 //        String filepath = "/root/upLoad";
         String filepath = upLoadPath;
         String result = FileUtil.uploadFile(file,filepath);
-        if(result.equals("文件数据提交成功！"))
+        if(result!=null)
             return ResponseResult.success(result);
-        return ResponseResult.error(result);
+        return ResponseResult.error("文件上传失败!");
 
     }
 
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index e2b47d9..5a1e125 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -14,6 +14,7 @@ import com.cetc32.dh.entity.VfileMenu;
 import com.cetc32.dh.entity.Options;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.*;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index 509ebcb..53384ff 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -79,12 +79,12 @@ public class FileUtil {
                 out.flush();
                 return dirName;
             } catch (FileNotFoundException e) {
-                return "文件数据提交失败！"+e.getMessage();
+                return null;
             } catch (IOException e) {
-                return "文件数据提交失败！"+e.getMessage();
+                return null;
             }
         } else {
-            return "文件数据提交失败！" + "文件为空！";
+            return null;
         }
 
     }
-- 
Gitee


From 265bb798b3945ebd87e85b3441a2f6754871b1f7 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Wed, 4 Nov 2020 14:27:24 +0800
Subject: [PATCH 09/26] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java | 37 ++++++-------
 .../java/com/cetc32/dh/entity/DataSubmit.java | 22 ++++----
 .../java/com/cetc32/dh/utils/FileUtil.java    | 55 +++++++++++++------
 src/main/resources/application-dev.yml        |  4 +-
 src/main/resources/application-xwy.yml        |  4 +-
 src/main/resources/jdbc.properties            |  4 +-
 6 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index e9eec8b..29e9271 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -25,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 @RestController
@@ -159,46 +160,42 @@ public class FileSubmitController {
             @ApiImplicitParam(name="title",value ="标题",paramType = "body",dataType = "String",defaultValue = ""),
             @ApiImplicitParam(name="area",value ="区域",paramType = "body",dataType = "String",defaultValue = ""),
             @ApiImplicitParam(name="path",value ="提交路径(不传参)",paramType = "body",dataType = "String",defaultValue = ""),
-            @ApiImplicitParam(name="pathList",value ="文件路径list",paramType = "body",dataType = "List",defaultValue = "")
+
     })
     @PostMapping("/sub")
     public ResponseResult DataSub( @RequestBody DataSubmit dataSubmit){
-
-        System.out.println(dataSubmit.getPathList()[1]);
-
+//        dataSubmit.setPath("/root/upLoad/test7777");
+        if(dataSubmit.getPath()==null||dataSubmit.getPath().trim().equals("")){
+            return ResponseResult.error("未选择文件夹，表单信息提交失败！");
+        }
         dataSubmit.setSubtype("2");
         dataSubmit.setStatus(1);
         dataSubmit.setApprover("未审核");
-        int sum=0;
-        for(int i=0;i<dataSubmit.getPathList().length;i++){
-            DataSubmit dataSubmit_new = dataSubmit;
-            dataSubmit_new.setPath(dataSubmit.getPathList()[i].toString());
-            System.out.println(dataSubmit_new);
-            int count = dataSubmitService.insertDataSubmit(dataSubmit_new);
-            sum+=count;
-            dataSubmit.setId(dataSubmit.getId()+sum);
-        }
-        if(sum==dataSubmit.getPathList().length){
-            return ResponseResult.success("所有表单文件数据提交成功！");
+
+        Integer count = dataSubmitService.insertDataSubmit(dataSubmit);
+        System.out.println(count);
+        if(0 <= count){
+            return ResponseResult.error("表单信息提交成功！");
         }
-        return ResponseResult.error("数据提交失败！");
+        return ResponseResult.success("表单信息提交失败！");
     }
 
 
     /**
      * 目录/文件上传
-     * @param file 目录，文件
+     * @param files 目录，文件
      * @return 返回提交结果
      * */
     @ApiOperation(value="文件上传")
     @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
-    public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") MultipartFile file) {
+    @ApiImplicitParam(name="files",value ="文件路径list",paramType = "body",dataType = "List",defaultValue = "")
+    public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") @RequestBody MultipartFile[] files) {
 //        String filepath = "/root/upLoad";
         String filepath = upLoadPath;
-        String result = FileUtil.uploadFile(file,filepath);
+        String result = FileUtil.uploadFile(files,filepath);
         if(result!=null)
             return ResponseResult.success(result);
-        return ResponseResult.error("文件上传失败!");
+        return ResponseResult.error("文件夹上传失败!");
 
     }
 
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 9f34618..4d67bd8 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -13,7 +13,7 @@ public class DataSubmit {
      */
     private String subtype;
 
-    private String[] pathList;
+//    private String[] pathList;
 
     private Integer plevel;
 
@@ -65,16 +65,16 @@ public class DataSubmit {
         this.id = id;
     }
 
-    /**
-     * @param pathList
-     */
-    public void setPathList(String[] pathList) {
-        this.pathList = pathList;
-    }
-
-    public String[]  getPathList() {
-        return this.pathList;
-    }
+//    /**
+//     * @param pathList
+//     */
+//    public void setPathList(String[] pathList) {
+//        this.pathList = pathList;
+//    }
+//
+//    public String[]  getPathList() {
+//        return this.pathList;
+//    }
 
     /**
      * 获取'报送类型,外部接口上报或本地路径上报'
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index 53384ff..1dd8b58 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -12,6 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Map;
 
 public class FileUtil {
 
@@ -64,28 +65,46 @@ public class FileUtil {
 
     /**
      * 确保目录文件上传
-     * @param file
+     * @param files
      * @param  filepath
      */
-    public static String uploadFile(MultipartFile file, String filepath) {
-        String fileName = file.getOriginalFilename();//获取文件名
-        String dirName = filepath  + fileName ;
-        System.out.println(dirName);
-        makeDir(dirName);
-        if (!file.isEmpty()) {
-            try (BufferedOutputStream out = new BufferedOutputStream(
-                    new FileOutputStream(new File(filepath + File.separator + fileName)))) {
-                out.write(file.getBytes());
-                out.flush();
-                return dirName;
-            } catch (FileNotFoundException e) {
-                return null;
-            } catch (IOException e) {
-                return null;
-            }
-        } else {
+    public static String uploadFile(MultipartFile[] files, String filepath) {
+        System.out.println(files.length);
+        if(files.length==0){
             return null;
         }
+        int uploadsSum = 0;
+        String FileDir = null;
+        for(int i = 0;i<files.length;i++){
+            String flag = "";
+            MultipartFile file = files[i];
+            String fileName = file.getOriginalFilename();//获取文件名
+            String dirName = filepath  + fileName ;
+            FileDir =filepath+fileName.split("/")[0];
+            System.out.println(FileDir);
+            System.out.println(dirName);
+            makeDir(dirName);
+            if (!file.isEmpty()) {
+                try (BufferedOutputStream out = new BufferedOutputStream(
+                        new FileOutputStream(new File(filepath + File.separator + fileName)))) {
+                    out.write(file.getBytes());
+                    out.flush();
+                    flag = "文件上传成功";
+                } catch (FileNotFoundException e) {
+                    flag = "文件上传失败";
+                } catch (IOException e) {
+                    flag = "文件上传失败";
+                }
+            }
+            if(flag.equals("文件上传成功")){
+                uploadsSum++;
+            }
+        }
+        if(uploadsSum==files.length){
+            return FileDir;
+        }
+        return null;
+
 
     }
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index d31c181..db591a1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,9 +5,9 @@ spring:
   application:
     name: dhManager
   datasource:
-    url: jdbc:mysql://192.168.1.211:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
+    url: jdbc:mysql://192.168.1.60:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
     username: root
-    password: 123456
+    password: 123
     #    initial-size: 1
     #    min-idle: 1
     #    max-active: 20
diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml
index b46a6cb..a133f93 100644
--- a/src/main/resources/application-xwy.yml
+++ b/src/main/resources/application-xwy.yml
@@ -5,9 +5,9 @@ spring:
   application:
     name: dhManager
   datasource:
-    url: jdbc:mysql://192.168.1.211:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
+    url: jdbc:mysql://192.168.1.60:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
     username: root
-    password: 123456
+    password: 123
     #    initial-size: 1
     #    min-idle: 1
     #    max-active: 20
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index 63cfbc1..ef16def 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -1,8 +1,8 @@
-spring.datasource.url=jdbc:mysql://192.168.1.211:3306/dhmanage?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.1.60:3306/dhmanage?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
 #spring.datasource.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=123
 
 #Mybatis扫描
 mybatis.mapper-locations=classpath*:com/**/mapper/**.xml
-- 
Gitee


From 608beced0917c770dd621f3f3956e09333b19004 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Wed, 4 Nov 2020 16:38:22 +0800
Subject: [PATCH 10/26] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 8 ++++++++
 .../cetc32/dh/controller/rest/FileSubmitController.java   | 2 +-
 src/main/java/com/cetc32/dh/utils/FileUtil.java           | 2 --
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 23ddb6d..7c45048 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,7 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-cas</artifactId>
             <version>1.2.6</version>
+
         </dependency>
         <!--<dependency>
             <groupId>com.github.theborakompanioni</groupId>
@@ -189,6 +190,13 @@
             <artifactId>swagger-bootstrap-ui</artifactId>
             <version>1.8.7</version>
         </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.4</version>
+        </dependency>
+
         <!--swagger end-->
     </dependencies>
 
diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index 29e9271..f3cc0db 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -188,7 +188,7 @@ public class FileSubmitController {
      * */
     @ApiOperation(value="文件上传")
     @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
-    @ApiImplicitParam(name="files",value ="文件路径list",paramType = "body",dataType = "List",defaultValue = "")
+    @ApiImplicitParam(name="files",value ="文件夹下的文件list",paramType = "body",dataType = "List",defaultValue = "")
     public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") @RequestBody MultipartFile[] files) {
 //        String filepath = "/root/upLoad";
         String filepath = upLoadPath;
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index 1dd8b58..f74c831 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -104,8 +104,6 @@ public class FileUtil {
             return FileDir;
         }
         return null;
-
-
     }
 
 
-- 
Gitee


From d1d5baf0bbbb043e046afa24a3b406670ae9cd10 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Thu, 5 Nov 2020 18:00:16 +0800
Subject: [PATCH 11/26] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../response/GlobalExceptionHandler.java      |   2 +-
 .../controller/rest/VfileMenuController.java  | 375 +++++++++++++++---
 .../java/com/cetc32/dh/utils/FileUtil.java    |  73 +++-
 3 files changed, 384 insertions(+), 66 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java b/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java
index 00de9fa..85fc6a8 100644
--- a/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java
+++ b/src/main/java/com/cetc32/dh/common/response/GlobalExceptionHandler.java
@@ -31,7 +31,7 @@ import java.io.IOException;
  * @version: 1.0
  * @date: 2020/9/11 10:55
  */
-@RestControllerAdvice
+//@RestControllerAdvice
 public class GlobalExceptionHandler {
 
 
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 5a1e125..64228c8 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -10,19 +10,32 @@ package com.cetc32.dh.controller.rest;
 
 import com.cetc32.dh.common.response.PageDataResult;
 import com.cetc32.dh.common.response.ResponseResult;
-import com.cetc32.dh.entity.VfileMenu;
 import com.cetc32.dh.entity.Options;
+import com.cetc32.dh.entity.VfileMenu;
+import com.cetc32.dh.service.DataFileService;
+import com.cetc32.dh.service.OptionsService;
+import com.cetc32.dh.service.VfileMenuService;
+import com.cetc32.dh.utils.FileUtil;
 import com.github.pagehelper.PageHelper;
-import io.swagger.annotations.*;
-import io.swagger.models.auth.In;
+import com.sun.deploy.net.URLEncoder;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.util.Base64Util;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.cetc32.dh.service.VfileMenuService;
-import com.cetc32.dh.service.OptionsService;
-
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * 数据管理文件目录视图类
@@ -31,7 +44,7 @@ import java.util.*;
  * @date: 2020/10/14
  * 备注:无
  */
-@Api(value="Data File Info")
+@Api(value = "Data File Info")
 @Slf4j
 @RestController
 @RequestMapping("/rest/file/")
@@ -41,9 +54,12 @@ public class VfileMenuController {
     public VfileMenuService vfileMenuService;
     @Autowired
     public OptionsService optionsService;
+    @Autowired
+    public DataFileService dataFileService;
 
     /**
      * 根据目录节点id和文件安全性查询文件
+     *
      * @param pageNum
      * @param pageSize
      * @param fileSecurity
@@ -51,7 +67,7 @@ public class VfileMenuController {
      * 备注:无
      */
     @PostMapping("/queryByFileSecurityAndMenuId")
-    public PageDataResult queryByFileSecurityAndMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, String fileSecurity){
+    public PageDataResult queryByFileSecurityAndMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, Long menuId, String fileSecurity) {
         PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
@@ -59,14 +75,15 @@ public class VfileMenuController {
         if (pageSize == null || pageSize == 0)
             pageSize = 10;
 
-        pdr.setTotals(vfileMenuService.queryByFileSecurityAndMenuId(menuId,fileSecurity).size());
+        pdr.setTotals(vfileMenuService.queryByFileSecurityAndMenuId(menuId, fileSecurity).size());
         PageHelper.startPage(pageNum, pageSize);
-        pdr.setList(vfileMenuService.queryByFileSecurityAndMenuId(menuId,fileSecurity));
+        pdr.setList(vfileMenuService.queryByFileSecurityAndMenuId(menuId, fileSecurity));
         return pdr;
     }
 
     /**
      * 查询目录节点id下的文件
+     *
      * @param pageNum
      * @param pageSize
      * @param menuId
@@ -74,7 +91,7 @@ public class VfileMenuController {
      * 备注:无
      */
     @PostMapping("/queryFilesByMenuId")
-    public PageDataResult queryFilesByMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId){
+    public PageDataResult queryFilesByMenuId(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, Long menuId) {
         PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
@@ -91,6 +108,7 @@ public class VfileMenuController {
 
     /**
      * 根据目录节点id和文件时间查询文件
+     *
      * @param pageNum
      * @param pageSize
      * @param menuId
@@ -99,7 +117,7 @@ public class VfileMenuController {
      * 备注:无
      */
     @PostMapping("/queryFilesByTime")
-    public PageDataResult queryFilesByTime(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, Date time){
+    public PageDataResult queryFilesByTime(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, Long menuId, Date time) {
         PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
@@ -107,15 +125,16 @@ public class VfileMenuController {
         if (pageSize == null || pageSize == 0)
             pageSize = 10;
 
-        pdr.setTotals(vfileMenuService.queryFilesByTime(menuId,time).size());
+        pdr.setTotals(vfileMenuService.queryFilesByTime(menuId, time).size());
         PageHelper.startPage(pageNum, pageSize);
-        pdr.setList(vfileMenuService.queryFilesByTime(menuId,time));
+        pdr.setList(vfileMenuService.queryFilesByTime(menuId, time));
         return pdr;
 
     }
 
     /**
      * 根据目录节点id和文件区域查询文件
+     *
      * @param pageNum
      * @param pageSize
      * @param menuId
@@ -124,7 +143,7 @@ public class VfileMenuController {
      * 备注:无
      */
     @PostMapping("/queryFilesByRegion")
-    public PageDataResult queryFilesByRegion(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,Long menuId, String region){
+    public PageDataResult queryFilesByRegion(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, Long menuId, String region) {
         PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
@@ -132,15 +151,16 @@ public class VfileMenuController {
         if (pageSize == null || pageSize == 0)
             pageSize = 10;
 
-        pdr.setTotals(vfileMenuService.queryFilesByRegion(menuId,region).size());
+        pdr.setTotals(vfileMenuService.queryFilesByRegion(menuId, region).size());
         PageHelper.startPage(pageNum, pageSize);
-        pdr.setList(vfileMenuService.queryFilesByRegion(menuId,region));
+        pdr.setList(vfileMenuService.queryFilesByRegion(menuId, region));
         return pdr;
 
     }
 
     /**
      * 根据目录节点id、文件名字、文件年份、文件区域、文件类型和文件安全性查询文件
+     *
      * @param pageNum
      * @param pageSize
      * @param fileName
@@ -152,7 +172,7 @@ public class VfileMenuController {
      * 备注:无
      */
     @PostMapping("/queryFilesByChoose")
-    public PageDataResult queryFilesByChoose(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,String fileName, Integer fileYear,String region,String fileType,String fileSecurity){
+    public PageDataResult queryFilesByChoose(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, String fileName, Integer fileYear, String region, String fileType, String fileSecurity) {
         PageDataResult pdr = new PageDataResult();
         if (pageNum == null || pageNum == 0) {
             pageNum = 1;
@@ -160,34 +180,35 @@ public class VfileMenuController {
         if (pageSize == null || pageSize == 0)
             pageSize = 10;
 
-        pdr.setTotals(vfileMenuService.queryFilesByChoose(fileName,fileYear,region,fileType,fileSecurity).size());
+        pdr.setTotals(vfileMenuService.queryFilesByChoose(fileName, fileYear, region, fileType, fileSecurity).size());
         PageHelper.startPage(pageNum, pageSize);
-        pdr.setList(vfileMenuService.queryFilesByChoose(fileName,fileYear,region,fileType,fileSecurity));
+        pdr.setList(vfileMenuService.queryFilesByChoose(fileName, fileYear, region, fileType, fileSecurity));
         return pdr;
 
     }
 
     /**
      * 根据目录节点id和文件视图对象查询文件
+     *
      * @param vfileMenu
      * @return pdr
      * 备注:无
      */
-    @ApiOperation(value="查询所有数据接口",notes="至少传入page，和current两个参数")
+    @ApiOperation(value = "查询所有数据接口", notes = "至少传入page，和current两个参数")
     @ApiImplicitParams({
-            @ApiImplicitParam(name="page",value ="页码",paramType = "body",dataType = "Integer",required =true,defaultValue = "1"),
-            @ApiImplicitParam(name="results",value ="每页数据条数",paramType = "body",dataType = "Integer",required =true,defaultValue = "10"),
-            @ApiImplicitParam(name="fileName",value ="文件名称",paramType = "body",defaultValue = ""),
-            @ApiImplicitParam(name="fileYear",value ="文件年份",paramType = "body",dataType = "Integer",defaultValue = ""),
-            @ApiImplicitParam(name="fileType",value ="文件类型",paramType = "body",defaultValue = ""),
-            @ApiImplicitParam(name="fileSecurity",value ="文件安全等级",paramType = "body",dataType = "Integer",defaultValue = ""),
-            @ApiImplicitParam(name="region",value ="文件区域",paramType = "body",defaultValue = ""),
-            @ApiImplicitParam(name="menuId",value ="目录节点",paramType = "body",dataType = "Integer",defaultValue = "")
+            @ApiImplicitParam(name = "page", value = "页码", paramType = "body", dataType = "Integer", required = true, defaultValue = "1"),
+            @ApiImplicitParam(name = "results", value = "每页数据条数", paramType = "body", dataType = "Integer", required = true, defaultValue = "10"),
+            @ApiImplicitParam(name = "fileName", value = "文件名称", paramType = "body", defaultValue = ""),
+            @ApiImplicitParam(name = "fileYear", value = "文件年份", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "body", defaultValue = ""),
+            @ApiImplicitParam(name = "fileSecurity", value = "文件安全等级", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "region", value = "文件区域", paramType = "body", defaultValue = ""),
+            @ApiImplicitParam(name = "menuId", value = "目录节点", paramType = "body", dataType = "Integer", defaultValue = "")
     })
     @PostMapping("/find")
-    public PageDataResult queryFilesByObj(@RequestBody VfileMenu vfileMenu){
-        Integer page=vfileMenu.getPage();
-        Integer results=vfileMenu.getResults();
+    public PageDataResult queryFilesByObj(@RequestBody VfileMenu vfileMenu) {
+        Integer page = vfileMenu.getPage();
+        Integer results = vfileMenu.getResults();
 
         if (page == null || page <= 0) {
             page = 1;
@@ -195,80 +216,320 @@ public class VfileMenuController {
         if (results == null || results <= 0)
             results = 10;
 
-        int offset=(page - 1) * results;
+        int offset = (page - 1) * results;
 
         return new PageDataResult(vfileMenuService.countFilesByObj(vfileMenu),
-                vfileMenuService.queryFilesByObj(offset,results,vfileMenu),
+                vfileMenuService.queryFilesByObj(offset, results, vfileMenu),
                 offset);
 
     }
 
-    /**查询数据库中所有的不同年份
+    /**
+     * 查询数据库中所有的不同年份
+     *
      * @return List<Integer>
      */
-    @ApiOperation(value="查询所有年份",notes="不需要传参数")
+    @ApiOperation(value = "查询所有年份", notes = "不需要传参数")
     @PostMapping("/AllYear")
     //@RequestMapping(value="/AllYear",method = RequestMethod.POST)
-    public ResponseResult distinctAllYear(){
+    public ResponseResult distinctAllYear() {
         List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllYear();
         List<Integer> yearList = new ArrayList<Integer>();
-        for(int i=0;i<vfileMenuList.size();i++){
+        for (int i = 0; i < vfileMenuList.size(); i++) {
             yearList.add(vfileMenuList.get(i).getFileYear());
         }
         Collections.sort(yearList);
         Collections.reverse(yearList);
-        List<String> resultList =new ArrayList<String>();
+        List<String> resultList = new ArrayList<String>();
         resultList.add("全部年份");
-        for(int i=0;i<yearList.size();i++){
+        for (int i = 0; i < yearList.size(); i++) {
             resultList.add(yearList.get(i).toString());
         }
 
         return ResponseResult.success(resultList);
     }
 
-    /**查询数据库中所有的不同区域
+    /**
+     * 查询数据库中所有的不同区域
+     *
      * @return List<String>
      */
-    @ApiOperation(value="查询所有区域",notes="不需要传参数")
+    @ApiOperation(value = "查询所有区域", notes = "不需要传参数")
     @PostMapping("/AllRegion")
-    public ResponseResult distinctAllRegion(){
+    public ResponseResult distinctAllRegion() {
         List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllRegion();
         List<String> regionList = new ArrayList<String>();
 
-        for(int i=0;i<vfileMenuList.size();i++){
+        for (int i = 0; i < vfileMenuList.size(); i++) {
             regionList.add(vfileMenuList.get(i).getRegion());
         }
         Collections.sort(regionList);
 
-        List<String> resultList =new ArrayList<String>();
+        List<String> resultList = new ArrayList<String>();
         resultList.add("全部区域");
-        for(int i=0;i<regionList.size();i++){
+        for (int i = 0; i < regionList.size(); i++) {
             resultList.add(regionList.get(i));
         }
 
         return ResponseResult.success(resultList);
     }
 
-    /**查询数据库中所有的不同文件类型
+    /**
+     * 查询数据库中所有的不同文件类型
+     *
      * @return List<String>
      */
-    @ApiOperation(value="查询文件类型",notes="不需要传参数")
+    @ApiOperation(value = "查询文件类型", notes = "不需要传参数")
     @PostMapping("/AllFtype")
-    public ResponseResult optFType(){
+    public ResponseResult optFType() {
         List<Options> optionsList = optionsService.selectByCategory("file_type");
-        List<Map> hashMapList=new ArrayList<>();
-        Map<String,String> hashmap = new HashMap<>();
-        hashmap.put("value","全部类型");
-        hashmap.put("label","全部类型");
+        List<Map> hashMapList = new ArrayList<>();
+        Map<String, String> hashmap = new HashMap<>();
+        hashmap.put("value", "全部类型");
+        hashmap.put("label", "全部类型");
         hashMapList.add(hashmap);
-        for(int i=0;i<optionsList.size();i++){
-            Map<String,String> hashmap2 = new HashMap<>();
-            hashmap2.put("value",optionsList.get(i).getValue());
-            hashmap2.put("label",optionsList.get(i).getValueName());
+        for (int i = 0; i < optionsList.size(); i++) {
+            Map<String, String> hashmap2 = new HashMap<>();
+            hashmap2.put("value", optionsList.get(i).getValue());
+            hashmap2.put("label", optionsList.get(i).getValueName());
             hashMapList.add(hashmap2);
         }
         return ResponseResult.success(hashMapList);
     }
 
+//    /**
+//     * 查询数据库中所有的不同文件类型
+//     * //     * @param download
+//     *
+//     * @return List<String>
+//     */
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
+////                @ApiImplicitParam(name="savePath",value ="文件下载保存路径",paramType = "body",dataType = "String"),
+//    })
+//    @PostMapping("/downloadFiles")
+//    public ResponseResult downloadFiles(@RequestBody String fileIds) {
+////        Long fileId=15L;
+////        List<MultipartFile>  multipartFileList = new ArrayList<MultipartFile>();
+//        String clientIp = "";
+//        HttpServletRequest request = null;
+//        try {
+//            request =
+//                    ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+//        } catch (Exception e) {
+//            System.out.println("Can not get current IP.");
+//        }
+//        clientIp = request.getRemoteAddr().toString();
+//        System.out.println(clientIp);
+//        String savePath = clientIp + "/root/downLoad";
+//        System.out.println(savePath);
+//        List<String> results = new ArrayList<>();
+////        for(int i=0;i<fileIds.length;i++) {
+//        Long fileId = Long.parseLong(fileIds);
+//        String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+//        System.out.println(fileName);
+//        String res = FileUtil.downloadFile(fileName, savePath);
+//        results.add(res);
+////        }
+//
+//        return ResponseResult.success(results);
+//    }
+
+    /**
+     * 查询数据库中所有的不同文件类型
+     * //     * @param download
+     *
+     * @return List<String>
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "String"),
+//                @ApiImplicitParam(name="savePath",value ="文件下载保存路径",paramType = "body",dataType = "String"),
+    })
+    @RequestMapping("/downloadOneFile")
+    public String downloadAlone(@RequestBody String fileIds, HttpServletRequest request, HttpServletResponse response) {
+        Long fileId = Long.parseLong(fileIds);
+        String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+        File file = new File(fileName);
+        System.out.println(fileName);
+        if (!file.exists()) {
+            System.out.println("文件 :" + File.separator + dataFileService.queryById(fileId).getFileName() + "不存在!");
+        }
+
+        // 配置文件下载
+        response.setHeader("content-type", "application/octet-stream");
+        response.setContentType("application/octet-stream");
+        // 下载文件能正常显示中文
+        try {
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(dataFileService.queryById(fileId).getFileName(), "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+//        response.setHeader("Content-Disposition",
+//                "attachment;filename=" + new String(fileName.getBytes(ENCODING), "ISO8859-1"));
+        // 实现文件下载
+        byte[] buffer = new byte[1024];
+        FileInputStream fis = null;
+        BufferedInputStream bis = null;
+        try {
+            fis = new FileInputStream(file);
+            bis = new BufferedInputStream(fis);
+            OutputStream os = response.getOutputStream();
+            int i = bis.read(buffer);
+            while (i != -1) {
+                os.write(buffer, 0, i);
+                i = bis.read(buffer);
+            }
+            System.out.println("Download  successfully!");
+            return dataFileService.queryById(fileId).getFileName() + "下载成功！";
+
+        } catch (Exception e) {
+            System.out.println("Download  failed!");
+            return dataFileService.queryById(fileId).getFileName() + "下载失败！";
+
+        } finally {
+            if (bis != null) {
+                try {
+                    bis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
 
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileIds1", value = "文件id", paramType = "body", dataType = "String"),
+//            @ApiImplicitParam(name = "fileIds2", value = "文件id", paramType = "body", dataType = "String"),
+//                @ApiImplicitParam(name="savePath",value ="文件下载保存路径",paramType = "body",dataType = "String"),
+    })
+    @GetMapping("/downloadMulFile")
+    public void downloadMulFile(String fileIds,String f,HttpServletResponse response) {
+        System.out.println("-------------111---------------" + fileIds);
+
+        String directory = "/root/load";
+        File directoryFile = new File(directory);
+        if (!directoryFile.isDirectory() && !directoryFile.exists()) {
+            directoryFile.mkdirs();
+        }
+        //设置最终输出zip文件的目录+文件名
+
+        String zipFileName = "下载" + ".zip";
+        String strZipPath = directory + "/" + zipFileName;
+
+        ZipOutputStream zipStream = null;
+        FileInputStream zipSource = null;
+        BufferedInputStream bufferStream = null;
+        File zipFile = new File(strZipPath);
+        List<String> filesName = new ArrayList<>();
+        Long Id1 = Long.parseLong(fileIds);
+        String filename = dataFileService.queryById(Id1).getFilePath() + File.separator + dataFileService.queryById(Id1).getFileName();
+        filesName.add(filename);
+        Long Id2 = Long.parseLong(f.trim());
+        String filename2 = dataFileService.queryById(Id2).getFilePath() + File.separator + dataFileService.queryById(Id2).getFileName();
+        System.out.println(filename2);
+        filesName.add(filename2);
+        System.out.println("-------------3222--------------" + fileIds);
+        try {
+            //构造最终压缩包的输出流
+            zipStream = new ZipOutputStream(new FileOutputStream(zipFile));
+            for (int i = 0; i < filesName.size(); i++) {
+                //解码获取真实路径与文件名
+                String realFilePath = java.net.URLDecoder.decode(filesName.get(i), "UTF-8");
+                System.out.println(filesName.get(i));
+                System.out.println(realFilePath);
+                File file = new File(realFilePath);
+                //TODO:未对文件不存在时进行操作，后期优化。
+                if (file.exists()) {
+                    zipSource = new FileInputStream(file);//将需要压缩的文件格式化为输入流
+                    /**
+                     * 压缩条目不是具体独立的文件，而是压缩包文件列表中的列表项，称为条目，就像索引一样这里的name就是文件名,
+                     * 文件名和之前的重复就会导致文件被覆盖
+                     */
+                    ZipEntry zipEntry = new ZipEntry(filesName.get(i));//在压缩目录中文件的名字
+                    zipStream.putNextEntry(zipEntry);//定位该压缩条目位置，开始写入文件到压缩包中
+                    bufferStream = new BufferedInputStream(zipSource, 1024 * 10);
+                    int read = 0;
+                    byte[] buf = new byte[1024 * 10];
+                    while ((read = bufferStream.read(buf, 0, 1024 * 10)) != -1) {
+                        zipStream.write(buf, 0, read);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            //关闭流
+            try {
+                if (null != bufferStream) bufferStream.close();
+                if (null != zipStream) {
+                    zipStream.flush();
+                    zipStream.close();
+                }
+                if (null != zipSource) zipSource.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        //判断系统压缩文件是否存在：true-把该压缩文件通过流输出给客户端后删除该压缩文件  false-未处理
+        if (zipFile.exists()) {
+            System.out.println(zipFileName);
+            System.out.println(strZipPath);
+            downImg(response, zipFileName, strZipPath);
+//            zipFile.delete();
+        }
+
+    }
+
+
+    public void downImg(HttpServletResponse response,String filename,String path ){
+        if (filename != null) {
+            FileInputStream is = null;
+            BufferedInputStream bs = null;
+            OutputStream os = null;
+            try {
+                File file = new File(path);
+                if (file.exists()) {
+                    //设置Headers
+                    response.setHeader("Content-Type","application/octet-stream");
+                    //设置下载的文件的名称-该方式已解决中文乱码问题
+                    response.setHeader("Content-Disposition","attachment;filename=" +  new String( filename.getBytes("gb2312"), "ISO8859-1" ));
+                    is = new FileInputStream(file);
+                    bs =new BufferedInputStream(is);
+                    os = response.getOutputStream();
+                    byte[] buffer = new byte[1024];
+                    int len = 0;
+                    while((len = bs.read(buffer)) != -1){
+                        os.write(buffer,0,len);
+                    }
+                }else{
+                    String error = Base64Util.encode("下载的文件资源不存在");
+                }
+            }catch(IOException ex){
+                ex.printStackTrace();
+            }finally {
+                try{
+                    if(is != null){
+                        is.close();
+                    }
+                    if( bs != null ){
+                        bs.close();
+                    }
+                    if( os != null){
+                        os.flush();
+                        os.close();
+                    }
+                }catch (IOException e){
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
 }
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index f74c831..376a8fa 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -1,6 +1,7 @@
 package com.cetc32.dh.utils;
 
 import com.cetc32.dh.common.response.ResponseResult;
+import com.sun.xml.internal.fastinfoset.tools.FI_DOM_Or_XML_DOM_SAX_SAXEvent;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.http.entity.ContentType;
@@ -18,13 +19,14 @@ public class FileUtil {
 
     /**
      * 在basePath下保存上传的文件夹
+     *
      * @param basePath
      * @param files
      */
     public static void saveMultiFile(String basePath, MultipartFile[] files) {
 
         if (files == null || files.length == 0) {
-            if(files==null){
+            if (files == null) {
                 System.out.println("files为空！！");
                 return;
             }
@@ -50,6 +52,7 @@ public class FileUtil {
 
     /**
      * 确保目录存在，不存在则创建
+     *
      * @param filePath
      */
     private static void makeDir(String filePath) {
@@ -65,22 +68,23 @@ public class FileUtil {
 
     /**
      * 确保目录文件上传
+     *
      * @param files
-     * @param  filepath
+     * @param filepath
      */
     public static String uploadFile(MultipartFile[] files, String filepath) {
         System.out.println(files.length);
-        if(files.length==0){
+        if (files.length == 0) {
             return null;
         }
         int uploadsSum = 0;
         String FileDir = null;
-        for(int i = 0;i<files.length;i++){
+        for (int i = 0; i < files.length; i++) {
             String flag = "";
             MultipartFile file = files[i];
             String fileName = file.getOriginalFilename();//获取文件名
-            String dirName = filepath  + fileName ;
-            FileDir =filepath+fileName.split("/")[0];
+            String dirName = filepath + fileName;
+            FileDir = filepath + fileName.split("/")[0];
             System.out.println(FileDir);
             System.out.println(dirName);
             makeDir(dirName);
@@ -96,16 +100,69 @@ public class FileUtil {
                     flag = "文件上传失败";
                 }
             }
-            if(flag.equals("文件上传成功")){
+            if (flag.equals("文件上传成功")) {
                 uploadsSum++;
             }
         }
-        if(uploadsSum==files.length){
+        if (uploadsSum == files.length) {
             return FileDir;
         }
         return null;
     }
 
+    public static String downloadFile(String fileName, String savepath) {
+        System.out.println(fileName);
+//        File readerfile = new File(fileName);
+        String readerfile = fileName;
+        String outFile = savepath +  File.separator +fileName.split("/")[fileName.split("/").length-1];
+        makeDir(outFile);
+//        File writerfile = new File(outFile);
+        String writerfile =outFile;
+
+        FileInputStream fileInputStream = null;
+        BufferedInputStream bufferedInputStream = null;
+        FileOutputStream fileOutputStream = null;
+        BufferedOutputStream bufferedOutputStream = null;
+        try {
+            // 将读取文件对象加载进字符读取对象中
+            fileInputStream = new FileInputStream(readerfile);
+            // 将字符读取对象加载进字符读取缓冲流对象
+            bufferedInputStream = new BufferedInputStream(fileInputStream);
+            // 将写入的文件对象加载进字符写入对象中
+            fileOutputStream = new FileOutputStream(writerfile);
+            // 将字符写入对象加载进字符写入缓冲流对象中
+            bufferedOutputStream = new BufferedOutputStream(fileOutputStream);
+            // 按行获取读取缓冲流中的数据
+            int bytes=-1;
+
+            while ((bytes = bufferedInputStream.read())!=-1) {
+                bufferedOutputStream.write(bytes);
+            }
+            return (fileName.split("/")[fileName.split("/").length-1]+"下载成功！");
+        } catch (IOException e) {
+            e.printStackTrace();
+            return fileName.split("/")[fileName.split("/").length-1]+"下载失败！";
+        } finally {
+            // 关闭文件流对象
+            try {
+                if (bufferedInputStream != null)
+                    bufferedInputStream.close();
+                if (bufferedOutputStream != null)
+                    bufferedOutputStream.close();
+                if (fileOutputStream != null)
+                    fileOutputStream.close();
+                if (fileInputStream != null)
+                    fileInputStream.close();
+            } catch (IOException e2) {
+                e2.printStackTrace();
+                return fileName.split("/")[fileName.split("/").length-1]+"下载失败！";
+            }
+        }
+
+    }
+
+
+
 
     /**
      * 文件名后缀前添加一个时间戳
-- 
Gitee


From d69be50028d6d2bc641ab65791cbfc5a28a7e767 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Fri, 6 Nov 2020 12:44:41 +0800
Subject: [PATCH 12/26] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=92=8C=E6=89=B9=E9=87=8F=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java |  33 ++--
 .../controller/rest/VfileMenuController.java  | 151 ++++++++++--------
 .../java/com/cetc32/dh/entity/DataSubmit.java |  22 +--
 .../java/com/cetc32/dh/utils/FileUtil.java    |   2 +-
 4 files changed, 122 insertions(+), 86 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index f3cc0db..d611482 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -165,16 +165,29 @@ public class FileSubmitController {
     @PostMapping("/sub")
     public ResponseResult DataSub( @RequestBody DataSubmit dataSubmit){
 //        dataSubmit.setPath("/root/upLoad/test7777");
-        if(dataSubmit.getPath()==null||dataSubmit.getPath().trim().equals("")){
-            return ResponseResult.error("未选择文件夹，表单信息提交失败！");
-        }
+//        if(dataSubmit.getPath()==null||dataSubmit.getPath().trim().equals("")){
+//            return ResponseResult.error("未选择文件夹，表单信息提交失败！");
+//        }
+        System.out.println(dataSubmit.getPathList().length);
+        Integer count =0;
         dataSubmit.setSubtype("2");
         dataSubmit.setStatus(1);
         dataSubmit.setApprover("未审核");
-
-        Integer count = dataSubmitService.insertDataSubmit(dataSubmit);
-        System.out.println(count);
-        if(0 <= count){
+        DataSubmit dataSubmit_new =dataSubmit;
+        DataSubmit dataSubmit_new2 =dataSubmit;
+        for(int i=0;i<dataSubmit.getPathList().length;i++){
+            if(dataSubmit.getPathList()[i].equals("文件上传失败!")){
+                continue;
+            }
+            dataSubmit_new.setPath(dataSubmit.getPathList()[i]);
+            if(dataSubmitService.insertDataSubmit(dataSubmit_new)>=0){
+                count++;
+            }
+            dataSubmit_new2=dataSubmit_new;
+            dataSubmit_new2.setId(dataSubmit_new.getId()+i+1);
+            dataSubmit_new.setId(dataSubmit_new2.getId());
+        }
+        if(count==dataSubmit.getPathList().length){
             return ResponseResult.error("表单信息提交成功！");
         }
         return ResponseResult.success("表单信息提交失败！");
@@ -183,16 +196,16 @@ public class FileSubmitController {
 
     /**
      * 目录/文件上传
-     * @param files 目录，文件
+     * @param file 目录，文件
      * @return 返回提交结果
      * */
     @ApiOperation(value="文件上传")
     @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
     @ApiImplicitParam(name="files",value ="文件夹下的文件list",paramType = "body",dataType = "List",defaultValue = "")
-    public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") @RequestBody MultipartFile[] files) {
+    public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") @RequestBody MultipartFile[] file) {
 //        String filepath = "/root/upLoad";
         String filepath = upLoadPath;
-        String result = FileUtil.uploadFile(files,filepath);
+        String result = FileUtil.uploadFile(file,filepath);
         if(result!=null)
             return ResponseResult.success(result);
         return ResponseResult.error("文件夹上传失败!");
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 64228c8..242e902 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -308,45 +308,45 @@ public class VfileMenuController {
 ////                @ApiImplicitParam(name="savePath",value ="文件下载保存路径",paramType = "body",dataType = "String"),
 //    })
 //    @PostMapping("/downloadFiles")
-//    public ResponseResult downloadFiles(@RequestBody String fileIds) {
-////        Long fileId=15L;
-////        List<MultipartFile>  multipartFileList = new ArrayList<MultipartFile>();
-//        String clientIp = "";
-//        HttpServletRequest request = null;
-//        try {
-//            request =
-//                    ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
-//        } catch (Exception e) {
-//            System.out.println("Can not get current IP.");
+    public ResponseResult downloadFiles(@RequestBody String fileIds) {
+//        Long fileId=15L;
+//        List<MultipartFile>  multipartFileList = new ArrayList<MultipartFile>();
+        String clientIp = "";
+        HttpServletRequest request = null;
+        try {
+            request =
+                    ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+        } catch (Exception e) {
+            System.out.println("Can not get current IP.");
+        }
+        clientIp = request.getRemoteAddr().toString();
+        System.out.println(clientIp);
+        String savePath = clientIp + "/root/downLoad";
+        System.out.println(savePath);
+        List<String> results = new ArrayList<>();
+//        for(int i=0;i<fileIds.length;i++) {
+        Long fileId = Long.parseLong(fileIds);
+        String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+        System.out.println(fileName);
+        String res = FileUtil.downloadFile(fileName, savePath);
+        results.add(res);
 //        }
-//        clientIp = request.getRemoteAddr().toString();
-//        System.out.println(clientIp);
-//        String savePath = clientIp + "/root/downLoad";
-//        System.out.println(savePath);
-//        List<String> results = new ArrayList<>();
-////        for(int i=0;i<fileIds.length;i++) {
-//        Long fileId = Long.parseLong(fileIds);
-//        String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
-//        System.out.println(fileName);
-//        String res = FileUtil.downloadFile(fileName, savePath);
-//        results.add(res);
-////        }
-//
-//        return ResponseResult.success(results);
-//    }
 
-    /**
-     * 查询数据库中所有的不同文件类型
-     * //     * @param download
-     *
-     * @return List<String>
-     */
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "String"),
-//                @ApiImplicitParam(name="savePath",value ="文件下载保存路径",paramType = "body",dataType = "String"),
-    })
-    @RequestMapping("/downloadOneFile")
-    public String downloadAlone(@RequestBody String fileIds, HttpServletRequest request, HttpServletResponse response) {
+        return ResponseResult.success(results);
+    }
+
+//    /**
+//     * 查询数据库中所有的不同文件类型
+//     * //     * @param download
+//     *
+//     * @return List<String>
+//     */
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "String"),
+////                @ApiImplicitParam(name="savePath",value ="文件下载保存路径",paramType = "body",dataType = "String"),
+//    })
+//    @RequestMapping("/downloadOneFile")
+    public String downloadAlone(String fileIds, HttpServletResponse response) {
         Long fileId = Long.parseLong(fileIds);
         String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
         File file = new File(fileName);
@@ -355,15 +355,20 @@ public class VfileMenuController {
             System.out.println("文件 :" + File.separator + dataFileService.queryById(fileId).getFileName() + "不存在!");
         }
 
-        // 配置文件下载
-        response.setHeader("content-type", "application/octet-stream");
-        response.setContentType("application/octet-stream");
-        // 下载文件能正常显示中文
+        response.setHeader("Content-Type","application/octet-stream");
+        //设置下载的文件的名称-该方式已解决中文乱码问题
         try {
-            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(dataFileService.queryById(fileId).getFileName(), "UTF-8"));
+            response.setHeader("Content-Disposition","attachment;filename=" +  new String( dataFileService.queryById(fileId).getFileName().getBytes("gb2312"), "ISO8859-1" ));
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
+
+        // 下载文件能正常显示中文
+//        try {
+//            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(dataFileService.queryById(fileId).getFileName(), "UTF-8"));
+//        } catch (UnsupportedEncodingException e) {
+//            e.printStackTrace();
+//        }
 //        response.setHeader("Content-Disposition",
 //                "attachment;filename=" + new String(fileName.getBytes(ENCODING), "ISO8859-1"));
         // 实现文件下载
@@ -406,44 +411,55 @@ public class VfileMenuController {
 
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "fileIds1", value = "文件id", paramType = "body", dataType = "String"),
+            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
 //            @ApiImplicitParam(name = "fileIds2", value = "文件id", paramType = "body", dataType = "String"),
 //                @ApiImplicitParam(name="savePath",value ="文件下载保存路径",paramType = "body",dataType = "String"),
     })
     @GetMapping("/downloadMulFile")
-    public void downloadMulFile(String fileIds,String f,HttpServletResponse response) {
-        System.out.println("-------------111---------------" + fileIds);
+    public String downloadMulFile(String[] fileIds,HttpServletResponse response) {
 
+        if(fileIds.length==1){
+            Long fileId =Long.parseLong(fileIds[0]);
+            String fileName= dataFileService.queryById(fileId).getFileName();
+            String filePath=dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+            downloadFile(response,fileName,filePath);
+        }
+
+        String message= null;
         String directory = "/root/load";
         File directoryFile = new File(directory);
         if (!directoryFile.isDirectory() && !directoryFile.exists()) {
             directoryFile.mkdirs();
         }
         //设置最终输出zip文件的目录+文件名
-
-        String zipFileName = "下载" + ".zip";
+        String zipFileName = "已下载文件" + ".zip";
         String strZipPath = directory + "/" + zipFileName;
+        File zipFile = new File(strZipPath);
+        //读取需要压缩的文件
+        Long fileId =null;
+        String fileName=null;
+
+        List<String> fileNames = new ArrayList<>();
+        for(int i=0;i<fileIds.length;i++){
+            fileId = Long.parseLong(fileIds[i]);
+            if(dataFileService.queryById(fileId)!=null){
+                fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+                fileNames.add(fileName);
+            }
+        }
+
+//        System.out.println("-------------3222--------------" + fileIds);
 
         ZipOutputStream zipStream = null;
         FileInputStream zipSource = null;
         BufferedInputStream bufferStream = null;
-        File zipFile = new File(strZipPath);
-        List<String> filesName = new ArrayList<>();
-        Long Id1 = Long.parseLong(fileIds);
-        String filename = dataFileService.queryById(Id1).getFilePath() + File.separator + dataFileService.queryById(Id1).getFileName();
-        filesName.add(filename);
-        Long Id2 = Long.parseLong(f.trim());
-        String filename2 = dataFileService.queryById(Id2).getFilePath() + File.separator + dataFileService.queryById(Id2).getFileName();
-        System.out.println(filename2);
-        filesName.add(filename2);
-        System.out.println("-------------3222--------------" + fileIds);
         try {
             //构造最终压缩包的输出流
             zipStream = new ZipOutputStream(new FileOutputStream(zipFile));
-            for (int i = 0; i < filesName.size(); i++) {
+            for (int i = 0; i < fileNames.size(); i++) {
                 //解码获取真实路径与文件名
-                String realFilePath = java.net.URLDecoder.decode(filesName.get(i), "UTF-8");
-                System.out.println(filesName.get(i));
+                String realFilePath = java.net.URLDecoder.decode(fileNames.get(i), "UTF-8");
+//                System.out.println(fileNames.get(i));
                 System.out.println(realFilePath);
                 File file = new File(realFilePath);
                 //TODO:未对文件不存在时进行操作，后期优化。
@@ -453,7 +469,7 @@ public class VfileMenuController {
                      * 压缩条目不是具体独立的文件，而是压缩包文件列表中的列表项，称为条目，就像索引一样这里的name就是文件名,
                      * 文件名和之前的重复就会导致文件被覆盖
                      */
-                    ZipEntry zipEntry = new ZipEntry(filesName.get(i));//在压缩目录中文件的名字
+                    ZipEntry zipEntry = new ZipEntry("("+i+")"+fileNames.get(i).split("/")[fileNames.get(i).split("/").length-1]);//在压缩目录中文件的名字
                     zipStream.putNextEntry(zipEntry);//定位该压缩条目位置，开始写入文件到压缩包中
                     bufferStream = new BufferedInputStream(zipSource, 1024 * 10);
                     int read = 0;
@@ -461,6 +477,9 @@ public class VfileMenuController {
                     while ((read = bufferStream.read(buf, 0, 1024 * 10)) != -1) {
                         zipStream.write(buf, 0, read);
                     }
+                }else{
+                    message=message+file.getName()+"不存在！"+"\n";
+                    System.out.println(file.getName()+"不存在！");
                 }
             }
         } catch (Exception e) {
@@ -482,14 +501,18 @@ public class VfileMenuController {
         if (zipFile.exists()) {
             System.out.println(zipFileName);
             System.out.println(strZipPath);
-            downImg(response, zipFileName, strZipPath);
-//            zipFile.delete();
+            downloadFile(response, zipFileName, strZipPath);
+            zipFile.delete();
+        }
+        if(message==null){
+            message="全部文件下载成功！";
         }
+        return message;
 
     }
 
 
-    public void downImg(HttpServletResponse response,String filename,String path ){
+    public void downloadFile(HttpServletResponse response,String filename,String path ){
         if (filename != null) {
             FileInputStream is = null;
             BufferedInputStream bs = null;
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 4d67bd8..9f34618 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -13,7 +13,7 @@ public class DataSubmit {
      */
     private String subtype;
 
-//    private String[] pathList;
+    private String[] pathList;
 
     private Integer plevel;
 
@@ -65,16 +65,16 @@ public class DataSubmit {
         this.id = id;
     }
 
-//    /**
-//     * @param pathList
-//     */
-//    public void setPathList(String[] pathList) {
-//        this.pathList = pathList;
-//    }
-//
-//    public String[]  getPathList() {
-//        return this.pathList;
-//    }
+    /**
+     * @param pathList
+     */
+    public void setPathList(String[] pathList) {
+        this.pathList = pathList;
+    }
+
+    public String[]  getPathList() {
+        return this.pathList;
+    }
 
     /**
      * 获取'报送类型,外部接口上报或本地路径上报'
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index 376a8fa..731b870 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -84,7 +84,7 @@ public class FileUtil {
             MultipartFile file = files[i];
             String fileName = file.getOriginalFilename();//获取文件名
             String dirName = filepath + fileName;
-            FileDir = filepath + fileName.split("/")[0];
+            FileDir = filepath + fileName;
             System.out.println(FileDir);
             System.out.println(dirName);
             makeDir(dirName);
-- 
Gitee


From 370ac862c7ae05916981fec8ab2e92101841a597 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Fri, 6 Nov 2020 12:55:05 +0800
Subject: [PATCH 13/26] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=92=8C=E6=89=B9=E9=87=8F=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/VfileMenuController.java  | 244 +++++++-----------
 .../java/com/cetc32/dh/utils/FileUtil.java    |  50 +++-
 2 files changed, 142 insertions(+), 152 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 242e902..e91d938 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -297,118 +297,6 @@ public class VfileMenuController {
         return ResponseResult.success(hashMapList);
     }
 
-//    /**
-//     * 查询数据库中所有的不同文件类型
-//     * //     * @param download
-//     *
-//     * @return List<String>
-//     */
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
-////                @ApiImplicitParam(name="savePath",value ="文件下载保存路径",paramType = "body",dataType = "String"),
-//    })
-//    @PostMapping("/downloadFiles")
-    public ResponseResult downloadFiles(@RequestBody String fileIds) {
-//        Long fileId=15L;
-//        List<MultipartFile>  multipartFileList = new ArrayList<MultipartFile>();
-        String clientIp = "";
-        HttpServletRequest request = null;
-        try {
-            request =
-                    ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
-        } catch (Exception e) {
-            System.out.println("Can not get current IP.");
-        }
-        clientIp = request.getRemoteAddr().toString();
-        System.out.println(clientIp);
-        String savePath = clientIp + "/root/downLoad";
-        System.out.println(savePath);
-        List<String> results = new ArrayList<>();
-//        for(int i=0;i<fileIds.length;i++) {
-        Long fileId = Long.parseLong(fileIds);
-        String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
-        System.out.println(fileName);
-        String res = FileUtil.downloadFile(fileName, savePath);
-        results.add(res);
-//        }
-
-        return ResponseResult.success(results);
-    }
-
-//    /**
-//     * 查询数据库中所有的不同文件类型
-//     * //     * @param download
-//     *
-//     * @return List<String>
-//     */
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "String"),
-////                @ApiImplicitParam(name="savePath",value ="文件下载保存路径",paramType = "body",dataType = "String"),
-//    })
-//    @RequestMapping("/downloadOneFile")
-    public String downloadAlone(String fileIds, HttpServletResponse response) {
-        Long fileId = Long.parseLong(fileIds);
-        String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
-        File file = new File(fileName);
-        System.out.println(fileName);
-        if (!file.exists()) {
-            System.out.println("文件 :" + File.separator + dataFileService.queryById(fileId).getFileName() + "不存在!");
-        }
-
-        response.setHeader("Content-Type","application/octet-stream");
-        //设置下载的文件的名称-该方式已解决中文乱码问题
-        try {
-            response.setHeader("Content-Disposition","attachment;filename=" +  new String( dataFileService.queryById(fileId).getFileName().getBytes("gb2312"), "ISO8859-1" ));
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        // 下载文件能正常显示中文
-//        try {
-//            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(dataFileService.queryById(fileId).getFileName(), "UTF-8"));
-//        } catch (UnsupportedEncodingException e) {
-//            e.printStackTrace();
-//        }
-//        response.setHeader("Content-Disposition",
-//                "attachment;filename=" + new String(fileName.getBytes(ENCODING), "ISO8859-1"));
-        // 实现文件下载
-        byte[] buffer = new byte[1024];
-        FileInputStream fis = null;
-        BufferedInputStream bis = null;
-        try {
-            fis = new FileInputStream(file);
-            bis = new BufferedInputStream(fis);
-            OutputStream os = response.getOutputStream();
-            int i = bis.read(buffer);
-            while (i != -1) {
-                os.write(buffer, 0, i);
-                i = bis.read(buffer);
-            }
-            System.out.println("Download  successfully!");
-            return dataFileService.queryById(fileId).getFileName() + "下载成功！";
-
-        } catch (Exception e) {
-            System.out.println("Download  failed!");
-            return dataFileService.queryById(fileId).getFileName() + "下载失败！";
-
-        } finally {
-            if (bis != null) {
-                try {
-                    bis.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (fis != null) {
-                try {
-                    fis.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
@@ -422,7 +310,7 @@ public class VfileMenuController {
             Long fileId =Long.parseLong(fileIds[0]);
             String fileName= dataFileService.queryById(fileId).getFileName();
             String filePath=dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
-            downloadFile(response,fileName,filePath);
+            FileUtil.downloadFile(response,fileName,filePath);
         }
 
         String message= null;
@@ -501,7 +389,7 @@ public class VfileMenuController {
         if (zipFile.exists()) {
             System.out.println(zipFileName);
             System.out.println(strZipPath);
-            downloadFile(response, zipFileName, strZipPath);
+            FileUtil.downloadFile(response, zipFileName, strZipPath);
             zipFile.delete();
         }
         if(message==null){
@@ -512,47 +400,101 @@ public class VfileMenuController {
     }
 
 
-    public void downloadFile(HttpServletResponse response,String filename,String path ){
-        if (filename != null) {
-            FileInputStream is = null;
-            BufferedInputStream bs = null;
-            OutputStream os = null;
-            try {
-                File file = new File(path);
-                if (file.exists()) {
-                    //设置Headers
-                    response.setHeader("Content-Type","application/octet-stream");
-                    //设置下载的文件的名称-该方式已解决中文乱码问题
-                    response.setHeader("Content-Disposition","attachment;filename=" +  new String( filename.getBytes("gb2312"), "ISO8859-1" ));
-                    is = new FileInputStream(file);
-                    bs =new BufferedInputStream(is);
-                    os = response.getOutputStream();
-                    byte[] buffer = new byte[1024];
-                    int len = 0;
-                    while((len = bs.read(buffer)) != -1){
-                        os.write(buffer,0,len);
-                    }
-                }else{
-                    String error = Base64Util.encode("下载的文件资源不存在");
+
+
+/**
+ *
+ *提示： 待保留代码部分
+ * 作者：肖小霞
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
+    })
+    @PostMapping("/downloadFiles")
+    public ResponseResult downloadFiles(@RequestBody String fileIds) {
+//        Long fileId=15L;
+//        List<MultipartFile>  multipartFileList = new ArrayList<MultipartFile>();
+        String clientIp = "";
+        HttpServletRequest request = null;
+        try {
+            request =
+                    ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+        } catch (Exception e) {
+            System.out.println("Can not get current IP.");
+        }
+        clientIp = request.getRemoteAddr().toString();
+        System.out.println(clientIp);
+        String savePath = clientIp + "/root/downLoad";
+        System.out.println(savePath);
+        List<String> results = new ArrayList<>();
+        Long fileId = Long.parseLong(fileIds);
+        String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+        System.out.println(fileName);
+        String res = FileUtil.downloadFile(fileName, savePath);
+        results.add(res);
+
+
+        return ResponseResult.success(results);
+    }
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "String"),
+    })
+    @RequestMapping("/downloadOneFile")
+    public String downloadAlone(String fileIds, HttpServletResponse response) {
+        Long fileId = Long.parseLong(fileIds);
+        String fileName = File.separator + dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+        File file = new File(fileName);
+        System.out.println(fileName);
+        if (!file.exists()) {
+            System.out.println("文件 :" + File.separator + dataFileService.queryById(fileId).getFileName() + "不存在!");
+        }
+
+        response.setHeader("Content-Type","application/octet-stream");
+        //设置下载的文件的名称-该方式已解决中文乱码问题
+        try {
+            response.setHeader("Content-Disposition","attachment;filename=" +  new String( dataFileService.queryById(fileId).getFileName().getBytes("gb2312"), "ISO8859-1" ));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        byte[] buffer = new byte[1024];
+        FileInputStream fis = null;
+        BufferedInputStream bis = null;
+        try {
+            fis = new FileInputStream(file);
+            bis = new BufferedInputStream(fis);
+            OutputStream os = response.getOutputStream();
+            int i = bis.read(buffer);
+            while (i != -1) {
+                os.write(buffer, 0, i);
+                i = bis.read(buffer);
+            }
+            System.out.println("Download  successfully!");
+            return dataFileService.queryById(fileId).getFileName() + "下载成功！";
+
+        } catch (Exception e) {
+            System.out.println("Download  failed!");
+            return dataFileService.queryById(fileId).getFileName() + "下载失败！";
+
+        } finally {
+            if (bis != null) {
+                try {
+                    bis.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
-            }catch(IOException ex){
-                ex.printStackTrace();
-            }finally {
-                try{
-                    if(is != null){
-                        is.close();
-                    }
-                    if( bs != null ){
-                        bs.close();
-                    }
-                    if( os != null){
-                        os.flush();
-                        os.close();
-                    }
-                }catch (IOException e){
+            }
+            if (fis != null) {
+                try {
+                    fis.close();
+                } catch (IOException e) {
                     e.printStackTrace();
                 }
             }
         }
     }
+    **/
+
 }
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index 731b870..15c6029 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -5,11 +5,13 @@ import com.sun.xml.internal.fastinfoset.tools.FI_DOM_Or_XML_DOM_SAX_SAXEvent;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.http.entity.ContentType;
+import org.apache.logging.log4j.util.Base64Util;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -110,7 +112,53 @@ public class FileUtil {
         return null;
     }
 
-    public static String downloadFile(String fileName, String savepath) {
+    public static void downloadFile(HttpServletResponse response, String filename, String path){
+        if (filename != null) {
+            FileInputStream is = null;
+            BufferedInputStream bs = null;
+            OutputStream os = null;
+            try {
+                File file = new File(path);
+                if (file.exists()) {
+                    //设置Headers
+                    response.setHeader("Content-Type","application/octet-stream");
+                    //设置下载的文件的名称-该方式已解决中文乱码问题
+                    response.setHeader("Content-Disposition","attachment;filename=" +  new String( filename.getBytes("gb2312"), "ISO8859-1" ));
+                    is = new FileInputStream(file);
+                    bs =new BufferedInputStream(is);
+                    os = response.getOutputStream();
+                    byte[] buffer = new byte[1024];
+                    int len = 0;
+                    while((len = bs.read(buffer)) != -1){
+                        os.write(buffer,0,len);
+                    }
+                }else{
+                    String error = Base64Util.encode("下载的文件资源不存在");
+                }
+            }catch(IOException ex){
+                ex.printStackTrace();
+            }finally {
+                try{
+                    if(is != null){
+                        is.close();
+                    }
+                    if( bs != null ){
+                        bs.close();
+                    }
+                    if( os != null){
+                        os.flush();
+                        os.close();
+                    }
+                }catch (IOException e){
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+
+
+    public static String writeFile(String fileName, String savepath) {
         System.out.println(fileName);
 //        File readerfile = new File(fileName);
         String readerfile = fileName;
-- 
Gitee


From 0d8ec02292348d43a22a07efcca8573251983e15 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Fri, 6 Nov 2020 12:55:32 +0800
Subject: [PATCH 14/26] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=92=8C=E6=89=B9=E9=87=8F=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cetc32/dh/controller/rest/VfileMenuController.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index e91d938..e1e21bf 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -297,7 +297,6 @@ public class VfileMenuController {
         return ResponseResult.success(hashMapList);
     }
 
-
     @ApiImplicitParams({
             @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
 //            @ApiImplicitParam(name = "fileIds2", value = "文件id", paramType = "body", dataType = "String"),
-- 
Gitee


From a385d9b51bfaa8b233841c0caadbe6db6bba1b18 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Fri, 6 Nov 2020 15:52:02 +0800
Subject: [PATCH 15/26] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cetc32/dh/common/response/PageDataResult.java |  1 -
 .../dh/controller/rest/FileSubmitController.java  | 15 ++++++++++-----
 .../java/com/cetc32/dh/entity/DataSubmit.java     |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
index 49bda85..220bbb8 100644
--- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
+++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
@@ -30,7 +30,6 @@ public class PageDataResult {
 
     private List<? extends NumberS> list;
 
-    public PageDataResult(Integer count, List<DataSubmit> list, int offset){};
     public PageDataResult(int totals,List<? extends NumberS> list){
         this.totals=totals;
         this.list=list;
diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index d611482..e6cb669 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -135,7 +135,8 @@ public class FileSubmitController {
         if(null ==results||results <= 0 )
             results=10;
         DataSubmit ds =new DataSubmit();
-        return new PageDataResult(dataSubmitService.countReadyApprove(null),
+        ds.setStatus(0);
+        return new PageDataResult(dataSubmitService.countReadyApprove(ds),
                 dataSubmitService.selectReadyApprove(ds),(page-1)*results);
     }
 
@@ -170,16 +171,20 @@ public class FileSubmitController {
 //        }
         System.out.println(dataSubmit.getPathList().length);
         Integer count =0;
-        dataSubmit.setSubtype("2");
-        dataSubmit.setStatus(1);
-        dataSubmit.setApprover("未审核");
+        dataSubmit.setSubtype("1");
+        dataSubmit.setStatus(0);
+        dataSubmit.setApprover("审核人");
         DataSubmit dataSubmit_new =dataSubmit;
         DataSubmit dataSubmit_new2 =dataSubmit;
         for(int i=0;i<dataSubmit.getPathList().length;i++){
             if(dataSubmit.getPathList()[i].equals("文件上传失败!")){
                 continue;
             }
-            dataSubmit_new.setPath(dataSubmit.getPathList()[i]);
+            String pathWhole = dataSubmit.getPathList()[i];
+            String filename =pathWhole.split("/")[pathWhole.split("/").length-1];
+            String path =pathWhole.substring(0,pathWhole.lastIndexOf("/"));
+           dataSubmit_new.setTitle(filename);
+           dataSubmit_new.setPath(path);
             if(dataSubmitService.insertDataSubmit(dataSubmit_new)>=0){
                 count++;
             }
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 9f34618..3917625 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -4,7 +4,7 @@ import javax.persistence.*;
 import java.util.List;
 
 @Table(name = "data_submit")
-public class DataSubmit {
+public class DataSubmit extends NumberS{
     @Id
     private Integer id;
 
-- 
Gitee


From 364ced8623dda0a36585e628788a95dad7935d46 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Mon, 9 Nov 2020 13:30:54 +0800
Subject: [PATCH 16/26] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cetc32/dh/service/FileToMenuService.java     | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/main/java/com/cetc32/dh/service/FileToMenuService.java

diff --git a/src/main/java/com/cetc32/dh/service/FileToMenuService.java b/src/main/java/com/cetc32/dh/service/FileToMenuService.java
new file mode 100644
index 0000000..6cc67a7
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/service/FileToMenuService.java
@@ -0,0 +1,8 @@
+package com.cetc32.dh.service;
+
+import com.cetc32.dh.entity.FileToMenu;
+
+public interface FileToMenuService {
+
+    public int insert(FileToMenu fileToMenu);
+}
-- 
Gitee


From 5c8557db594de5a4d71313788769f9357b82b35f Mon Sep 17 00:00:00 2001
From: root <123>
Date: Tue, 10 Nov 2020 11:43:21 +0800
Subject: [PATCH 17/26] =?UTF-8?q?20201110=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java | 120 +++++++++++++-----
 .../controller/rest/VfileMenuController.java  |  75 +++++++++--
 .../java/com/cetc32/dh/entity/DataSubmit.java |  25 +++-
 .../cetc32/dh/mybatis/DataSubmitMapper.java   |   2 +
 .../cetc32/dh/mybatis/FileToMenuMapper.java   |   2 +
 .../cetc32/dh/service/DataSubmitService.java  |   3 +
 .../cetc32/dh/service/FileToMenuService.java  |   2 +
 .../service/impl/DataSubmitServiceImpl.java   |  13 +-
 .../service/impl/FileToMenuServiceImpl.java   |  19 +++
 src/main/resources/mapper/DataFileMapper.xml  |   6 +-
 .../resources/mapper/DataSubmitMapper.xml     |  23 +++-
 .../resources/mapper/FileToMenuMapper.xml     |  28 ++++
 12 files changed, 263 insertions(+), 55 deletions(-)
 create mode 100644 src/main/java/com/cetc32/dh/service/impl/FileToMenuServiceImpl.java

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index e6cb669..d2e7be0 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -8,10 +8,15 @@
  */
 package com.cetc32.dh.controller.rest;
 
+import com.cetc32.dh.service.DataMenuService;
+import com.cetc32.dh.service.FileToMenuService;
 import com.cetc32.dh.utils.FileUtil;
 import com.cetc32.dh.common.response.PageDataResult;
 import com.cetc32.dh.common.response.ResponseResult;
 import com.cetc32.dh.entity.DataSubmit;
+import com.cetc32.dh.entity.DataFile;
+import com.cetc32.dh.service.DataFileService;
+import com.cetc32.dh.entity.FileToMenu;
 import com.cetc32.dh.service.DataSubmitService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -21,8 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +37,14 @@ public class FileSubmitController {
 
     @Autowired
     DataSubmitService dataSubmitService;
+    @Autowired
+    DataFileService dataFileService;
+    @Autowired
+    FileToMenuService fileToMenuService;
+    @Autowired
+    DataMenuService dataMenuService;
+
+
 
     @Value("${upLoadPath}")
     String upLoadPath;
@@ -89,6 +100,9 @@ public class FileSubmitController {
         List<DataSubmit> list =new ArrayList<>();
         Integer count =0;
         list= dataSubmitService.selectMyApprove(ds);
+        for(int i=0;i<list.size();i++){
+;
+        }
         count= dataSubmitService.countMineApprov(ds);
         return new PageDataResult(count,list, (page - 1) * results);
 //        return new PageDataResult(count,list);
@@ -96,16 +110,27 @@ public class FileSubmitController {
 
     /**
      * 拒绝导入请求
+     * @param map
      * @return 返回执行结果
      * **/
     @ApiOperation(value="拒绝请求")
     @PostMapping("/reject")
-    public ResponseResult rejectSubmit(Integer id){
-        DataSubmit ds =new DataSubmit();
-        ds.setId(id);
-        if(0 <= dataSubmitService.rejectSubmit(ds))
-            return ResponseResult.success();
-        return ResponseResult.error();
+    @ApiImplicitParam(name="ids",value ="申请审批的记录id",dataType = "List",defaultValue = "")
+    public ResponseResult rejectSubmit(@RequestBody Map<String,Object> map){
+        List<Integer> ids = new ArrayList<>();
+        ids=(List<Integer>) map.get("ids");
+        DataSubmit dataSubmit =null;
+        int sum =0;
+        for(int i=0;i<ids.size();i++){
+            Integer id =ids.get(i);
+            dataSubmit = dataSubmitService.queryById(id);
+            if(dataSubmitService.rejectSubmit(dataSubmit)>0){
+                sum=sum+1;
+            }
+        }
+        if(sum == ids.size())
+            return ResponseResult.success("已审批拒绝");
+        return ResponseResult.error("审批失败");
     }
 
     /**
@@ -114,12 +139,46 @@ public class FileSubmitController {
      * **/
     @ApiOperation(value="审核通过")
     @PostMapping("/accept")
-    public ResponseResult acceptSubmit(Integer id){
-        DataSubmit ds =new DataSubmit();
-        ds.setId(id);
-        if(0 <= dataSubmitService.acceptSubmit(ds))
-            return ResponseResult.success();
-        return ResponseResult.error();
+    @ApiImplicitParam(name="ids",value ="申请审批的记录id",dataType = "List",defaultValue = "")
+    public ResponseResult acceptSubmit(@RequestBody Map<String,Object> map){
+        System.out.println(map);
+        List<Integer> ids = new ArrayList<>();
+        ids=(List<Integer>) map.get("ids");
+
+        DataSubmit dataSubmit = null;
+        DataFile dataFile = new DataFile();
+        DataFile new_dataFile = null;
+        FileToMenu fileToMenu = new FileToMenu();
+        int sum =0;
+        for(int i=0;i<ids.size();i++){
+            Integer id = ids.get(i);
+            dataSubmit = dataSubmitService.queryById(id);
+            System.out.println(dataSubmit);
+            dataFile.setFileName(dataSubmit.getTitle());
+            dataFile.setFilePath(dataSubmit.getPath());
+            dataFile.setRegion(dataSubmit.getArea());
+            dataFile.setFileYear(dataSubmit.getYear());
+            dataFile.setFileSecurity(dataSubmit.getPlevel().toString());
+            dataFile.setFileType(dataSubmit.getTitle().substring(dataSubmit.getTitle().lastIndexOf(".")+1));
+            if(i!=0){
+                dataFile.setId(dataFile.getId()+i);
+            }
+            int flag_file=dataFileService.insertDataFile(dataFile);
+            new_dataFile = dataFile;
+//            System.out.println("new_dataFile！！！！！！！！！！！！！！");
+            System.out.println(new_dataFile);
+            fileToMenu.setFileId(new_dataFile.getId());
+            fileToMenu.setMenuId(dataSubmit.getMenuid());
+            int flag_filetomenu = fileToMenuService.insert(fileToMenu);
+            if(flag_file>0&&flag_filetomenu>0){
+                if(dataSubmitService.acceptSubmit(dataSubmit)>0){
+                    sum=sum+1;
+                }
+            }
+        }
+        if(sum == ids.size())
+            return ResponseResult.success("已审批通过");
+        return ResponseResult.error("审批失败");
     }
 
     /**
@@ -136,13 +195,18 @@ public class FileSubmitController {
             results=10;
         DataSubmit ds =new DataSubmit();
         ds.setStatus(0);
+        List<DataSubmit> list =new ArrayList<>();
+        list=dataSubmitService.selectReadyApprove(ds);
+        List<DataSubmit> list_new =new ArrayList<>();
+        for(int i=0;i<list.size();i++){
+            String menuName= dataMenuService.queryById(list.get(i).getMenuid()).getMenuName();
+            list.get(i).setMenuName(menuName);
+        }
         return new PageDataResult(dataSubmitService.countReadyApprove(ds),
-                dataSubmitService.selectReadyApprove(ds),(page-1)*results);
+                list,(page-1)*results);
     }
 
 
-
-
     /**
      * 提交数据
 //     * @param dataSubmit 数据信息
@@ -156,20 +220,16 @@ public class FileSubmitController {
             @ApiImplicitParam(name="status",value ="文件状态",paramType = "body",dataType = "Integer",defaultValue = ""),
             @ApiImplicitParam(name="submitor",value ="提交者",paramType = "body",dataType = "String",defaultValue = ""),
             @ApiImplicitParam(name="approver",value ="审核人",paramType = "body",dataType = "String",defaultValue = ""),
-            @ApiImplicitParam(name="menuid",value ="编目",paramType = "body",dataType = "Integer",defaultValue = ""),
+            @ApiImplicitParam(name="menuid",value ="编目号",paramType = "body",dataType = "Integer",defaultValue = ""),
+            @ApiImplicitParam(name="menuName",value ="编目名称",paramType = "body",dataType = "String",defaultValue = ""),
             @ApiImplicitParam(name="year",value ="年份",paramType = "body",dataType = "Integer",defaultValue = ""),
             @ApiImplicitParam(name="title",value ="标题",paramType = "body",dataType = "String",defaultValue = ""),
             @ApiImplicitParam(name="area",value ="区域",paramType = "body",dataType = "String",defaultValue = ""),
             @ApiImplicitParam(name="path",value ="提交路径(不传参)",paramType = "body",dataType = "String",defaultValue = ""),
-
     })
     @PostMapping("/sub")
-    public ResponseResult DataSub( @RequestBody DataSubmit dataSubmit){
-//        dataSubmit.setPath("/root/upLoad/test7777");
-//        if(dataSubmit.getPath()==null||dataSubmit.getPath().trim().equals("")){
-//            return ResponseResult.error("未选择文件夹，表单信息提交失败！");
-//        }
-        System.out.println(dataSubmit.getPathList().length);
+    public ResponseResult DataSub(@RequestBody DataSubmit dataSubmit){
+        System.out.println(dataSubmit);
         Integer count =0;
         dataSubmit.setSubtype("1");
         dataSubmit.setStatus(0);
@@ -177,11 +237,13 @@ public class FileSubmitController {
         DataSubmit dataSubmit_new =dataSubmit;
         DataSubmit dataSubmit_new2 =dataSubmit;
         for(int i=0;i<dataSubmit.getPathList().length;i++){
-            if(dataSubmit.getPathList()[i].equals("文件上传失败!")){
+            if(dataSubmit.getPathList()[i].equals("文件上传失败!")||dataSubmit.getPathList()[i].equals("文件夹上传失败!")){
                 continue;
             }
             String pathWhole = dataSubmit.getPathList()[i];
-            String filename =pathWhole.split("/")[pathWhole.split("/").length-1];
+            String[] Pa = pathWhole.split("/");
+            String filename =Pa[Pa.length-1];
+            System.out.println(pathWhole);
             String path =pathWhole.substring(0,pathWhole.lastIndexOf("/"));
            dataSubmit_new.setTitle(filename);
            dataSubmit_new.setPath(path);
@@ -193,9 +255,9 @@ public class FileSubmitController {
             dataSubmit_new.setId(dataSubmit_new2.getId());
         }
         if(count==dataSubmit.getPathList().length){
-            return ResponseResult.error("表单信息提交成功！");
+            return ResponseResult.success("表单信息提交成功！");
         }
-        return ResponseResult.success("表单信息提交失败！");
+        return ResponseResult.error("表单信息提交失败！");
     }
 
 
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index e1e21bf..33ec053 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -207,6 +207,7 @@ public class VfileMenuController {
     })
     @PostMapping("/find")
     public PageDataResult queryFilesByObj(@RequestBody VfileMenu vfileMenu) {
+        System.out.println(vfileMenu.getMenuId());
         Integer page = vfileMenu.getPage();
         Integer results = vfileMenu.getResults();
 
@@ -224,8 +225,9 @@ public class VfileMenuController {
 
     }
 
+
     /**
-     * 查询数据库中所有的不同年份
+     * 查询options中所有的不同年份
      *
      * @return List<Integer>
      */
@@ -233,10 +235,10 @@ public class VfileMenuController {
     @PostMapping("/AllYear")
     //@RequestMapping(value="/AllYear",method = RequestMethod.POST)
     public ResponseResult distinctAllYear() {
-        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllYear();
+        List<Options> optionsList = optionsService.selectByCategory("file_year");
         List<Integer> yearList = new ArrayList<Integer>();
-        for (int i = 0; i < vfileMenuList.size(); i++) {
-            yearList.add(vfileMenuList.get(i).getFileYear());
+        for(int i=0;i<optionsList.size();i++){
+            yearList.add(Integer.parseInt(optionsList.get(i).getValueName()));
         }
         Collections.sort(yearList);
         Collections.reverse(yearList);
@@ -249,31 +251,80 @@ public class VfileMenuController {
         return ResponseResult.success(resultList);
     }
 
+
     /**
-     * 查询数据库中所有的不同区域
+     * 查询options中所有的不同区域
      *
      * @return List<String>
      */
     @ApiOperation(value = "查询所有区域", notes = "不需要传参数")
     @PostMapping("/AllRegion")
     public ResponseResult distinctAllRegion() {
-        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllRegion();
+        List<Options> optionsList = optionsService.selectByCategory("region");
         List<String> regionList = new ArrayList<String>();
-
-        for (int i = 0; i < vfileMenuList.size(); i++) {
-            regionList.add(vfileMenuList.get(i).getRegion());
+        for(int i=0;i<optionsList.size();i++){
+            regionList.add(optionsList.get(i).getValueName());
         }
-        Collections.sort(regionList);
 
         List<String> resultList = new ArrayList<String>();
         resultList.add("全部区域");
         for (int i = 0; i < regionList.size(); i++) {
-            resultList.add(regionList.get(i));
+            resultList.add(regionList.get(i).toString());
         }
 
         return ResponseResult.success(resultList);
     }
 
+//    /**
+//     * 查询数据库中所有的不同年份
+//     *
+//     * @return List<Integer>
+//     */
+//    @ApiOperation(value = "查询所有年份", notes = "不需要传参数")
+//    @PostMapping("/AllYear")
+//    //@RequestMapping(value="/AllYear",method = RequestMethod.POST)
+//    public ResponseResult distinctAllYear() {
+//        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllYear();
+//        List<Integer> yearList = new ArrayList<Integer>();
+//        for (int i = 0; i < vfileMenuList.size(); i++) {
+//            yearList.add(vfileMenuList.get(i).getFileYear());
+//        }
+//        Collections.sort(yearList);
+//        Collections.reverse(yearList);
+//        List<String> resultList = new ArrayList<String>();
+//        resultList.add("全部年份");
+//        for (int i = 0; i < yearList.size(); i++) {
+//            resultList.add(yearList.get(i).toString());
+//        }
+//
+//        return ResponseResult.success(resultList);
+//    }
+
+//    /**
+//     * 查询数据库中所有的不同区域
+//     *
+//     * @return List<String>
+//     */
+//    @ApiOperation(value = "查询所有区域", notes = "不需要传参数")
+//    @PostMapping("/AllRegion")
+//    public ResponseResult distinctAllRegion() {
+//        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllRegion();
+//        List<String> regionList = new ArrayList<String>();
+//
+//        for (int i = 0; i < vfileMenuList.size(); i++) {
+//            regionList.add(vfileMenuList.get(i).getRegion());
+//        }
+//        Collections.sort(regionList);
+//
+//        List<String> resultList = new ArrayList<String>();
+//        resultList.add("全部区域");
+//        for (int i = 0; i < regionList.size(); i++) {
+//            resultList.add(regionList.get(i));
+//        }
+//
+//        return ResponseResult.success(resultList);
+//    }
+
     /**
      * 查询数据库中所有的不同文件类型
      *
@@ -299,8 +350,6 @@ public class VfileMenuController {
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
-//            @ApiImplicitParam(name = "fileIds2", value = "文件id", paramType = "body", dataType = "String"),
-//                @ApiImplicitParam(name="savePath",value ="文件下载保存路径",paramType = "body",dataType = "String"),
     })
     @GetMapping("/downloadMulFile")
     public String downloadMulFile(String[] fileIds,HttpServletResponse response) {
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 3917625..23b47c7 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -1,7 +1,6 @@
 package com.cetc32.dh.entity;
 
 import javax.persistence.*;
-import java.util.List;
 
 @Table(name = "data_submit")
 public class DataSubmit extends NumberS{
@@ -24,7 +23,9 @@ public class DataSubmit extends NumberS{
     private String approver;
 
     @Column(name = "menuId")
-    private Integer menuid;
+    private Long menuid;
+
+    private String menuName;
 
     private Integer year;
 
@@ -37,7 +38,7 @@ public class DataSubmit extends NumberS{
     public  DataSubmit(){}
 
     public DataSubmit(Integer id,String subtype,Integer plevel,Integer status,String submitor,String approver,
-                      Integer menuid,Integer year,String title,String area,String path) {
+                      Long menuid,String menuName,Integer year,String title,String area,String path) {
         this.id=id;
         this.subtype=subtype;
         this.plevel=plevel;
@@ -49,6 +50,8 @@ public class DataSubmit extends NumberS{
         this.title=title;
         this.area=area;
         this.path=path;
+        this.menuName=menuName;
+
     }
 
     /**
@@ -76,6 +79,17 @@ public class DataSubmit extends NumberS{
         return this.pathList;
     }
 
+    /**
+     * @param menuName
+     */
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
+
+    public String  getMenuName() {
+        return this.menuName;
+    }
+
     /**
      * 获取'报送类型,外部接口上报或本地路径上报'
      *
@@ -153,14 +167,14 @@ public class DataSubmit extends NumberS{
     /**
      * @return menuId
      */
-    public Integer getMenuid() {
+    public Long getMenuid() {
         return menuid;
     }
 
     /**
      * @param menuid
      */
-    public void setMenuid(Integer menuid) {
+    public void setMenuid(Long menuid) {
         this.menuid = menuid;
     }
 
@@ -231,6 +245,7 @@ public class DataSubmit extends NumberS{
                 ",path=" + path+'\'' +
                 ",year=" + year+'\'' +
                 ",title=" + title+'\'' +
+                ",menuName=" + menuName+'\'' +
                 ",area=" + area +
                 '}';
     }
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java
index 527b4e7..8ce3bae 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataSubmitMapper.java
@@ -56,4 +56,6 @@ public interface DataSubmitMapper {
      * @return 反馈查询到的数据记录
      * */
     List<DataSubmit> selectByStatusAndUser(DataSubmit ds);
+
+    DataSubmit queryById(Integer id);
 }
diff --git a/src/main/java/com/cetc32/dh/mybatis/FileToMenuMapper.java b/src/main/java/com/cetc32/dh/mybatis/FileToMenuMapper.java
index f377a2e..4634411 100644
--- a/src/main/java/com/cetc32/dh/mybatis/FileToMenuMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/FileToMenuMapper.java
@@ -26,4 +26,6 @@ public interface FileToMenuMapper extends Mapper<FileToMenu> {
     public List<FileToMenu> selectByFileId(Long fileId);
 
     public List<FileToMenu> selectByMenuId(Long menuId);
+
+    public int insert(FileToMenu fileToMenu);
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/service/DataSubmitService.java b/src/main/java/com/cetc32/dh/service/DataSubmitService.java
index 1589da4..4c0bc83 100644
--- a/src/main/java/com/cetc32/dh/service/DataSubmitService.java
+++ b/src/main/java/com/cetc32/dh/service/DataSubmitService.java
@@ -75,4 +75,7 @@ public interface DataSubmitService {
      * @return 反馈查询到的数据个数
      * */
     Integer countReadyApprove(DataSubmit dataSubmit);
+
+    DataSubmit queryById(Integer id);
+
 }
diff --git a/src/main/java/com/cetc32/dh/service/FileToMenuService.java b/src/main/java/com/cetc32/dh/service/FileToMenuService.java
index 6cc67a7..ae20213 100644
--- a/src/main/java/com/cetc32/dh/service/FileToMenuService.java
+++ b/src/main/java/com/cetc32/dh/service/FileToMenuService.java
@@ -1,7 +1,9 @@
 package com.cetc32.dh.service;
 
 import com.cetc32.dh.entity.FileToMenu;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface FileToMenuService {
 
     public int insert(FileToMenu fileToMenu);
diff --git a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
index f6fe881..446faee 100644
--- a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
@@ -63,6 +63,7 @@ public class DataSubmitServiceImpl implements DataSubmitService {
             return -1;
         }
         ds.setStatus(-1);
+        ds.setApprover("审核人已拒绝");
         return dsMapper.updateById(ds);
 
     }
@@ -81,7 +82,8 @@ public class DataSubmitServiceImpl implements DataSubmitService {
         if(ds.getId()==null){
             return -1;
         }
-        ds.setStatus(2);
+        ds.setStatus(1);
+        ds.setApprover("审核人已审核");
         return dsMapper.updateById(ds);
     }
 
@@ -174,4 +176,13 @@ public class DataSubmitServiceImpl implements DataSubmitService {
     public void setDsMapper(DataSubmitMapper dsMapper) {
         this.dsMapper = dsMapper;
     }
+
+    /**
+     * 根据当前id查找DataSubmit实体
+     * @param id 根据id查询
+     * @return DataSubmit
+     */
+    @Override
+    public DataSubmit queryById(Integer id){return dsMapper.queryById(id);}
+
 }
diff --git a/src/main/java/com/cetc32/dh/service/impl/FileToMenuServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/FileToMenuServiceImpl.java
new file mode 100644
index 0000000..2f79e6c
--- /dev/null
+++ b/src/main/java/com/cetc32/dh/service/impl/FileToMenuServiceImpl.java
@@ -0,0 +1,19 @@
+package com.cetc32.dh.service.impl;
+
+import com.cetc32.dh.entity.FileToMenu;
+import com.cetc32.dh.mybatis.FileToMenuMapper;
+import com.cetc32.dh.service.FileToMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class FileToMenuServiceImpl implements FileToMenuService {
+
+    @Autowired
+    public FileToMenuMapper fileToMenuMapper;
+
+    @Override
+    public int insert(FileToMenu fileToMenu){
+        return fileToMenuMapper.insert(fileToMenu);
+    }
+}
diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml
index 3917076..a0215ae 100644
--- a/src/main/resources/mapper/DataFileMapper.xml
+++ b/src/main/resources/mapper/DataFileMapper.xml
@@ -43,9 +43,7 @@
         file_path,
       </if>
 
-      <if test="createTime!= null">
         create_time,
-      </if>
 
       <if test="region!= null">
         region,
@@ -80,9 +78,7 @@
         #{filePath,jdbcType=VARCHAR},
       </if>
 
-      <if test="createTime!= null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
+      now(),
 
       <if test="region!= null">
         #{region,jdbcType=VARCHAR},
diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml
index a12ab64..b56fd43 100644
--- a/src/main/resources/mapper/DataSubmitMapper.xml
+++ b/src/main/resources/mapper/DataSubmitMapper.xml
@@ -16,6 +16,7 @@
     <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="area" jdbcType="VARCHAR" property="area" />
     <result column="path" jdbcType="VARCHAR" property="path" />
+<!--    <result column="menu_name" jdbcType="VARCHAR" property="menuName" />-->
   </resultMap>
 
   <insert id="insertOne" keyProperty="id" useGeneratedKeys="true" parameterType="com.cetc32.dh.entity.DataSubmit">
@@ -54,6 +55,7 @@
         menuid,
       </if>
 
+
       <if test="title!= null">
         title,
       </if>
@@ -104,6 +106,7 @@
         #{menuid},
       </if>
 
+
       <if test="title!= null">
         #{title},
       </if>
@@ -133,14 +136,24 @@
       <if test="menuid != null">
         menuId = #{menuid},
       </if>
-
       <if test="year != null">
         year = #{year},
       </if>
-
       <if test="area != null">
         area = #{area},
       </if>
+      <if test="approver != null">
+        approver = #{approver},
+      </if>
+      <if test="title != null">
+        title = #{title},
+      </if>
+      <if test="path != null">
+        path = #{path},
+      </if>
+      <if test="submitor != null">
+        submitor = #{submitor},
+      </if>
     </set>
     where id = #{id}
   </update>
@@ -193,4 +206,10 @@
     </where>
   </select>
 
+
+  <select id="queryById" parameterType="java.lang.Integer" resultType="com.cetc32.dh.entity.DataSubmit">
+        select * from data_submit
+        where  id= #{id}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/FileToMenuMapper.xml b/src/main/resources/mapper/FileToMenuMapper.xml
index 6105475..aabc0b6 100644
--- a/src/main/resources/mapper/FileToMenuMapper.xml
+++ b/src/main/resources/mapper/FileToMenuMapper.xml
@@ -20,4 +20,32 @@
         where  menu_id= #{menuId,jdbcType=BIGINT}
     </select>
 
+    <insert id="insert"   parameterType="com.cetc32.dh.entity.FileToMenu" >
+        insert into file_to_menu
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+
+            <if test="menuId!= null">
+                menu_id,
+            </if>
+
+            <if test="fileId!= null">
+                file_id,
+            </if>
+        </trim>
+
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+
+            <if test="menuId!= null">
+                #{menuId,jdbcType=BIGINT},
+            </if>
+
+            <if test="fileId!= null">
+                #{fileId ,jdbcType=BIGINT},
+            </if>
+        </trim>
+
+    </insert>
+
+
+
 </mapper>
\ No newline at end of file
-- 
Gitee


From 1408f4f7c760f7fad8288a763e6339481e83b072 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Tue, 10 Nov 2020 13:59:25 +0800
Subject: [PATCH 18/26] =?UTF-8?q?20201110=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/VfileMenuController.java  | 97 +++++++++----------
 1 file changed, 48 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 33ec053..1424f51 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -275,55 +275,7 @@ public class VfileMenuController {
         return ResponseResult.success(resultList);
     }
 
-//    /**
-//     * 查询数据库中所有的不同年份
-//     *
-//     * @return List<Integer>
-//     */
-//    @ApiOperation(value = "查询所有年份", notes = "不需要传参数")
-//    @PostMapping("/AllYear")
-//    //@RequestMapping(value="/AllYear",method = RequestMethod.POST)
-//    public ResponseResult distinctAllYear() {
-//        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllYear();
-//        List<Integer> yearList = new ArrayList<Integer>();
-//        for (int i = 0; i < vfileMenuList.size(); i++) {
-//            yearList.add(vfileMenuList.get(i).getFileYear());
-//        }
-//        Collections.sort(yearList);
-//        Collections.reverse(yearList);
-//        List<String> resultList = new ArrayList<String>();
-//        resultList.add("全部年份");
-//        for (int i = 0; i < yearList.size(); i++) {
-//            resultList.add(yearList.get(i).toString());
-//        }
-//
-//        return ResponseResult.success(resultList);
-//    }
-
-//    /**
-//     * 查询数据库中所有的不同区域
-//     *
-//     * @return List<String>
-//     */
-//    @ApiOperation(value = "查询所有区域", notes = "不需要传参数")
-//    @PostMapping("/AllRegion")
-//    public ResponseResult distinctAllRegion() {
-//        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllRegion();
-//        List<String> regionList = new ArrayList<String>();
-//
-//        for (int i = 0; i < vfileMenuList.size(); i++) {
-//            regionList.add(vfileMenuList.get(i).getRegion());
-//        }
-//        Collections.sort(regionList);
-//
-//        List<String> resultList = new ArrayList<String>();
-//        resultList.add("全部区域");
-//        for (int i = 0; i < regionList.size(); i++) {
-//            resultList.add(regionList.get(i));
-//        }
-//
-//        return ResponseResult.success(resultList);
-//    }
+
 
     /**
      * 查询数据库中所有的不同文件类型
@@ -543,6 +495,53 @@ public class VfileMenuController {
             }
         }
     }
+
+
+
+
+         // 查询数据库中所有的不同年份
+
+    @ApiOperation(value = "查询所有年份", notes = "不需要传参数")
+    @PostMapping("/AllYear")
+    //@RequestMapping(value="/AllYear",method = RequestMethod.POST)
+    public ResponseResult distinctAllYear() {
+        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllYear();
+        List<Integer> yearList = new ArrayList<Integer>();
+        for (int i = 0; i < vfileMenuList.size(); i++) {
+            yearList.add(vfileMenuList.get(i).getFileYear());
+        }
+        Collections.sort(yearList);
+        Collections.reverse(yearList);
+        List<String> resultList = new ArrayList<String>();
+        resultList.add("全部年份");
+        for (int i = 0; i < yearList.size(); i++) {
+            resultList.add(yearList.get(i).toString());
+        }
+
+        return ResponseResult.success(resultList);
+    }
+
+
+     // 查询数据库中所有的不同区域
+
+    @ApiOperation(value = "查询所有区域", notes = "不需要传参数")
+    @PostMapping("/AllRegion")
+    public ResponseResult distinctAllRegion() {
+        List<VfileMenu> vfileMenuList = vfileMenuService.distinctAllRegion();
+        List<String> regionList = new ArrayList<String>();
+
+        for (int i = 0; i < vfileMenuList.size(); i++) {
+            regionList.add(vfileMenuList.get(i).getRegion());
+        }
+        Collections.sort(regionList);
+
+        List<String> resultList = new ArrayList<String>();
+        resultList.add("全部区域");
+        for (int i = 0; i < regionList.size(); i++) {
+            resultList.add(regionList.get(i));
+        }
+        return ResponseResult.success(resultList);
+    }
     **/
 
 }
-- 
Gitee


From 7fe51b0b8096e6fad94f1352d85b1e4d94b82f88 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Wed, 11 Nov 2020 16:51:18 +0800
Subject: [PATCH 19/26] =?UTF-8?q?20201111=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/VfileMenuController.java  | 256 +++++++++++++++++-
 1 file changed, 252 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 1424f51..4582e51 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -300,6 +300,105 @@ public class VfileMenuController {
         return ResponseResult.success(hashMapList);
     }
 
+
+    public String downloadMulFile2(String[] fileIds,HttpServletResponse response) {
+
+        if(fileIds.length==1){
+            Long fileId =Long.parseLong(fileIds[0]);
+            String fileName= dataFileService.queryById(fileId).getFileName();
+            String filePath=dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+            FileUtil.downloadFile(response,fileName,filePath);
+        }
+
+        String message= null;
+        String directory = "/root/load";
+        File directoryFile = new File(directory);
+        if (!directoryFile.isDirectory() && !directoryFile.exists()) {
+            directoryFile.mkdirs();
+        }
+        //设置最终输出zip文件的目录+文件名
+        String zipFileName = "已下载文件" + ".zip";
+        String strZipPath = directory + "/" + zipFileName;
+        File zipFile = new File(strZipPath);
+        //读取需要压缩的文件
+        Long fileId =null;
+        String fileName=null;
+
+        List<String> fileNames = new ArrayList<>();
+        for(int i=0;i<fileIds.length;i++){
+            fileId = Long.parseLong(fileIds[i]);
+            if(dataFileService.queryById(fileId)!=null){
+                fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+                fileNames.add(fileName);
+            }
+        }
+
+//        System.out.println("-------------3222--------------" + fileIds);
+
+        ZipOutputStream zipStream = null;
+        FileInputStream zipSource = null;
+        BufferedInputStream bufferStream = null;
+        try {
+            //构造最终压缩包的输出流
+            zipStream = new ZipOutputStream(new FileOutputStream(zipFile));
+            for (int i = 0; i < fileNames.size(); i++) {
+                //解码获取真实路径与文件名
+                String realFilePath = java.net.URLDecoder.decode(fileNames.get(i), "UTF-8");
+//                System.out.println(fileNames.get(i));
+                System.out.println(realFilePath);
+                File file = new File(realFilePath);
+                //TODO:未对文件不存在时进行操作，后期优化。
+                if (file.exists()) {
+                    zipSource = new FileInputStream(file);//将需要压缩的文件格式化为输入流
+                    /**
+                     * 压缩条目不是具体独立的文件，而是压缩包文件列表中的列表项，称为条目，就像索引一样这里的name就是文件名,
+                     * 文件名和之前的重复就会导致文件被覆盖
+                     */
+                    ZipEntry zipEntry = new ZipEntry("("+i+")"+fileNames.get(i).split("/")[fileNames.get(i).split("/").length-1]);//在压缩目录中文件的名字
+                    zipStream.putNextEntry(zipEntry);//定位该压缩条目位置，开始写入文件到压缩包中
+                    bufferStream = new BufferedInputStream(zipSource, 1024 * 10);
+                    int read = 0;
+                    byte[] buf = new byte[1024 * 10];
+                    while ((read = bufferStream.read(buf, 0, 1024 * 10)) != -1) {
+                        zipStream.write(buf, 0, read);
+                    }
+                }else{
+                    message=message+file.getName()+"不存在！"+"\n";
+                    System.out.println(file.getName()+"不存在！");
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            //关闭流
+            try {
+                if (null != bufferStream) bufferStream.close();
+                if (null != zipStream) {
+                    zipStream.flush();
+                    zipStream.close();
+                }
+                if (null != zipSource) zipSource.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        //判断系统压缩文件是否存在：true-把该压缩文件通过流输出给客户端后删除该压缩文件  false-未处理
+        if (zipFile.exists()) {
+            System.out.println(zipFileName);
+            System.out.println(strZipPath);
+            FileUtil.downloadFile(response, zipFileName, strZipPath);
+            zipFile.delete();
+        }
+        if(message==null){
+            message="全部文件下载成功！";
+        }
+        return message;
+
+    }
+
+
+
+
     @ApiImplicitParams({
             @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
     })
@@ -310,7 +409,9 @@ public class VfileMenuController {
             Long fileId =Long.parseLong(fileIds[0]);
             String fileName= dataFileService.queryById(fileId).getFileName();
             String filePath=dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
-            FileUtil.downloadFile(response,fileName,filePath);
+            if(!isDirectory(filePath)){
+                FileUtil.downloadFile(response,fileName,filePath);
+            }
         }
 
         String message= null;
@@ -328,13 +429,28 @@ public class VfileMenuController {
         String fileName=null;
 
         List<String> fileNames = new ArrayList<>();
+        List<String> filePaths = new ArrayList<>();
         for(int i=0;i<fileIds.length;i++){
             fileId = Long.parseLong(fileIds[i]);
             if(dataFileService.queryById(fileId)!=null){
                 fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
-                fileNames.add(fileName);
+                if(isDirectory(fileName)){
+                    List<String> stringList = getAllFile(fileName);
+                    for(int j= 0;j<stringList.size();j++){
+                        fileNames.add(stringList.get(j));
+                        filePaths.add(dataFileService.queryById(fileId).getFilePath());
+                    }
+                }
+                else {
+                    fileNames.add(fileName);
+                    filePaths.add(dataFileService.queryById(fileId).getFilePath());
+                }
             }
         }
+//        System.out.println("!!!!!!!!!!");
+//        for(int i=0;i<fileNames.size();i++){
+//            System.out.println(fileNames.get(i));
+//        }
 
 //        System.out.println("-------------3222--------------" + fileIds);
 
@@ -357,7 +473,8 @@ public class VfileMenuController {
                      * 压缩条目不是具体独立的文件，而是压缩包文件列表中的列表项，称为条目，就像索引一样这里的name就是文件名,
                      * 文件名和之前的重复就会导致文件被覆盖
                      */
-                    ZipEntry zipEntry = new ZipEntry("("+i+")"+fileNames.get(i).split("/")[fileNames.get(i).split("/").length-1]);//在压缩目录中文件的名字
+//                    ZipEntry zipEntry = new ZipEntry("("+i+")"+fileNames.get(i).split("/")[fileNames.get(i).split("/").length-1]);//在压缩目录中文件的名字
+                    ZipEntry zipEntry = new ZipEntry(fileNames.get(i).replace(filePaths.get(i),""));//在压缩目录中文件的名字
                     zipStream.putNextEntry(zipEntry);//定位该压缩条目位置，开始写入文件到压缩包中
                     bufferStream = new BufferedInputStream(zipSource, 1024 * 10);
                     int read = 0;
@@ -399,6 +516,35 @@ public class VfileMenuController {
 
     }
 
+    public static boolean isDirectory(String file){
+        File f = new File(file);
+        if(f.isDirectory()){
+            return true;
+        }
+        return false;
+    }
+
+    public static List<String> getAllFile(String directoryPath) {
+        List<String> list = new ArrayList<String>();
+        File baseFile = new File(directoryPath);
+        if (baseFile.isFile() || !baseFile.exists()) {
+            return list;
+        }
+        File[] files = baseFile.listFiles();
+        for (File file : files) {
+            if (file.isDirectory()) {
+                list.addAll(getAllFile(file.getAbsolutePath()));
+            } else {
+                list.add(file.getAbsolutePath());
+            }
+        }
+//        System.out.println("###############################");
+//        for(int i=0;i<list.size();i++){
+//            System.out.println(list.get(i));
+//        }
+        return list;
+    }
+
 
 
 
@@ -499,7 +645,7 @@ public class VfileMenuController {
 
 
 
-         // 查询数据库中所有的不同年份
+     // 查询数据库中所有的不同年份
 
     @ApiOperation(value = "查询所有年份", notes = "不需要传参数")
     @PostMapping("/AllYear")
@@ -544,4 +690,106 @@ public class VfileMenuController {
     }
     **/
 
+
+/**
+ *
+ * 文件下载代码
+
+ public String downloadMulFile2(String[] fileIds,HttpServletResponse response) {
+
+ if(fileIds.length==1){
+ Long fileId =Long.parseLong(fileIds[0]);
+ String fileName= dataFileService.queryById(fileId).getFileName();
+ String filePath=dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+ FileUtil.downloadFile(response,fileName,filePath);
+ }
+
+ String message= null;
+ String directory = "/root/load";
+ File directoryFile = new File(directory);
+ if (!directoryFile.isDirectory() && !directoryFile.exists()) {
+ directoryFile.mkdirs();
+ }
+ //设置最终输出zip文件的目录+文件名
+ String zipFileName = "已下载文件" + ".zip";
+ String strZipPath = directory + "/" + zipFileName;
+ File zipFile = new File(strZipPath);
+ //读取需要压缩的文件
+ Long fileId =null;
+ String fileName=null;
+
+ List<String> fileNames = new ArrayList<>();
+ for(int i=0;i<fileIds.length;i++){
+ fileId = Long.parseLong(fileIds[i]);
+ if(dataFileService.queryById(fileId)!=null){
+ fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+ fileNames.add(fileName);
+ }
+ }
+
+ //        System.out.println("-------------3222--------------" + fileIds);
+
+ ZipOutputStream zipStream = null;
+ FileInputStream zipSource = null;
+ BufferedInputStream bufferStream = null;
+ try {
+ //构造最终压缩包的输出流
+ zipStream = new ZipOutputStream(new FileOutputStream(zipFile));
+ for (int i = 0; i < fileNames.size(); i++) {
+ //解码获取真实路径与文件名
+ String realFilePath = java.net.URLDecoder.decode(fileNames.get(i), "UTF-8");
+ //                System.out.println(fileNames.get(i));
+ System.out.println(realFilePath);
+ File file = new File(realFilePath);
+ //TODO:未对文件不存在时进行操作，后期优化。
+ if (file.exists()) {
+ zipSource = new FileInputStream(file);//将需要压缩的文件格式化为输入流
+
+ * 压缩条目不是具体独立的文件，而是压缩包文件列表中的列表项，称为条目，就像索引一样这里的name就是文件名,
+ * 文件名和之前的重复就会导致文件被覆盖
+
+ZipEntry zipEntry = new ZipEntry("("+i+")"+fileNames.get(i).split("/")[fileNames.get(i).split("/").length-1]);//在压缩目录中文件的名字
+                    zipStream.putNextEntry(zipEntry);//定位该压缩条目位置，开始写入文件到压缩包中
+    bufferStream = new BufferedInputStream(zipSource, 1024 * 10);
+    int read = 0;
+    byte[] buf = new byte[1024 * 10];
+                    while ((read = bufferStream.read(buf, 0, 1024 * 10)) != -1) {
+        zipStream.write(buf, 0, read);
+    }
+}else{
+        message=message+file.getName()+"不存在！"+"\n";
+        System.out.println(file.getName()+"不存在！");
+        }
+        }
+        } catch (Exception e) {
+        e.printStackTrace();
+        } finally {
+        //关闭流
+        try {
+        if (null != bufferStream) bufferStream.close();
+        if (null != zipStream) {
+        zipStream.flush();
+        zipStream.close();
+        }
+        if (null != zipSource) zipSource.close();
+        } catch (IOException e) {
+        e.printStackTrace();
+        }
+        }
+        //判断系统压缩文件是否存在：true-把该压缩文件通过流输出给客户端后删除该压缩文件  false-未处理
+        if (zipFile.exists()) {
+        System.out.println(zipFileName);
+        System.out.println(strZipPath);
+        FileUtil.downloadFile(response, zipFileName, strZipPath);
+        zipFile.delete();
+        }
+        if(message==null){
+        message="全部文件下载成功！";
+        }
+        return message;
+
+        }
+
+ */
+
 }
-- 
Gitee


From 978315374680f02ff64c100404dca1a3eb1f036f Mon Sep 17 00:00:00 2001
From: root <123>
Date: Thu, 12 Nov 2020 14:49:23 +0800
Subject: [PATCH 20/26] =?UTF-8?q?20201112=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java | 51 ++++++----
 .../controller/rest/VfileMenuController.java  | 94 -------------------
 .../java/com/cetc32/dh/utils/FileUtil.java    | 93 ++++++++++++++++--
 3 files changed, 117 insertions(+), 121 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index d2e7be0..5e8a2ca 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -236,28 +236,41 @@ public class FileSubmitController {
         dataSubmit.setApprover("审核人");
         DataSubmit dataSubmit_new =dataSubmit;
         DataSubmit dataSubmit_new2 =dataSubmit;
-        for(int i=0;i<dataSubmit.getPathList().length;i++){
-            if(dataSubmit.getPathList()[i].equals("文件上传失败!")||dataSubmit.getPathList()[i].equals("文件夹上传失败!")){
-                continue;
+        String path = dataMenuService.queryById(dataSubmit.getMenuid()).getUrl();
+        dataSubmit.setPath(path);
+        for(int i=0;i<dataSubmit.getPathList().length;i++) {
+            if (!dataSubmit.getPathList()[i].contains("上传失败")) {
+                dataSubmit.setTitle(dataSubmit.getPathList()[i]);
+                break;
             }
-            String pathWhole = dataSubmit.getPathList()[i];
-            String[] Pa = pathWhole.split("/");
-            String filename =Pa[Pa.length-1];
-            System.out.println(pathWhole);
-            String path =pathWhole.substring(0,pathWhole.lastIndexOf("/"));
-           dataSubmit_new.setTitle(filename);
-           dataSubmit_new.setPath(path);
-            if(dataSubmitService.insertDataSubmit(dataSubmit_new)>=0){
-                count++;
-            }
-            dataSubmit_new2=dataSubmit_new;
-            dataSubmit_new2.setId(dataSubmit_new.getId()+i+1);
-            dataSubmit_new.setId(dataSubmit_new2.getId());
         }
-        if(count==dataSubmit.getPathList().length){
+        if(FileUtil.copyFolder(upLoadPath,path)) {
+            count = dataSubmitService.insertDataSubmit(dataSubmit);
+        }
+        FileUtil.deleteDir(upLoadPath);
+        if(count>0) {
             return ResponseResult.success("表单信息提交成功！");
         }
         return ResponseResult.error("表单信息提交失败！");
+
+//            String pathWhole = dataSubmit.getPathList()[i];
+//            String[] Pa = pathWhole.split("/");
+//            String filename =Pa[Pa.length-1];
+//            System.out.println(pathWhole);
+//            String path =pathWhole.substring(0,pathWhole.lastIndexOf("/"));
+//           dataSubmit_new.setTitle(filename);
+//           dataSubmit_new.setPath(path);
+//            if(dataSubmitService.insertDataSubmit(dataSubmit_new)>=0){
+//                count++;
+//            }
+//            dataSubmit_new2=dataSubmit_new;
+//            dataSubmit_new2.setId(dataSubmit_new.getId()+i+1);
+//            dataSubmit_new.setId(dataSubmit_new2.getId());
+//        }
+//        if(count==dataSubmit.getPathList().length){
+//            return ResponseResult.success("表单信息提交成功！");
+//        }
+//        return ResponseResult.error("表单信息提交失败！");
     }
 
 
@@ -273,9 +286,9 @@ public class FileSubmitController {
 //        String filepath = "/root/upLoad";
         String filepath = upLoadPath;
         String result = FileUtil.uploadFile(file,filepath);
-        if(result!=null)
+        if(!result.contains("上传失败"))
             return ResponseResult.success(result);
-        return ResponseResult.error("文件夹上传失败!");
+        return ResponseResult.error(result);
 
     }
 
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 4582e51..4d3c684 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -301,100 +301,6 @@ public class VfileMenuController {
     }
 
 
-    public String downloadMulFile2(String[] fileIds,HttpServletResponse response) {
-
-        if(fileIds.length==1){
-            Long fileId =Long.parseLong(fileIds[0]);
-            String fileName= dataFileService.queryById(fileId).getFileName();
-            String filePath=dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
-            FileUtil.downloadFile(response,fileName,filePath);
-        }
-
-        String message= null;
-        String directory = "/root/load";
-        File directoryFile = new File(directory);
-        if (!directoryFile.isDirectory() && !directoryFile.exists()) {
-            directoryFile.mkdirs();
-        }
-        //设置最终输出zip文件的目录+文件名
-        String zipFileName = "已下载文件" + ".zip";
-        String strZipPath = directory + "/" + zipFileName;
-        File zipFile = new File(strZipPath);
-        //读取需要压缩的文件
-        Long fileId =null;
-        String fileName=null;
-
-        List<String> fileNames = new ArrayList<>();
-        for(int i=0;i<fileIds.length;i++){
-            fileId = Long.parseLong(fileIds[i]);
-            if(dataFileService.queryById(fileId)!=null){
-                fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
-                fileNames.add(fileName);
-            }
-        }
-
-//        System.out.println("-------------3222--------------" + fileIds);
-
-        ZipOutputStream zipStream = null;
-        FileInputStream zipSource = null;
-        BufferedInputStream bufferStream = null;
-        try {
-            //构造最终压缩包的输出流
-            zipStream = new ZipOutputStream(new FileOutputStream(zipFile));
-            for (int i = 0; i < fileNames.size(); i++) {
-                //解码获取真实路径与文件名
-                String realFilePath = java.net.URLDecoder.decode(fileNames.get(i), "UTF-8");
-//                System.out.println(fileNames.get(i));
-                System.out.println(realFilePath);
-                File file = new File(realFilePath);
-                //TODO:未对文件不存在时进行操作，后期优化。
-                if (file.exists()) {
-                    zipSource = new FileInputStream(file);//将需要压缩的文件格式化为输入流
-                    /**
-                     * 压缩条目不是具体独立的文件，而是压缩包文件列表中的列表项，称为条目，就像索引一样这里的name就是文件名,
-                     * 文件名和之前的重复就会导致文件被覆盖
-                     */
-                    ZipEntry zipEntry = new ZipEntry("("+i+")"+fileNames.get(i).split("/")[fileNames.get(i).split("/").length-1]);//在压缩目录中文件的名字
-                    zipStream.putNextEntry(zipEntry);//定位该压缩条目位置，开始写入文件到压缩包中
-                    bufferStream = new BufferedInputStream(zipSource, 1024 * 10);
-                    int read = 0;
-                    byte[] buf = new byte[1024 * 10];
-                    while ((read = bufferStream.read(buf, 0, 1024 * 10)) != -1) {
-                        zipStream.write(buf, 0, read);
-                    }
-                }else{
-                    message=message+file.getName()+"不存在！"+"\n";
-                    System.out.println(file.getName()+"不存在！");
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            //关闭流
-            try {
-                if (null != bufferStream) bufferStream.close();
-                if (null != zipStream) {
-                    zipStream.flush();
-                    zipStream.close();
-                }
-                if (null != zipSource) zipSource.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        //判断系统压缩文件是否存在：true-把该压缩文件通过流输出给客户端后删除该压缩文件  false-未处理
-        if (zipFile.exists()) {
-            System.out.println(zipFileName);
-            System.out.println(strZipPath);
-            FileUtil.downloadFile(response, zipFileName, strZipPath);
-            zipFile.delete();
-        }
-        if(message==null){
-            message="全部文件下载成功！";
-        }
-        return message;
-
-    }
 
 
 
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index 15c6029..f42d62c 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -85,14 +85,14 @@ public class FileUtil {
             String flag = "";
             MultipartFile file = files[i];
             String fileName = file.getOriginalFilename();//获取文件名
-            String dirName = filepath + fileName;
-            FileDir = filepath + fileName;
+            String dirName = filepath +getFileName(fileName.substring(0,fileName.indexOf("/")))+File.separator+fileName.substring(fileName.indexOf("/"));
+            FileDir = fileName;
             System.out.println(FileDir);
             System.out.println(dirName);
             makeDir(dirName);
             if (!file.isEmpty()) {
                 try (BufferedOutputStream out = new BufferedOutputStream(
-                        new FileOutputStream(new File(filepath + File.separator + fileName)))) {
+                        new FileOutputStream(new File(dirName)))) {
                     out.write(file.getBytes());
                     out.flush();
                     flag = "文件上传成功";
@@ -107,9 +107,9 @@ public class FileUtil {
             }
         }
         if (uploadsSum == files.length) {
-            return FileDir;
+            return getFileName(FileDir.substring(0,FileDir.indexOf("/")));
         }
-        return null;
+        return FileDir+"上传失败";
     }
 
     public static void downloadFile(HttpServletResponse response, String filename, String path){
@@ -157,6 +157,77 @@ public class FileUtil {
     }
 
 
+    public static boolean copyFolder(String oldPath, String newPath) {
+
+        try {
+            (new File(newPath)).mkdirs(); //如果文件夹不存在 则建立新文件夹
+            File a=new File(oldPath);
+            String[] file=a.list();
+            File temp=null;
+            for (int i = 0; i < file.length; i++) {
+                if(oldPath.endsWith(File.separator)){
+                    temp=new File(oldPath+file[i]);
+                    System.out.println("#################################");
+                    System.out.println(temp);
+                }
+                else{
+                    temp=new File(oldPath+File.separator+file[i]);
+                    System.out.println("#################################");
+                    System.out.println(temp);
+                }
+
+                if(temp.isFile()){
+                    FileInputStream input = new FileInputStream(temp);
+                    FileOutputStream output = new FileOutputStream(newPath + "/" +
+                            (temp.getName()).toString());
+                    byte[] b = new byte[1024 * 5];
+                    int len;
+                    while ( (len = input.read(b)) != -1) {
+                        output.write(b, 0, len);
+                    }
+                    output.flush();
+                    output.close();
+                    input.close();
+                }
+                if(temp.isDirectory()){//如果是子文件夹
+                    copyFolder(oldPath+"/"+file[i],newPath+"/"+file[i]);
+                }
+            }
+            System.out.println("复制整个文件夹内容操作成功");
+            return true;
+        }
+        catch (Exception e) {
+            System.out.println("复制整个文件夹内容操作出错");
+            e.printStackTrace();
+            return false;
+
+        }
+    }
+
+
+    public static void deleteDir(String dirPath)
+    {
+        File file = new File(dirPath);
+        if(file.isFile())
+        {
+            file.delete();
+        }else
+        {
+            File[] files = file.listFiles();
+            if(files == null)
+            {
+                file.delete();
+            }else
+            {
+                for (int i = 0; i < files.length; i++)
+                {
+                    deleteDir(files[i].getAbsolutePath());
+                }
+                file.delete();
+            }
+        }
+    }
+
 
     public static String writeFile(String fileName, String savepath) {
         System.out.println(fileName);
@@ -217,9 +288,15 @@ public class FileUtil {
      */
     private static String getFileName(String fileName) {
         int index = fileName.lastIndexOf(".");
-        final SimpleDateFormat sDateFormate = new SimpleDateFormat("yyyymmddHHmmss");  //设置时间格式
-        String nowTimeStr = sDateFormate.format(new Date()); // 当前时间
-        fileName = fileName.substring(0, index) + "_" + nowTimeStr + fileName.substring(index);
+        String nowTimeStr; // 当前时间
+        Date date = new Date();
+        SimpleDateFormat sif = new SimpleDateFormat("yyyyMMddHHmmss");
+        nowTimeStr = sif.format(date);
+
+//      fileName = fileName.substring(0, index) + "_" + nowTimeStr + fileName.substring(index);
+
+        fileName=fileName+"_"+nowTimeStr;
+
         return fileName;
     }
 
-- 
Gitee


From 537c6fdc0b6d6442569968fd281cc25d5bd7ac4b Mon Sep 17 00:00:00 2001
From: root <123>
Date: Thu, 12 Nov 2020 17:44:34 +0800
Subject: [PATCH 21/26] =?UTF-8?q?20201112=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java | 84 ++++++++++---------
 .../java/com/cetc32/dh/utils/FileUtil.java    |  6 +-
 2 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index 5e8a2ca..be95797 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -8,16 +8,16 @@
  */
 package com.cetc32.dh.controller.rest;
 
-import com.cetc32.dh.service.DataMenuService;
-import com.cetc32.dh.service.FileToMenuService;
-import com.cetc32.dh.utils.FileUtil;
 import com.cetc32.dh.common.response.PageDataResult;
 import com.cetc32.dh.common.response.ResponseResult;
-import com.cetc32.dh.entity.DataSubmit;
 import com.cetc32.dh.entity.DataFile;
-import com.cetc32.dh.service.DataFileService;
+import com.cetc32.dh.entity.DataSubmit;
 import com.cetc32.dh.entity.FileToMenu;
+import com.cetc32.dh.service.DataFileService;
+import com.cetc32.dh.service.DataMenuService;
 import com.cetc32.dh.service.DataSubmitService;
+import com.cetc32.dh.service.FileToMenuService;
+import com.cetc32.dh.utils.FileUtil;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -26,9 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+
+import java.io.File;
+import java.util.*;
 
 
 @RestController
@@ -228,49 +228,55 @@ public class FileSubmitController {
             @ApiImplicitParam(name="path",value ="提交路径(不传参)",paramType = "body",dataType = "String",defaultValue = ""),
     })
     @PostMapping("/sub")
-    public ResponseResult DataSub(@RequestBody DataSubmit dataSubmit){
+    public ResponseResult DataSub(@RequestBody DataSubmit dataSubmit) {
         System.out.println(dataSubmit);
-        Integer count =0;
+        String fileName="";
+        Integer count = 0;
         dataSubmit.setSubtype("1");
         dataSubmit.setStatus(0);
         dataSubmit.setApprover("审核人");
-        DataSubmit dataSubmit_new =dataSubmit;
-        DataSubmit dataSubmit_new2 =dataSubmit;
+        DataSubmit dataSubmit_new = dataSubmit;
+        DataSubmit dataSubmit_new2 = dataSubmit;
         String path = dataMenuService.queryById(dataSubmit.getMenuid()).getUrl();
         dataSubmit.setPath(path);
-        for(int i=0;i<dataSubmit.getPathList().length;i++) {
-            if (!dataSubmit.getPathList()[i].contains("上传失败")) {
-                dataSubmit.setTitle(dataSubmit.getPathList()[i]);
-                break;
+        File baseFile=new File(upLoadPath);
+        File[] files = baseFile.listFiles();
+        File file =null;
+        List<String> pathListNew = new ArrayList<>();
+        for (int i=0;i<files.length;i++) {
+            file=files[i];
+            if (file.isDirectory()) {
+                fileName=FileUtil.getFileName(file.getName());
+                file.renameTo(new File(upLoadPath+fileName));
+            }else{
+                fileName=file.getName();
             }
+            pathListNew.add(fileName);
         }
-        if(FileUtil.copyFolder(upLoadPath,path)) {
-            count = dataSubmitService.insertDataSubmit(dataSubmit);
+
+//        Set<String> pathset = new HashSet<>();
+//        for (String title : dataSubmit.getPathList()) {
+//            if ((!title.contains("上传失败")) && pathset.add(title)) {
+//                pathListNew.add(title);
+//            }
+//        }
+        for (int i = 0; i < pathListNew.size(); i++) {
+            dataSubmit_new = dataSubmit;
+            dataSubmit_new.setTitle(pathListNew.get(i));
+            if (dataSubmitService.insertDataSubmit(dataSubmit_new) >= 0) {
+                count++;
+            }
+            dataSubmit_new2 = dataSubmit_new;
+            dataSubmit_new2.setId(dataSubmit_new.getId() + i + 1);
+            dataSubmit_new.setId(dataSubmit_new2.getId());
         }
-        FileUtil.deleteDir(upLoadPath);
-        if(count>0) {
+
+        if (FileUtil.copyFolder(upLoadPath,path)&&count == pathListNew.size()){
+            FileUtil.deleteDir(upLoadPath);
             return ResponseResult.success("表单信息提交成功！");
         }
-        return ResponseResult.error("表单信息提交失败！");
 
-//            String pathWhole = dataSubmit.getPathList()[i];
-//            String[] Pa = pathWhole.split("/");
-//            String filename =Pa[Pa.length-1];
-//            System.out.println(pathWhole);
-//            String path =pathWhole.substring(0,pathWhole.lastIndexOf("/"));
-//           dataSubmit_new.setTitle(filename);
-//           dataSubmit_new.setPath(path);
-//            if(dataSubmitService.insertDataSubmit(dataSubmit_new)>=0){
-//                count++;
-//            }
-//            dataSubmit_new2=dataSubmit_new;
-//            dataSubmit_new2.setId(dataSubmit_new.getId()+i+1);
-//            dataSubmit_new.setId(dataSubmit_new2.getId());
-//        }
-//        if(count==dataSubmit.getPathList().length){
-//            return ResponseResult.success("表单信息提交成功！");
-//        }
-//        return ResponseResult.error("表单信息提交失败！");
+        return ResponseResult.error("表单信息提交失败！");
     }
 
 
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index f42d62c..e3dc490 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -85,7 +85,7 @@ public class FileUtil {
             String flag = "";
             MultipartFile file = files[i];
             String fileName = file.getOriginalFilename();//获取文件名
-            String dirName = filepath +getFileName(fileName.substring(0,fileName.indexOf("/")))+File.separator+fileName.substring(fileName.indexOf("/"));
+            String dirName = filepath +fileName;
             FileDir = fileName;
             System.out.println(FileDir);
             System.out.println(dirName);
@@ -107,7 +107,7 @@ public class FileUtil {
             }
         }
         if (uploadsSum == files.length) {
-            return getFileName(FileDir.substring(0,FileDir.indexOf("/")));
+            return FileDir.substring(0,FileDir.indexOf("/"));
         }
         return FileDir+"上传失败";
     }
@@ -286,7 +286,7 @@ public class FileUtil {
     /**
      * 文件名后缀前添加一个时间戳
      */
-    private static String getFileName(String fileName) {
+    public static String getFileName(String fileName) {
         int index = fileName.lastIndexOf(".");
         String nowTimeStr; // 当前时间
         Date date = new Date();
-- 
Gitee


From c59ea5ead4430a2bb922c7443739bd7be7c1b4a6 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Mon, 16 Nov 2020 10:32:51 +0800
Subject: [PATCH 22/26] =?UTF-8?q?20201116=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java | 26 +++++++++++++-----
 .../controller/rest/VfileMenuController.java  | 27 +++----------------
 .../java/com/cetc32/dh/utils/FileUtil.java    | 25 +++++++++++++++++
 3 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index be95797..a5e2e8e 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -125,6 +125,9 @@ public class FileSubmitController {
             Integer id =ids.get(i);
             dataSubmit = dataSubmitService.queryById(id);
             if(dataSubmitService.rejectSubmit(dataSubmit)>0){
+                String delFile = dataSubmit.getPath()+File.separator+dataSubmit.getTitle();
+                System.out.println(delFile);
+                FileUtil.deleteDir(delFile);
                 sum=sum+1;
             }
         }
@@ -254,12 +257,6 @@ public class FileSubmitController {
             pathListNew.add(fileName);
         }
 
-//        Set<String> pathset = new HashSet<>();
-//        for (String title : dataSubmit.getPathList()) {
-//            if ((!title.contains("上传失败")) && pathset.add(title)) {
-//                pathListNew.add(title);
-//            }
-//        }
         for (int i = 0; i < pathListNew.size(); i++) {
             dataSubmit_new = dataSubmit;
             dataSubmit_new.setTitle(pathListNew.get(i));
@@ -299,5 +296,22 @@ public class FileSubmitController {
     }
 
 
+    /**
+     * 文件上传缓冲区清空
+     * @return 返回文件清空结果
+     * */
+    @ApiOperation(value="清空历史上传")
+    @RequestMapping(value = "/clearUploadFile", method = RequestMethod.POST)
+    @ApiImplicitParam(name="不需要传递参数",value ="null")
+    public ResponseResult clearUploadFile() {
+        FileUtil.deleteDir(upLoadPath);
+        File file = new File(upLoadPath);
+        if (!file.exists()) {
+            return ResponseResult.success("历史上传清空成功");
+        }
+       return ResponseResult.error("历史上传清空失败");
+    }
+
+
 
 }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 4d3c684..6ad3fe6 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -341,7 +341,7 @@ public class VfileMenuController {
             if(dataFileService.queryById(fileId)!=null){
                 fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
                 if(isDirectory(fileName)){
-                    List<String> stringList = getAllFile(fileName);
+                    List<String> stringList = FileUtil.getAllFile(fileName);
                     for(int j= 0;j<stringList.size();j++){
                         fileNames.add(stringList.get(j));
                         filePaths.add(dataFileService.queryById(fileId).getFilePath());
@@ -390,7 +390,7 @@ public class VfileMenuController {
                     }
                 }else{
                     message=message+file.getName()+"不存在！"+"\n";
-                    System.out.println(file.getName()+"不存在！");
+//                    System.out.println(file.getName()+"不存在！");
                 }
             }
         } catch (Exception e) {
@@ -413,7 +413,7 @@ public class VfileMenuController {
             System.out.println(zipFileName);
             System.out.println(strZipPath);
             FileUtil.downloadFile(response, zipFileName, strZipPath);
-            zipFile.delete();
+            FileUtil.deleteDir(directory);
         }
         if(message==null){
             message="全部文件下载成功！";
@@ -430,26 +430,7 @@ public class VfileMenuController {
         return false;
     }
 
-    public static List<String> getAllFile(String directoryPath) {
-        List<String> list = new ArrayList<String>();
-        File baseFile = new File(directoryPath);
-        if (baseFile.isFile() || !baseFile.exists()) {
-            return list;
-        }
-        File[] files = baseFile.listFiles();
-        for (File file : files) {
-            if (file.isDirectory()) {
-                list.addAll(getAllFile(file.getAbsolutePath()));
-            } else {
-                list.add(file.getAbsolutePath());
-            }
-        }
-//        System.out.println("###############################");
-//        for(int i=0;i<list.size();i++){
-//            System.out.println(list.get(i));
-//        }
-        return list;
-    }
+
 
 
 
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index e3dc490..0c71ff9 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -14,7 +14,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 public class FileUtil {
@@ -301,6 +303,29 @@ public class FileUtil {
     }
 
 
+    public static List<String> getAllFile(String directoryPath) {
+        List<String> list = new ArrayList<String>();
+        File baseFile = new File(directoryPath);
+        if (baseFile.isFile() || !baseFile.exists()) {
+            return list;
+        }
+        File[] files = baseFile.listFiles();
+        for (File file : files) {
+            if (file.isDirectory()) {
+                list.addAll(getAllFile(file.getAbsolutePath()));
+            } else {
+                list.add(file.getAbsolutePath());
+            }
+        }
+
+        for(int i=0;i<list.size();i++){
+            System.out.println(list.get(i));
+        }
+        System.out.println("###############################!!!!!!!!!");
+        return list;
+    }
+
+
 
 
 
-- 
Gitee


From f30d3deefa2a7ef7a11add81b89e93f692225a0f Mon Sep 17 00:00:00 2001
From: root <123>
Date: Mon, 16 Nov 2020 16:09:17 +0800
Subject: [PATCH 23/26] =?UTF-8?q?20201116=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java | 182 +++++++++---------
 .../controller/rest/VfileMenuController.java  |  56 ++----
 .../service/impl/DataSubmitServiceImpl.java   |  50 +++--
 .../java/com/cetc32/dh/utils/FileUtil.java    |  24 ++-
 4 files changed, 149 insertions(+), 163 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index a5e2e8e..3525334 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -1,5 +1,6 @@
 /**
  * Copyright(C)版权所有 中国电子科技集团公司第三十二研究所
+ *
  * @Title: 文件导入控制器文件
  * @author: 徐文远、肖小霞
  * @version: 1.0
@@ -28,7 +29,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 
 @RestController
@@ -45,7 +48,6 @@ public class FileSubmitController {
     DataMenuService dataMenuService;
 
 
-
     @Value("${upLoadPath}")
     String upLoadPath;
 
@@ -75,16 +77,16 @@ public class FileSubmitController {
      * 查询当前用户提交的所有导入请求
      * @return 返回给前端分装好的结构体
      * **/
-    @ApiOperation(value="当前用户名提交的数据")
+    @ApiOperation(value = "当前用户名提交的数据")
     @PostMapping("/request")
-    public PageDataResult mySubmits(Integer page,Integer results){
-        DataSubmit ds=new DataSubmit();
+    public PageDataResult mySubmits(Integer page, Integer results) {
+        DataSubmit ds = new DataSubmit();
         ds.setSubmitor("admin");
-        List<DataSubmit> list =new ArrayList<>();
-        Integer count =0;
-        list= dataSubmitService.selectMySubmit(ds);
-        count= dataSubmitService.countMineSubmit(ds);
-        return new PageDataResult(count,list, (page - 1) * results);
+        List<DataSubmit> list = new ArrayList<>();
+        Integer count = 0;
+        list = dataSubmitService.selectMySubmit(ds);
+        count = dataSubmitService.countMineSubmit(ds);
+        return new PageDataResult(count, list, (page - 1) * results);
 
     }
 
@@ -92,19 +94,18 @@ public class FileSubmitController {
      * 查询当前用户可以审核的所有导入请求
      * @return 返回给前端分装好的结构体
      * **/
-    @ApiOperation(value="当前用户名下需要审核及已审核的所有任务")
+    @ApiOperation(value = "当前用户名下需要审核及已审核的所有任务")
     @PostMapping("/task")
-    public PageDataResult myApproves(Integer page,Integer results){
-        DataSubmit ds=new DataSubmit();
+    public PageDataResult myApproves(Integer page, Integer results) {
+        DataSubmit ds = new DataSubmit();
         ds.setSubmitor("admin");
-        List<DataSubmit> list =new ArrayList<>();
-        Integer count =0;
-        list= dataSubmitService.selectMyApprove(ds);
-        for(int i=0;i<list.size();i++){
-;
+        List<DataSubmit> list = new ArrayList<>();
+        Integer count = 0;
+        list = dataSubmitService.selectMyApprove(ds);
+        for (int i = 0; i < list.size(); i++) {
         }
-        count= dataSubmitService.countMineApprov(ds);
-        return new PageDataResult(count,list, (page - 1) * results);
+        count = dataSubmitService.countMineApprov(ds);
+        return new PageDataResult(count, list, (page - 1) * results);
 //        return new PageDataResult(count,list);
     }
 
@@ -113,25 +114,25 @@ public class FileSubmitController {
      * @param map
      * @return 返回执行结果
      * **/
-    @ApiOperation(value="拒绝请求")
+    @ApiOperation(value = "拒绝请求")
     @PostMapping("/reject")
-    @ApiImplicitParam(name="ids",value ="申请审批的记录id",dataType = "List",defaultValue = "")
-    public ResponseResult rejectSubmit(@RequestBody Map<String,Object> map){
+    @ApiImplicitParam(name = "ids", value = "申请审批的记录id", dataType = "List", defaultValue = "")
+    public ResponseResult rejectSubmit(@RequestBody Map<String, Object> map) {
         List<Integer> ids = new ArrayList<>();
-        ids=(List<Integer>) map.get("ids");
-        DataSubmit dataSubmit =null;
-        int sum =0;
-        for(int i=0;i<ids.size();i++){
-            Integer id =ids.get(i);
+        ids = (List<Integer>) map.get("ids");
+        DataSubmit dataSubmit = null;
+        int sum = 0;
+        for (int i = 0; i < ids.size(); i++) {
+            Integer id = ids.get(i);
             dataSubmit = dataSubmitService.queryById(id);
-            if(dataSubmitService.rejectSubmit(dataSubmit)>0){
-                String delFile = dataSubmit.getPath()+File.separator+dataSubmit.getTitle();
+            if (dataSubmitService.rejectSubmit(dataSubmit) > 0) {
+                String delFile = dataSubmit.getPath() + File.separator + dataSubmit.getTitle();
                 System.out.println(delFile);
                 FileUtil.deleteDir(delFile);
-                sum=sum+1;
+                sum = sum + 1;
             }
         }
-        if(sum == ids.size())
+        if (sum == ids.size())
             return ResponseResult.success("已审批拒绝");
         return ResponseResult.error("审批失败");
     }
@@ -140,20 +141,20 @@ public class FileSubmitController {
      * 拒绝导入请求
      * @return 返回执行结果
      * **/
-    @ApiOperation(value="审核通过")
+    @ApiOperation(value = "审核通过")
     @PostMapping("/accept")
-    @ApiImplicitParam(name="ids",value ="申请审批的记录id",dataType = "List",defaultValue = "")
-    public ResponseResult acceptSubmit(@RequestBody Map<String,Object> map){
+    @ApiImplicitParam(name = "ids", value = "申请审批的记录id", dataType = "List", defaultValue = "")
+    public ResponseResult acceptSubmit(@RequestBody Map<String, Object> map) {
         System.out.println(map);
         List<Integer> ids = new ArrayList<>();
-        ids=(List<Integer>) map.get("ids");
+        ids = (List<Integer>) map.get("ids");
 
         DataSubmit dataSubmit = null;
         DataFile dataFile = new DataFile();
         DataFile new_dataFile = null;
         FileToMenu fileToMenu = new FileToMenu();
-        int sum =0;
-        for(int i=0;i<ids.size();i++){
+        int sum = 0;
+        for (int i = 0; i < ids.size(); i++) {
             Integer id = ids.get(i);
             dataSubmit = dataSubmitService.queryById(id);
             System.out.println(dataSubmit);
@@ -162,24 +163,24 @@ public class FileSubmitController {
             dataFile.setRegion(dataSubmit.getArea());
             dataFile.setFileYear(dataSubmit.getYear());
             dataFile.setFileSecurity(dataSubmit.getPlevel().toString());
-            dataFile.setFileType(dataSubmit.getTitle().substring(dataSubmit.getTitle().lastIndexOf(".")+1));
-            if(i!=0){
-                dataFile.setId(dataFile.getId()+i);
+            dataFile.setFileType(dataSubmit.getTitle().substring(dataSubmit.getTitle().lastIndexOf(".") + 1));
+            if (i != 0) {
+                dataFile.setId(dataFile.getId() + i);
             }
-            int flag_file=dataFileService.insertDataFile(dataFile);
+            int flag_file = dataFileService.insertDataFile(dataFile);
             new_dataFile = dataFile;
 //            System.out.println("new_dataFile！！！！！！！！！！！！！！");
             System.out.println(new_dataFile);
             fileToMenu.setFileId(new_dataFile.getId());
             fileToMenu.setMenuId(dataSubmit.getMenuid());
             int flag_filetomenu = fileToMenuService.insert(fileToMenu);
-            if(flag_file>0&&flag_filetomenu>0){
-                if(dataSubmitService.acceptSubmit(dataSubmit)>0){
-                    sum=sum+1;
+            if (flag_file > 0 && flag_filetomenu > 0) {
+                if (dataSubmitService.acceptSubmit(dataSubmit) > 0) {
+                    sum = sum + 1;
                 }
             }
         }
-        if(sum == ids.size())
+        if (sum == ids.size())
             return ResponseResult.success("已审批通过");
         return ResponseResult.error("审批失败");
     }
@@ -189,51 +190,51 @@ public class FileSubmitController {
      * @param results 每页显示条数
      * @return 分页数据
      * */
-    @ApiOperation(value="所有待审核的数据")
+    @ApiOperation(value = "所有待审核的数据")
     @PostMapping("/approves")
-    public PageDataResult myAprroves(@ApiParam(value="页码")Integer page, @ApiParam(value="每页数据条数")Integer results){
-        if(null ==page || page <= 0)
-            page=1;
-        if(null ==results||results <= 0 )
-            results=10;
-        DataSubmit ds =new DataSubmit();
+    public PageDataResult myAprroves(@ApiParam(value = "页码") Integer page, @ApiParam(value = "每页数据条数") Integer results) {
+        if (null == page || page <= 0)
+            page = 1;
+        if (null == results || results <= 0)
+            results = 10;
+        DataSubmit ds = new DataSubmit();
         ds.setStatus(0);
-        List<DataSubmit> list =new ArrayList<>();
-        list=dataSubmitService.selectReadyApprove(ds);
-        List<DataSubmit> list_new =new ArrayList<>();
-        for(int i=0;i<list.size();i++){
-            String menuName= dataMenuService.queryById(list.get(i).getMenuid()).getMenuName();
+        List<DataSubmit> list = new ArrayList<>();
+        list = dataSubmitService.selectReadyApprove(ds);
+        List<DataSubmit> list_new = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            String menuName = dataMenuService.queryById(list.get(i).getMenuid()).getMenuName();
             list.get(i).setMenuName(menuName);
         }
         return new PageDataResult(dataSubmitService.countReadyApprove(ds),
-                list,(page-1)*results);
+                list, (page - 1) * results);
     }
 
 
     /**
      * 提交数据
-//     * @param dataSubmit 数据信息
+     //     * @param dataSubmit 数据信息
      * @return 返回提交结果
      * */
-    @ApiOperation(value="提交数据",notes="id不传参数")
+    @ApiOperation(value = "提交数据", notes = "id不传参数")
     @ApiImplicitParams({
-            @ApiImplicitParam(name="id",value ="记录id号(不传参)",paramType = "body",dataType = "Integer",required =false),
-            @ApiImplicitParam(name="subtype",value ="提交类型",paramType = "body",dataType = "String",defaultValue = ""),
-            @ApiImplicitParam(name="plevel",value ="文件等级",paramType = "body",dataType = "Integer",defaultValue = ""),
-            @ApiImplicitParam(name="status",value ="文件状态",paramType = "body",dataType = "Integer",defaultValue = ""),
-            @ApiImplicitParam(name="submitor",value ="提交者",paramType = "body",dataType = "String",defaultValue = ""),
-            @ApiImplicitParam(name="approver",value ="审核人",paramType = "body",dataType = "String",defaultValue = ""),
-            @ApiImplicitParam(name="menuid",value ="编目号",paramType = "body",dataType = "Integer",defaultValue = ""),
-            @ApiImplicitParam(name="menuName",value ="编目名称",paramType = "body",dataType = "String",defaultValue = ""),
-            @ApiImplicitParam(name="year",value ="年份",paramType = "body",dataType = "Integer",defaultValue = ""),
-            @ApiImplicitParam(name="title",value ="标题",paramType = "body",dataType = "String",defaultValue = ""),
-            @ApiImplicitParam(name="area",value ="区域",paramType = "body",dataType = "String",defaultValue = ""),
-            @ApiImplicitParam(name="path",value ="提交路径(不传参)",paramType = "body",dataType = "String",defaultValue = ""),
+            @ApiImplicitParam(name = "id", value = "记录id号(不传参)", paramType = "body", dataType = "Integer", required = false),
+            @ApiImplicitParam(name = "subtype", value = "提交类型", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "plevel", value = "文件等级", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "status", value = "文件状态", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "submitor", value = "提交者", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "approver", value = "审核人", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "menuid", value = "编目号", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "menuName", value = "编目名称", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "year", value = "年份", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "title", value = "标题", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "area", value = "区域", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "path", value = "提交路径(不传参)", paramType = "body", dataType = "String", defaultValue = ""),
     })
     @PostMapping("/sub")
     public ResponseResult DataSub(@RequestBody DataSubmit dataSubmit) {
         System.out.println(dataSubmit);
-        String fileName="";
+        String fileName = "";
         Integer count = 0;
         dataSubmit.setSubtype("1");
         dataSubmit.setStatus(0);
@@ -242,17 +243,17 @@ public class FileSubmitController {
         DataSubmit dataSubmit_new2 = dataSubmit;
         String path = dataMenuService.queryById(dataSubmit.getMenuid()).getUrl();
         dataSubmit.setPath(path);
-        File baseFile=new File(upLoadPath);
+        File baseFile = new File(upLoadPath);
         File[] files = baseFile.listFiles();
-        File file =null;
+        File file = null;
         List<String> pathListNew = new ArrayList<>();
-        for (int i=0;i<files.length;i++) {
-            file=files[i];
+        for (int i = 0; i < files.length; i++) {
+            file = files[i];
             if (file.isDirectory()) {
-                fileName=FileUtil.getFileName(file.getName());
-                file.renameTo(new File(upLoadPath+fileName));
-            }else{
-                fileName=file.getName();
+                fileName = FileUtil.getFileName(file.getName());
+                file.renameTo(new File(upLoadPath + fileName));
+            } else {
+                fileName = file.getName();
             }
             pathListNew.add(fileName);
         }
@@ -268,7 +269,7 @@ public class FileSubmitController {
             dataSubmit_new.setId(dataSubmit_new2.getId());
         }
 
-        if (FileUtil.copyFolder(upLoadPath,path)&&count == pathListNew.size()){
+        if (FileUtil.copyFolder(upLoadPath, path) && count == pathListNew.size()) {
             FileUtil.deleteDir(upLoadPath);
             return ResponseResult.success("表单信息提交成功！");
         }
@@ -282,14 +283,14 @@ public class FileSubmitController {
      * @param file 目录，文件
      * @return 返回提交结果
      * */
-    @ApiOperation(value="文件上传")
+    @ApiOperation(value = "文件上传")
     @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
-    @ApiImplicitParam(name="files",value ="文件夹下的文件list",paramType = "body",dataType = "List",defaultValue = "")
+    @ApiImplicitParam(name = "files", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = "")
     public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") @RequestBody MultipartFile[] file) {
 //        String filepath = "/root/upLoad";
         String filepath = upLoadPath;
-        String result = FileUtil.uploadFile(file,filepath);
-        if(!result.contains("上传失败"))
+        String result = FileUtil.uploadFile(file, filepath);
+        if (!result.contains("上传失败"))
             return ResponseResult.success(result);
         return ResponseResult.error(result);
 
@@ -300,18 +301,17 @@ public class FileSubmitController {
      * 文件上传缓冲区清空
      * @return 返回文件清空结果
      * */
-    @ApiOperation(value="清空历史上传")
+    @ApiOperation(value = "清空历史上传")
     @RequestMapping(value = "/clearUploadFile", method = RequestMethod.POST)
-    @ApiImplicitParam(name="不需要传递参数",value ="null")
+    @ApiImplicitParam(name = "不需要传递参数", value = "null")
     public ResponseResult clearUploadFile() {
         FileUtil.deleteDir(upLoadPath);
         File file = new File(upLoadPath);
         if (!file.exists()) {
             return ResponseResult.success("历史上传清空成功");
         }
-       return ResponseResult.error("历史上传清空失败");
+        return ResponseResult.error("历史上传清空失败");
     }
 
 
-
 }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 6ad3fe6..2584ff3 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -17,22 +17,16 @@ import com.cetc32.dh.service.OptionsService;
 import com.cetc32.dh.service.VfileMenuService;
 import com.cetc32.dh.utils.FileUtil;
 import com.github.pagehelper.PageHelper;
-import com.sun.deploy.net.URLEncoder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Base64Util;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -301,22 +295,23 @@ public class VfileMenuController {
     }
 
 
-
-
-
-
+    /**
+     * 下载文件文件，文件夹
+     *
+     * @return String
+     */
     @ApiImplicitParams({
             @ApiImplicitParam(name = "fileIds", value = "文件id", paramType = "body", dataType = "List"),
     })
     @GetMapping("/downloadMulFile")
-    public String downloadMulFile(String[] fileIds,HttpServletResponse response) {
-
-        if(fileIds.length==1){
-            Long fileId =Long.parseLong(fileIds[0]);
-            String fileName= dataFileService.queryById(fileId).getFileName();
-            String filePath=dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
-            if(!isDirectory(filePath)){
-                FileUtil.downloadFile(response,fileName,filePath);
+    public String downloadMulFile(String[] fileIds, HttpServletResponse response) {
+
+        if (fileIds.length == 1) {
+            Long fileId = Long.parseLong(fileIds[0]);
+            String fileName = dataFileService.queryById(fileId).getFileName();
+            String filePath = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+            if (!FileUtil.isDirectory(filePath)) {
+                FileUtil.downloadFile(response, fileName, filePath);
             }
         }
 
@@ -340,25 +335,18 @@ public class VfileMenuController {
             fileId = Long.parseLong(fileIds[i]);
             if(dataFileService.queryById(fileId)!=null){
                 fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
-                if(isDirectory(fileName)){
+                if (FileUtil.isDirectory(fileName)) {
                     List<String> stringList = FileUtil.getAllFile(fileName);
-                    for(int j= 0;j<stringList.size();j++){
+                    for (int j = 0; j < stringList.size(); j++) {
                         fileNames.add(stringList.get(j));
                         filePaths.add(dataFileService.queryById(fileId).getFilePath());
                     }
-                }
-                else {
+                } else {
                     fileNames.add(fileName);
                     filePaths.add(dataFileService.queryById(fileId).getFilePath());
                 }
             }
         }
-//        System.out.println("!!!!!!!!!!");
-//        for(int i=0;i<fileNames.size();i++){
-//            System.out.println(fileNames.get(i));
-//        }
-
-//        System.out.println("-------------3222--------------" + fileIds);
 
         ZipOutputStream zipStream = null;
         FileInputStream zipSource = null;
@@ -422,18 +410,6 @@ public class VfileMenuController {
 
     }
 
-    public static boolean isDirectory(String file){
-        File f = new File(file);
-        if(f.isDirectory()){
-            return true;
-        }
-        return false;
-    }
-
-
-
-
-
 
 /**
  *
diff --git a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
index 446faee..d3ca302 100644
--- a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
@@ -9,12 +9,18 @@
  */
 package com.cetc32.dh.service.impl;
 
+import com.cetc32.dh.common.response.ResponseResult;
 import com.cetc32.dh.entity.DataSubmit;
 import com.cetc32.dh.mybatis.DataSubmitMapper;
 import com.cetc32.dh.service.DataSubmitService;
+import com.cetc32.dh.utils.FileUtil;
 import org.apache.shiro.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -37,13 +43,12 @@ public class DataSubmitServiceImpl implements DataSubmitService {
      **/
     @Override
     public Integer insertDataSubmit(DataSubmit ds) {
-        if(ds==null){
+        if (ds == null) {
             return -1;
         }
-        if(ds.getApprover()==null||ds.getPath()==null||ds.getArea()==null||ds.getYear()==null) {
+        if (ds.getApprover() == null || ds.getPath() == null || ds.getArea() == null || ds.getYear() == null) {
             return -1;
-        }
-        else{
+        } else {
             return dsMapper.insertOne(ds);
         }
     }
@@ -56,10 +61,10 @@ public class DataSubmitServiceImpl implements DataSubmitService {
      **/
     @Override
     public Integer rejectSubmit(DataSubmit ds) {
-        if(ds==null){
+        if (ds == null) {
             return -1;
         }
-        if(ds.getId()==null){
+        if (ds.getId() == null) {
             return -1;
         }
         ds.setStatus(-1);
@@ -76,10 +81,10 @@ public class DataSubmitServiceImpl implements DataSubmitService {
      **/
     @Override
     public Integer acceptSubmit(DataSubmit ds) {
-        if(ds==null){
+        if (ds == null) {
             return -1;
         }
-        if(ds.getId()==null){
+        if (ds.getId() == null) {
             return -1;
         }
         ds.setStatus(1);
@@ -95,7 +100,7 @@ public class DataSubmitServiceImpl implements DataSubmitService {
      **/
     @Override
     public List<DataSubmit> selectMySubmit(DataSubmit dataSubmit) {
-        if(dataSubmit==null){
+        if (dataSubmit == null) {
             return null;
         }
         dataSubmit.setApprover(null);
@@ -110,7 +115,7 @@ public class DataSubmitServiceImpl implements DataSubmitService {
      **/
     @Override
     public List<DataSubmit> selectMyApprove(DataSubmit dataSubmit) {
-        if(dataSubmit==null){
+        if (dataSubmit == null) {
             return null;
         }
         dataSubmit.setSubmitor(null);
@@ -120,12 +125,13 @@ public class DataSubmitServiceImpl implements DataSubmitService {
 
     /**
      * 根据当前用户统计所有任务个数
+     *
      * @param dataSubmit 通常dataSubmit一次查询只包含submitor。
      * @return 反馈查询到的数据个数
-     * */
-    public Integer countMineSubmit(DataSubmit dataSubmit){
+     */
+    public Integer countMineSubmit(DataSubmit dataSubmit) {
         Assert.notNull(dataSubmit);
-        if(null==dataSubmit.getSubmitor())
+        if (null == dataSubmit.getSubmitor())
             return -1;
         dataSubmit.setApprover(null);
         return dsMapper.countMine(dataSubmit);
@@ -133,12 +139,13 @@ public class DataSubmitServiceImpl implements DataSubmitService {
 
     /**
      * 根据当前用户统计所有任务个数
+     *
      * @param dataSubmit 通常dataSubmit一次查询只包含approver。
      * @return 反馈查询到的数据个数
-     * */
-    public Integer countMineApprov(DataSubmit dataSubmit){
+     */
+    public Integer countMineApprov(DataSubmit dataSubmit) {
         Assert.notNull(dataSubmit);
-        if(null==dataSubmit.getApprover())
+        if (null == dataSubmit.getApprover())
             return -1;
         dataSubmit.setSubmitor(null);
         return dsMapper.countMine(dataSubmit);
@@ -169,9 +176,10 @@ public class DataSubmitServiceImpl implements DataSubmitService {
 
     /**
      * DataSubmitMapper注入方法，必须用@Autowired注解
+     *
      * @param dsMapper 待注入的bean
      * @return 反馈为空
-     * **/
+     **/
     @Autowired
     public void setDsMapper(DataSubmitMapper dsMapper) {
         this.dsMapper = dsMapper;
@@ -179,10 +187,14 @@ public class DataSubmitServiceImpl implements DataSubmitService {
 
     /**
      * 根据当前id查找DataSubmit实体
+     *
      * @param id 根据id查询
      * @return DataSubmit
      */
     @Override
-    public DataSubmit queryById(Integer id){return dsMapper.queryById(id);}
-
+    public DataSubmit queryById(Integer id) {
+        return dsMapper.queryById(id);
+    }
 }
+
+
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index 0c71ff9..f2da387 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -1,14 +1,6 @@
 package com.cetc32.dh.utils;
 
-import com.cetc32.dh.common.response.ResponseResult;
-import com.sun.xml.internal.fastinfoset.tools.FI_DOM_Or_XML_DOM_SAX_SAXEvent;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.apache.http.entity.ContentType;
 import org.apache.logging.log4j.util.Base64Util;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -17,7 +9,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
+
 
 public class FileUtil {
 
@@ -151,7 +143,7 @@ public class FileUtil {
                         os.flush();
                         os.close();
                     }
-                }catch (IOException e){
+                } catch (IOException e) {
                     e.printStackTrace();
                 }
             }
@@ -159,13 +151,19 @@ public class FileUtil {
     }
 
 
+    public static boolean isDirectory(String file) {
+        File f = new File(file);
+        return f.isDirectory();
+    }
+
+
     public static boolean copyFolder(String oldPath, String newPath) {
 
         try {
             (new File(newPath)).mkdirs(); //如果文件夹不存在 则建立新文件夹
-            File a=new File(oldPath);
-            String[] file=a.list();
-            File temp=null;
+            File a = new File(oldPath);
+            String[] file = a.list();
+            File temp = null;
             for (int i = 0; i < file.length; i++) {
                 if(oldPath.endsWith(File.separator)){
                     temp=new File(oldPath+file[i]);
-- 
Gitee


From 0914723eb119882dc4ced0935fc14fefebbd4b30 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Tue, 17 Nov 2020 16:29:35 +0800
Subject: [PATCH 24/26] =?UTF-8?q?20201117=E6=95=B0=E6=8D=AE=E8=A1=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cetc32/dh/common/filter/FormFilter.java   |   2 +-
 .../dh/common/response/PageDataResult.java    |   1 -
 .../controller/rest/DataFileController.java   |   1 -
 .../controller/rest/DataMenuController.java   |   3 -
 .../java/com/cetc32/dh/entity/DataFile.java   | 185 +++++++++++++----
 .../java/com/cetc32/dh/entity/DataSubmit.java | 195 ++++++++++++++----
 .../com/cetc32/dh/mybatis/DataFileMapper.java |   1 -
 .../cetc32/dh/mybatis/VfileMenuMapper.java    |   1 -
 .../service/impl/DataSubmitServiceImpl.java   |   5 -
 .../java/com/cetc32/dh/utils/FileUtil.java    |  45 ++--
 src/main/resources/mapper/DataFileMapper.xml  |  38 +++-
 .../resources/mapper/DataSubmitMapper.xml     |  78 ++++++-
 12 files changed, 449 insertions(+), 106 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/common/filter/FormFilter.java b/src/main/java/com/cetc32/dh/common/filter/FormFilter.java
index 2917b3e..7d716d7 100644
--- a/src/main/java/com/cetc32/dh/common/filter/FormFilter.java
+++ b/src/main/java/com/cetc32/dh/common/filter/FormFilter.java
@@ -26,7 +26,7 @@ import javax.servlet.ServletResponse;
  * @date: 2020/9/11 10:55
  * 更改描述：2020/9/13加上 subject.isRemembered()，让它同时也兼容remember这种情况。
  */
-public class FormFilter extends FormAuthenticationFilter {
+public class  FormFilter extends FormAuthenticationFilter {
 
     /**
      * 指定缓存失效时间
diff --git a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
index 220bbb8..b0a6f4a 100644
--- a/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
+++ b/src/main/java/com/cetc32/dh/common/response/PageDataResult.java
@@ -10,7 +10,6 @@
 
 package com.cetc32.dh.common.response;
 
-import com.cetc32.dh.entity.DataSubmit;
 import com.cetc32.dh.entity.NumberS;
 
 import java.util.List;
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
index e598c2c..d93f34f 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
@@ -10,7 +10,6 @@ package com.cetc32.dh.controller.rest;
 
 import com.cetc32.dh.common.response.ResponseResult;
 import com.cetc32.dh.entity.DataFile;
-import com.cetc32.dh.entity.DataMenu;
 import com.cetc32.dh.service.DataFileService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
index fd3bca0..5c81025 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
@@ -13,9 +13,7 @@ import com.cetc32.dh.entity.DataFile;
 import com.cetc32.dh.entity.DataMenu;
 import com.cetc32.dh.service.DataMenuService;
 import com.cetc32.dh.dto.DataMenuDTO;
-import com.cetc32.dh.utils.FileUtil;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
@@ -23,7 +21,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/com/cetc32/dh/entity/DataFile.java b/src/main/java/com/cetc32/dh/entity/DataFile.java
index 8f66385..a9e38aa 100644
--- a/src/main/java/com/cetc32/dh/entity/DataFile.java
+++ b/src/main/java/com/cetc32/dh/entity/DataFile.java
@@ -36,7 +36,8 @@ public class DataFile {
      * @param fileYear
      * 有参构造函数
      */
-    public DataFile(Long id, String fileName, String fileType, String fileSecurity, String filePath, Date createTime,String region,Integer fileYear){
+    public DataFile(Long id, String fileName, String fileType, String fileSecurity, String filePath, Date createTime,
+                    String region, Integer fileYear, String fileSize, Integer fileNumbers, String fileDiscription){
         this.id=id;
         this.fileName=fileName;
         this.fileType=fileType;
@@ -45,165 +46,272 @@ public class DataFile {
         this.filePath=filePath;
         this.region=region;
         this.fileYear=fileYear;
+        this.fileSize=fileSize;
+        this.fileNumbers=fileNumbers;
+        this.fileDiscription=fileDiscription;
     }
 
     /**
-     * id
+     * 文件(夹)id
      */
     @Id
     private Long id;
 
     /**
-     * 文件名字
+     * 文件(夹)所属年份
+     */
+    @Column(name = "file_year")
+    private Integer fileYear;
+
+    /**
+     * 文件(夹)名字
      */
     @Column(name = "file_name")
     private String fileName;
 
     /**
-     * 文件类型
+     * 文件(夹)类型
      */
     @Column(name = "file_type")
     private String fileType;
 
     /**
-     * 文件安全等级
+     * 文件(夹)安全等级
      */
     @Column(name = "file_security")
     private String fileSecurity;
 
     /**
-     * 文件路径
+     * 文件(夹)存放路径
      */
     @Column(name = "file_path")
     private String filePath;
 
     /**
-     * 文件创建时间
+     * 文件(夹)创建时间
      */
     @Column(name = "create_time")
     private Date createTime;
 
     /**
-     * 文件区域
+     * 文件(夹)所属区域
      */
     private String region;
 
     /**
-     * 文件年份
+     * 文件(夹)大小
      */
-    @Column(name = "file_year")
-    private Integer fileYear;
+    @Column(name = "file_size")
+    private String fileSize;
 
     /**
-     * @return id
+     * 文件夹中文件个数
+     */
+    @Column(name = "file_numbers")
+    private Integer fileNumbers;
+
+    /**
+     * 文件(夹)描述
+     */
+    @Column(name = "file_discription")
+    private String fileDiscription;
+
+    /**
+     * 获取文件(夹)id
+     *
+     * @return id - 文件(夹)id
      */
     public Long getId() {
         return id;
     }
 
     /**
-     * @param id
+     * 设置文件(夹)id
+     *
+     * @param id 文件(夹)id
      */
     public void setId(Long id) {
         this.id = id;
     }
 
     /**
-     * @return file_name
+     * 获取文件(夹)所属年份
+     *
+     * @return file_year - 文件(夹)所属年份
+     */
+    public Integer getFileYear() {
+        return fileYear;
+    }
+
+    /**
+     * 设置文件(夹)所属年份
+     *
+     * @param fileYear 文件(夹)所属年份
+     */
+    public void setFileYear(Integer fileYear) {
+        this.fileYear = fileYear;
+    }
+
+    /**
+     * 获取文件(夹)名字
+     *
+     * @return file_name - 文件(夹)名字
      */
     public String getFileName() {
         return fileName;
     }
 
     /**
-     * @param fileName
+     * 设置文件(夹)名字
+     *
+     * @param fileName 文件(夹)名字
      */
     public void setFileName(String fileName) {
-        this.fileName = fileName;
+        this.fileName = fileName == null ? null : fileName.trim();
     }
 
     /**
-     * @return file_type
+     * 获取文件(夹)类型
+     *
+     * @return file_type - 文件(夹)类型
      */
     public String getFileType() {
         return fileType;
     }
 
     /**
-     * @param fileType
+     * 设置文件(夹)类型
+     *
+     * @param fileType 文件(夹)类型
      */
     public void setFileType(String fileType) {
-        this.fileType = fileType;
+        this.fileType = fileType == null ? null : fileType.trim();
     }
 
     /**
-     * @return file_security
+     * 获取文件(夹)安全等级
+     *
+     * @return file_security - 文件(夹)安全等级
      */
     public String getFileSecurity() {
         return fileSecurity;
     }
 
     /**
-     * @param fileSecurity
+     * 设置文件(夹)安全等级
+     *
+     * @param fileSecurity 文件(夹)安全等级
      */
     public void setFileSecurity(String fileSecurity) {
-        this.fileSecurity = fileSecurity;
+        this.fileSecurity = fileSecurity == null ? null : fileSecurity.trim();
     }
 
     /**
-     * @return file_path
+     * 获取文件(夹)存放路径
+     *
+     * @return file_path - 文件(夹)存放路径
      */
     public String getFilePath() {
         return filePath;
     }
 
     /**
-     * @param filePath
+     * 设置文件(夹)存放路径
+     *
+     * @param filePath 文件(夹)存放路径
      */
     public void setFilePath(String filePath) {
-        this.filePath = filePath;
+        this.filePath = filePath == null ? null : filePath.trim();
     }
 
     /**
-     * @return create_time
+     * 获取文件(夹)创建时间
+     *
+     * @return create_time - 文件(夹)创建时间
      */
     public Date getCreateTime() {
         return createTime;
     }
 
     /**
-     * @param createTime
+     * 设置文件(夹)创建时间
+     *
+     * @param createTime 文件(夹)创建时间
      */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
     /**
-     * @return region
+     * 获取文件(夹)所属区域
+     *
+     * @return region - 文件(夹)所属区域
      */
     public String getRegion() {
         return region;
     }
 
     /**
-     * @param region
+     * 设置文件(夹)所属区域
+     *
+     * @param region 文件(夹)所属区域
      */
     public void setRegion(String region) {
-        this.region = region;
+        this.region = region == null ? null : region.trim();
     }
 
     /**
-     * @return file_year
+     * 获取文件(夹)大小
+     *
+     * @return file_size - 文件(夹)大小
      */
-    public Integer getFileYear() {
-        return fileYear;
+    public String getFileSize() {
+        return fileSize;
     }
 
     /**
-     * @param fileYear
+     * 设置文件(夹)大小
+     *
+     * @param fileSize 文件(夹)大小
      */
-    public void setFileYear(Integer fileYear) {
-        this.fileYear = fileYear;
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize == null ? null : fileSize.trim();
+    }
+
+    /**
+     * 获取文件夹中文件个数
+     *
+     * @return file_numbers - 文件夹中文件个数
+     */
+    public Integer getFileNumbers() {
+        return fileNumbers;
+    }
+
+    /**
+     * 设置文件夹中文件个数
+     *
+     * @param fileNumbers 文件夹中文件个数
+     */
+    public void setFileNumbers(Integer fileNumbers) {
+        this.fileNumbers = fileNumbers;
+    }
+
+    /**
+     * 获取文件(夹)描述
+     *
+     * @return file_discription - 文件(夹)描述
+     */
+    public String getFileDiscription() {
+        return fileDiscription;
+    }
+
+    /**
+     * 设置文件(夹)描述
+     *
+     * @param fileDiscription 文件(夹)描述
+     */
+    public void setFileDiscription(String fileDiscription) {
+        this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim();
     }
 
     /**
@@ -217,7 +325,10 @@ public class DataFile {
                 ", fileSecurity=" + fileSecurity+'\'' +
                 ", filePath=" + filePath +'\'' +
                 ", createTime=" + createTime +'\'' +
-                ", region=" + region +
+                ", region=" + region +'\'' +
+                ", fileSize=" + fileSize +'\'' +
+                ", fileNumbers=" + fileNumbers +'\'' +
+                ", fileDiscription=" + fileDiscription +
                 '}';
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 23b47c7..41a55a9 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -1,9 +1,34 @@
 package com.cetc32.dh.entity;
 
 import javax.persistence.*;
+import java.util.Date;
 
 @Table(name = "data_submit")
 public class DataSubmit extends NumberS{
+
+
+
+
+    public DataSubmit(){}
+
+    public DataSubmit(Integer id, String subtype, Integer plevel, Integer status, String submitor, String approver,
+                      Long menuid, String menuName, Integer year, String title, String area, String path) {
+        this.id=id;
+        this.subtype=subtype;
+        this.plevel=plevel;
+        this.status=status;
+        this.submitor=submitor;
+        this.approver=approver;
+        this.menuid=menuid;
+        this.year=year;
+        this.title=title;
+        this.area=area;
+        this.path=path;
+        this.menuName=menuName;
+
+    }
+
+
     @Id
     private Integer id;
 
@@ -12,8 +37,6 @@ public class DataSubmit extends NumberS{
      */
     private String subtype;
 
-    private String[] pathList;
-
     private Integer plevel;
 
     private Integer status;
@@ -25,8 +48,6 @@ public class DataSubmit extends NumberS{
     @Column(name = "menuId")
     private Long menuid;
 
-    private String menuName;
-
     private Integer year;
 
     private String title;
@@ -35,24 +56,26 @@ public class DataSubmit extends NumberS{
 
     private String path;
 
-    public  DataSubmit(){}
+    @Column(name = "file_type")
+    private String fileType;
 
-    public DataSubmit(Integer id,String subtype,Integer plevel,Integer status,String submitor,String approver,
-                      Long menuid,String menuName,Integer year,String title,String area,String path) {
-        this.id=id;
-        this.subtype=subtype;
-        this.plevel=plevel;
-        this.status=status;
-        this.submitor=submitor;
-        this.approver=approver;
-        this.menuid=menuid;
-        this.year=year;
-        this.title=title;
-        this.area=area;
-        this.path=path;
-        this.menuName=menuName;
+    private Date subtime;
 
-    }
+    @Column(name = "review_time")
+    private Date reviewTime;
+
+    @Column(name = "file_size")
+    private String fileSize;
+
+    @Column(name = "file_numbers")
+    private Integer fileNumbers;
+
+    @Column(name = "file_discription")
+    private String fileDiscription;
+
+    private String[] pathList;
+
+    private String menuName;
 
     /**
      * @return id
@@ -68,28 +91,6 @@ public class DataSubmit extends NumberS{
         this.id = id;
     }
 
-    /**
-     * @param pathList
-     */
-    public void setPathList(String[] pathList) {
-        this.pathList = pathList;
-    }
-
-    public String[]  getPathList() {
-        return this.pathList;
-    }
-
-    /**
-     * @param menuName
-     */
-    public void setMenuName(String menuName) {
-        this.menuName = menuName;
-    }
-
-    public String  getMenuName() {
-        return this.menuName;
-    }
-
     /**
      * 获取'报送类型,外部接口上报或本地路径上报'
      *
@@ -234,6 +235,116 @@ public class DataSubmit extends NumberS{
         this.path = path == null ? null : path.trim();
     }
 
+    /**
+     * @return file_type
+     */
+    public String getFileType() {
+        return fileType;
+    }
+
+    /**
+     * @param fileType
+     */
+    public void setFileType(String fileType) {
+        this.fileType = fileType == null ? null : fileType.trim();
+    }
+
+    /**
+     * @return subtime
+     */
+    public Date getSubtime() {
+        return subtime;
+    }
+
+    /**
+     * @param subtime
+     */
+    public void setSubtime(Date subtime) {
+        this.subtime = subtime;
+    }
+
+    /**
+     * @return review_time
+     */
+    public Date getReviewTime() {
+        return reviewTime;
+    }
+
+    /**
+     * @param reviewTime
+     */
+    public void setReviewTime(Date reviewTime) {
+        this.reviewTime = reviewTime;
+    }
+
+    /**
+     * @return file_size
+     */
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    /**
+     * @param fileSize
+     */
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize == null ? null : fileSize.trim();
+    }
+
+    /**
+     * @return file_numbers
+     */
+    public Integer getFileNumbers() {
+        return fileNumbers;
+    }
+
+    /**
+     * @param fileNumbers
+     */
+    public void setFileNumbers(Integer fileNumbers) {
+        this.fileNumbers = fileNumbers;
+    }
+
+    /**
+     * @return file_discription
+     */
+    public String getFileDiscription() {
+        return fileDiscription;
+    }
+
+    /**
+     * @param fileDiscription
+     */
+    public void setFileDiscription(String fileDiscription) {
+        this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim();
+    }
+
+
+
+    /**
+     * @param pathList
+     */
+    public void setPathList(String[] pathList) {
+        this.pathList = pathList;
+    }
+
+    public String[]  getPathList() {
+        return this.pathList;
+    }
+
+    /**
+     * @param menuName
+     */
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
+
+    public String  getMenuName() {
+        return this.menuName;
+    }
+
+
+
     public String toString() {
         return "{" +
                 "id=" + id +'\'' +
diff --git a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
index fb3cb6c..bf8d2ee 100644
--- a/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/DataFileMapper.java
@@ -9,7 +9,6 @@
 package com.cetc32.dh.mybatis;
 
 import com.cetc32.dh.entity.DataFile;
-import com.cetc32.dh.entity.DataMenu;
 import tk.mybatis.mapper.common.Mapper;
 import org.springframework.stereotype.Repository;
 import java.util.Date;
diff --git a/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java b/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
index 4d45449..2507efd 100644
--- a/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
+++ b/src/main/java/com/cetc32/dh/mybatis/VfileMenuMapper.java
@@ -8,7 +8,6 @@
  */
 package com.cetc32.dh.mybatis;
 
-import com.cetc32.dh.entity.DataFile;
 import com.cetc32.dh.entity.VfileMenu;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
index d3ca302..a748410 100644
--- a/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
+++ b/src/main/java/com/cetc32/dh/service/impl/DataSubmitServiceImpl.java
@@ -9,18 +9,13 @@
  */
 package com.cetc32.dh.service.impl;
 
-import com.cetc32.dh.common.response.ResponseResult;
 import com.cetc32.dh.entity.DataSubmit;
 import com.cetc32.dh.mybatis.DataSubmitMapper;
 import com.cetc32.dh.service.DataSubmitService;
-import com.cetc32.dh.utils.FileUtil;
 import org.apache.shiro.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import java.io.File;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index f2da387..899115e 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -63,7 +63,7 @@ public class FileUtil {
 
 
     /**
-     * 确保目录文件上传
+     * 目录文件上传
      *
      * @param files
      * @param filepath
@@ -106,6 +106,13 @@ public class FileUtil {
         return FileDir+"上传失败";
     }
 
+    /**
+     * 文件下载
+     *
+     * @param response
+     * @param filename
+     * @param path
+     */
     public static void downloadFile(HttpServletResponse response, String filename, String path){
         if (filename != null) {
             FileInputStream is = null;
@@ -150,13 +157,22 @@ public class FileUtil {
         }
     }
 
-
+    /**
+     * 判断是否为目录
+     * @param file
+     * @return boolean
+     */
     public static boolean isDirectory(String file) {
         File f = new File(file);
         return f.isDirectory();
     }
 
-
+    /**
+     * 拷贝目录文件到新路径
+     * @param oldPath
+     * @param newPath
+     * @return boolean
+     */
     public static boolean copyFolder(String oldPath, String newPath) {
 
         try {
@@ -204,7 +220,10 @@ public class FileUtil {
         }
     }
 
-
+    /**
+     * 删除目录
+     * @param dirPath
+     */
     public static void deleteDir(String dirPath)
     {
         File file = new File(dirPath);
@@ -228,7 +247,12 @@ public class FileUtil {
         }
     }
 
-
+    /**
+     * 将文件内容写到新的文件中
+     * @param fileName
+     * @param savepath
+     * @return String
+     */
     public static String writeFile(String fileName, String savepath) {
         System.out.println(fileName);
 //        File readerfile = new File(fileName);
@@ -281,8 +305,6 @@ public class FileUtil {
     }
 
 
-
-
     /**
      * 文件名后缀前添加一个时间戳
      */
@@ -301,6 +323,10 @@ public class FileUtil {
     }
 
 
+    /**
+     * 获取目录中所有的文件名
+     * @param  directoryPath
+     */
     public static List<String> getAllFile(String directoryPath) {
         List<String> list = new ArrayList<String>();
         File baseFile = new File(directoryPath);
@@ -324,10 +350,5 @@ public class FileUtil {
     }
 
 
-
-
-
-
-
 }
 
diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml
index a0215ae..be25aca 100644
--- a/src/main/resources/mapper/DataFileMapper.xml
+++ b/src/main/resources/mapper/DataFileMapper.xml
@@ -6,13 +6,16 @@
       WARNING - @mbg.generated
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="file_year" jdbcType="INTEGER" property="fileYear" />
     <result column="file_name" jdbcType="VARCHAR" property="fileName" />
     <result column="file_type" jdbcType="VARCHAR" property="fileType" />
     <result column="file_security" jdbcType="VARCHAR" property="fileSecurity" />
     <result column="file_path" jdbcType="VARCHAR" property="filePath" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="region" jdbcType="VARCHAR" property="region" />
-    <result column="file_year" jdbcType="INTEGER" property="fileYear" />
+    <result column="file_size" jdbcType="VARCHAR" property="fileSize" />
+    <result column="file_numbers" jdbcType="INTEGER" property="fileNumbers" />
+    <result column="file_discription" jdbcType="VARCHAR" property="fileDiscription" />
   </resultMap>
 
   <select id="countAll" resultType="java.lang.Long">
@@ -53,6 +56,18 @@
         file_year,
       </if>
 
+      <if test="fileSize!= null">
+        file_size,
+      </if>
+
+      <if test="fileNumbers!= null">
+        file_numbers,
+      </if>
+
+      <if test="fileDiscription!= null">
+        file_discription,
+      </if>
+
     </trim>
 
 
@@ -88,6 +103,18 @@
         #{fileYear,jdbcType=INTEGER},
       </if>
 
+      <if test="fileSize!= null">
+        #{fileSize,jdbcType=VARCHAR},
+      </if>
+
+      <if test="fileNumbers!= null">
+        #{fileNumbers,jdbcType=INTEGER},
+      </if>
+
+      <if test="fileDiscription!= null">
+        #{fileDiscription,jdbcType=VARCHAR},
+      </if>
+
     </trim>
   </insert>
 
@@ -113,6 +140,15 @@
       <if test="fileYear != null">
         file_year = #{fileYear,jdbcType=INTEGER},
       </if>
+      <if test="fileSize != null">
+        file_size = #{fileSize,jdbcType=VARCHAR},
+      </if>
+      <if test="fileNumbers != null">
+        file_numbers = #{fileNumbers,jdbcType=INTEGER},
+      </if>
+      <if test="fileDiscription != null">
+        file_discription = #{fileDiscription,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml
index b56fd43..4257df8 100644
--- a/src/main/resources/mapper/DataSubmitMapper.xml
+++ b/src/main/resources/mapper/DataSubmitMapper.xml
@@ -16,7 +16,12 @@
     <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="area" jdbcType="VARCHAR" property="area" />
     <result column="path" jdbcType="VARCHAR" property="path" />
-<!--    <result column="menu_name" jdbcType="VARCHAR" property="menuName" />-->
+    <result column="file_type" jdbcType="VARCHAR" property="fileType" />
+    <result column="subtime" jdbcType="TIMESTAMP" property="subtime" />
+    <result column="review_time" jdbcType="TIMESTAMP" property="reviewTime" />
+    <result column="file_size" jdbcType="VARCHAR" property="fileSize" />
+    <result column="file_numbers" jdbcType="INTEGER" property="fileNumbers" />
+    <result column="file_discription" jdbcType="VARCHAR" property="fileDiscription" />
   </resultMap>
 
   <insert id="insertOne" keyProperty="id" useGeneratedKeys="true" parameterType="com.cetc32.dh.entity.DataSubmit">
@@ -68,6 +73,31 @@
         year,
       </if>
 
+      <if test="fileType!= null">
+        file_type,
+      </if>
+
+      <if test="subtime!= null">
+        subtime,
+      </if>
+
+      <if test="reviewTime!= null">
+        review_time,
+      </if>
+
+      <if test="fileSize!= null">
+        file_size,
+      </if>
+
+      <if test="fileNumbers!= null">
+        file_numbers,
+      </if>
+
+      <if test="fileDiscription!= null">
+        file_discription,
+      </if>
+
+
     </trim>
 
 
@@ -119,6 +149,30 @@
         #{year},
       </if>
 
+      <if test="fileType!= null">
+        #{fileType},
+      </if>
+
+      <if test="subtime!= null">
+        #{subtime},
+      </if>
+
+      <if test="reviewTime!= null">
+        #{reviewTime},
+      </if>
+
+      <if test="fileSize!= null">
+        #{fileSize},
+      </if>
+
+      <if test="fileNumbers!= null">
+        #{fileNumbers},
+      </if>
+
+      <if test="fileDiscription!= null">
+        #{fileDiscription},
+      </if>
+
     </trim>
 
   </insert>
@@ -151,9 +205,31 @@
       <if test="path != null">
         path = #{path},
       </if>
+      <if test="subtype != null">
+        subtype = #{subtype},
+      </if>
       <if test="submitor != null">
         submitor = #{submitor},
       </if>
+      <if test="fileType != null">
+        file_type = #{fileType},
+      </if>
+      <if test="subtime != null">
+        subtime = #{subtime},
+      </if>
+      <if test="reviewTime != null">
+        review_time = #{reviewTime},
+      </if>
+      <if test="fileSize != null">
+        file_size = #{fileSize},
+      </if>
+      <if test="fileNumbers != null">
+        file_numbers = #{fileNumbers},
+      </if>
+      <if test="fileDiscription != null">
+        file_discription = #{fileDiscription},
+      </if>
+
     </set>
     where id = #{id}
   </update>
-- 
Gitee


From d155de63d434af3c33f511f223e43a566a969510 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Wed, 18 Nov 2020 17:07:10 +0800
Subject: [PATCH 25/26] =?UTF-8?q?20201118=E6=95=B0=E6=8D=AE=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java | 44 +++++++---
 .../controller/rest/VfileMenuController.java  |  6 +-
 .../java/com/cetc32/dh/entity/VfileMenu.java  | 80 ++++++++++++++++++-
 .../java/com/cetc32/dh/utils/FileUtil.java    | 29 ++++++-
 src/main/resources/mapper/VfileMenuMapper.xml |  3 +
 5 files changed, 146 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index 3525334..667018c 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -30,6 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -148,7 +150,6 @@ public class FileSubmitController {
         System.out.println(map);
         List<Integer> ids = new ArrayList<>();
         ids = (List<Integer>) map.get("ids");
-
         DataSubmit dataSubmit = null;
         DataFile dataFile = new DataFile();
         DataFile new_dataFile = null;
@@ -157,11 +158,15 @@ public class FileSubmitController {
         for (int i = 0; i < ids.size(); i++) {
             Integer id = ids.get(i);
             dataSubmit = dataSubmitService.queryById(id);
+            dataSubmit.setReviewTime(new Date());
             System.out.println(dataSubmit);
             dataFile.setFileName(dataSubmit.getTitle());
             dataFile.setFilePath(dataSubmit.getPath());
             dataFile.setRegion(dataSubmit.getArea());
             dataFile.setFileYear(dataSubmit.getYear());
+            dataFile.setFileDiscription(dataSubmit.getFileDiscription());
+            dataFile.setFileNumbers(dataSubmit.getFileNumbers());
+            dataFile.setFileSize(dataSubmit.getFileSize());
             dataFile.setFileSecurity(dataSubmit.getPlevel().toString());
             dataFile.setFileType(dataSubmit.getTitle().substring(dataSubmit.getTitle().lastIndexOf(".") + 1));
             if (i != 0) {
@@ -169,7 +174,6 @@ public class FileSubmitController {
             }
             int flag_file = dataFileService.insertDataFile(dataFile);
             new_dataFile = dataFile;
-//            System.out.println("new_dataFile！！！！！！！！！！！！！！");
             System.out.println(new_dataFile);
             fileToMenu.setFileId(new_dataFile.getId());
             fileToMenu.setMenuId(dataSubmit.getMenuid());
@@ -234,7 +238,7 @@ public class FileSubmitController {
     @PostMapping("/sub")
     public ResponseResult DataSub(@RequestBody DataSubmit dataSubmit) {
         System.out.println(dataSubmit);
-        String fileName = "";
+        String fileName = null;
         Integer count = 0;
         dataSubmit.setSubtype("1");
         dataSubmit.setStatus(0);
@@ -246,21 +250,22 @@ public class FileSubmitController {
         File baseFile = new File(upLoadPath);
         File[] files = baseFile.listFiles();
         File file = null;
-        List<String> pathListNew = new ArrayList<>();
+//        List<String> pathListNew = new ArrayList<>();
         for (int i = 0; i < files.length; i++) {
             file = files[i];
             if (file.isDirectory()) {
+                dataSubmit.setFileNumbers(FileUtil.getAllFile(upLoadPath + file.getName()).size());
+                dataSubmit.setFileSize(FileUtil.FormetFileSize(FileUtils.sizeOfDirectory(file)));
                 fileName = FileUtil.getFileName(file.getName());
                 file.renameTo(new File(upLoadPath + fileName));
             } else {
                 fileName = file.getName();
+                dataSubmit.setFileSize(FileUtil.FormetFileSize(file.length()));
+                dataSubmit.setFileNumbers(1);
             }
-            pathListNew.add(fileName);
-        }
-
-        for (int i = 0; i < pathListNew.size(); i++) {
+            dataSubmit.setTitle(fileName);
+            dataSubmit.setSubtime(new Date());
             dataSubmit_new = dataSubmit;
-            dataSubmit_new.setTitle(pathListNew.get(i));
             if (dataSubmitService.insertDataSubmit(dataSubmit_new) >= 0) {
                 count++;
             }
@@ -269,7 +274,7 @@ public class FileSubmitController {
             dataSubmit_new.setId(dataSubmit_new2.getId());
         }
 
-        if (FileUtil.copyFolder(upLoadPath, path) && count == pathListNew.size()) {
+        if (FileUtil.copyFolder(upLoadPath, path) && count == files.length) {
             FileUtil.deleteDir(upLoadPath);
             return ResponseResult.success("表单信息提交成功！");
         }
@@ -313,5 +318,24 @@ public class FileSubmitController {
         return ResponseResult.error("历史上传清空失败");
     }
 
+    /**
+     * 显示文件夹中文件详情
+     * @return 返回文件夹中文件结果
+     * */
+    @ApiOperation(value = "显示文件夹中的文件")
+    @PostMapping("/showFiles")
+    @ApiImplicitParam(name = "fileId", value = "文件id号", paramType = "body", dataType = "String")
+    public ResponseResult showFiles(@RequestBody String fileId) {
+        System.out.println(fileId);
+        if(dataFileService.queryById(Long.parseLong(fileId))!=null){
+            String filePath = dataFileService.queryById(Long.parseLong(fileId)).getFilePath();
+            String fileName = dataFileService.queryById(Long.parseLong(fileId)).getFileName();
+            String whole_dir = filePath+File.separator+fileName;
+            return ResponseResult.success(FileUtil.getAllFile(whole_dir));
+        }
+        return ResponseResult.error("没有该文件夹！");
+
+    }
+
 
 }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 2584ff3..1d6c95c 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -356,8 +356,8 @@ public class VfileMenuController {
             zipStream = new ZipOutputStream(new FileOutputStream(zipFile));
             for (int i = 0; i < fileNames.size(); i++) {
                 //解码获取真实路径与文件名
-                String realFilePath = java.net.URLDecoder.decode(fileNames.get(i), "UTF-8");
-//                System.out.println(fileNames.get(i));
+//                String realFilePath = java.net.URLDecoder.decode(fileNames.get(i), "UTF-8");
+                String realFilePath = fileNames.get(i);
                 System.out.println(realFilePath);
                 File file = new File(realFilePath);
                 //TODO:未对文件不存在时进行操作，后期优化。
@@ -378,7 +378,7 @@ public class VfileMenuController {
                     }
                 }else{
                     message=message+file.getName()+"不存在！"+"\n";
-//                    System.out.println(file.getName()+"不存在！");
+                    System.out.println(file.getName()+"不存在！");
                 }
             }
         } catch (Exception e) {
diff --git a/src/main/java/com/cetc32/dh/entity/VfileMenu.java b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
index 1423eba..c2a8c91 100644
--- a/src/main/java/com/cetc32/dh/entity/VfileMenu.java
+++ b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
@@ -43,7 +43,8 @@ public class VfileMenu extends NumberS{
      * @param menuId
      * 有参构造函数
      */
-    public VfileMenu( Long fileId, String fileName, String fileType, String fileSecurity, String filePath,Date createTime,String region,Long menuId,Integer fileYear){
+    public VfileMenu( Long fileId, String fileName, String fileType, String fileSecurity, String filePath,Date createTime,
+                      String region,Long menuId,Integer fileYear,String fileSize,Integer fileNumbers,String fileDiscription){
         this.fileId=fileId;
         this.fileName=fileName;
         this.fileType=fileType;
@@ -53,6 +54,9 @@ public class VfileMenu extends NumberS{
         this.region=region;
         this.menuId=menuId;
         this.fileYear=fileYear;
+        this.fileSize=fileSize;
+        this.fileNumbers=fileNumbers;
+        this.fileDiscription=fileDiscription;
     }
 
     /**
@@ -109,6 +113,24 @@ public class VfileMenu extends NumberS{
     @Column(name = "region")
     private String region;
 
+    /**
+     * 文件(夹)大小
+     */
+    @Column(name = "file_size")
+    private String fileSize;
+
+    /**
+     * 文件夹中文件个数
+     */
+    @Column(name = "file_numbers")
+    private Integer fileNumbers;
+
+    /**
+     * 文件(夹)描述
+     */
+    @Column(name = "file_discription")
+    private String fileDiscription;
+
     /**
      * 目录节点menuId
      */
@@ -262,7 +284,7 @@ public class VfileMenu extends NumberS{
         this.fileYear = fileYear;
     }
     /**
-     * @param fileYear
+     * @param f
      */
     public void setFileYear(String f) {
         try {
@@ -273,6 +295,60 @@ public class VfileMenu extends NumberS{
 
     }
 
+    /**
+     * 获取文件(夹)大小
+     *
+     * @return file_size - 文件(夹)大小
+     */
+    public String getFileSize() {
+        return fileSize;
+    }
+
+    /**
+     * 设置文件(夹)大小
+     *
+     * @param fileSize 文件(夹)大小
+     */
+    public void setFileSize(String fileSize) {
+        this.fileSize = fileSize == null ? null : fileSize.trim();
+    }
+
+    /**
+     * 获取文件夹中文件个数
+     *
+     * @return file_numbers - 文件夹中文件个数
+     */
+    public Integer getFileNumbers() {
+        return fileNumbers;
+    }
+
+    /**
+     * 设置文件夹中文件个数
+     *
+     * @param fileNumbers 文件夹中文件个数
+     */
+    public void setFileNumbers(Integer fileNumbers) {
+        this.fileNumbers = fileNumbers;
+    }
+
+    /**
+     * 获取文件(夹)描述
+     *
+     * @return file_discription - 文件(夹)描述
+     */
+    public String getFileDiscription() {
+        return fileDiscription;
+    }
+
+    /**
+     * 设置文件(夹)描述
+     *
+     * @param fileDiscription 文件(夹)描述
+     */
+    public void setFileDiscription(String fileDiscription) {
+        this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim();
+    }
+
     /**
      * @return numberId
      *//*
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index 899115e..ef7a02d 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -5,6 +5,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -84,7 +85,8 @@ public class FileUtil {
             System.out.println(FileDir);
             System.out.println(dirName);
             makeDir(dirName);
-            if (!file.isEmpty()) {
+
+            if (true) {        //!file.isEmpty()
                 try (BufferedOutputStream out = new BufferedOutputStream(
                         new FileOutputStream(new File(dirName)))) {
                     out.write(file.getBytes());
@@ -349,6 +351,31 @@ public class FileUtil {
         return list;
     }
 
+    /**
+     * 转换文件大小
+     *
+     * @param fileS
+     * @return
+     */
+    public static String FormetFileSize(long fileS) {
+        DecimalFormat df = new DecimalFormat("#.00");
+        String fileSizeString = "";
+        String wrongSize = "0B";
+        if (fileS == 0) {
+            return wrongSize;
+        }
+        if (fileS < 1024) {
+            fileSizeString = df.format((double) fileS) + "B";
+        } else if (fileS < 1048576) {
+            fileSizeString = df.format((double) fileS / 1024) + "KB";
+        } else if (fileS < 1073741824) {
+            fileSizeString = df.format((double) fileS / 1048576) + "MB";
+        } else {
+            fileSizeString = df.format((double) fileS / 1073741824) + "GB";
+        }
+        return fileSizeString;
+    }
+
 
 }
 
diff --git a/src/main/resources/mapper/VfileMenuMapper.xml b/src/main/resources/mapper/VfileMenuMapper.xml
index 4bcca41..d7b22c9 100644
--- a/src/main/resources/mapper/VfileMenuMapper.xml
+++ b/src/main/resources/mapper/VfileMenuMapper.xml
@@ -14,6 +14,9 @@
     <result column="region" jdbcType="VARCHAR" property="region" />
     <result column="menu_id" jdbcType="BIGINT" property="menuId" />
     <result column="file_year" jdbcType="INTEGER" property="fileYear" />
+    <result column="file_size" jdbcType="VARCHAR" property="fileSize" />
+    <result column="file_numbers" jdbcType="INTEGER" property="fileNumbers" />
+    <result column="file_discription" jdbcType="VARCHAR" property="fileDiscription" />
   </resultMap>
 
 
-- 
Gitee


From a22026002f66ce9a8e408fcffa2c60819618ba22 Mon Sep 17 00:00:00 2001
From: root <123>
Date: Thu, 19 Nov 2020 13:46:16 +0800
Subject: [PATCH 26/26] =?UTF-8?q?20201119=E6=95=B0=E6=8D=AE=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/rest/FileSubmitController.java | 50 +++++++++++++------
 .../java/com/cetc32/dh/entity/DataFile.java   | 37 +++++++++++++-
 .../java/com/cetc32/dh/entity/DataSubmit.java | 21 ++++++--
 .../java/com/cetc32/dh/entity/VfileMenu.java  | 39 ++++++++++++++-
 .../java/com/cetc32/dh/utils/FileUtil.java    |  8 ++-
 src/main/resources/application-dev.yml        |  2 +-
 src/main/resources/mapper/DataFileMapper.xml  | 26 ++++++++++
 src/main/resources/mapper/VfileMenuMapper.xml |  2 +
 8 files changed, 163 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index 667018c..7e8b5e5 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -19,6 +19,7 @@ import com.cetc32.dh.service.DataMenuService;
 import com.cetc32.dh.service.DataSubmitService;
 import com.cetc32.dh.service.FileToMenuService;
 import com.cetc32.dh.utils.FileUtil;
+import com.cetc32.dh.service.AdminUserService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -48,6 +49,8 @@ public class FileSubmitController {
     FileToMenuService fileToMenuService;
     @Autowired
     DataMenuService dataMenuService;
+    @Autowired
+    AdminUserService adminUserService;
 
 
     @Value("${upLoadPath}")
@@ -168,6 +171,8 @@ public class FileSubmitController {
             dataFile.setFileNumbers(dataSubmit.getFileNumbers());
             dataFile.setFileSize(dataSubmit.getFileSize());
             dataFile.setFileSecurity(dataSubmit.getPlevel().toString());
+            dataFile.setApprover(dataSubmit.getApprover());
+            dataFile.setSubmitor(dataSubmit.getSubmitor());
             dataFile.setFileType(dataSubmit.getTitle().substring(dataSubmit.getTitle().lastIndexOf(".") + 1));
             if (i != 0) {
                 dataFile.setId(dataFile.getId() + i);
@@ -234,30 +239,37 @@ public class FileSubmitController {
             @ApiImplicitParam(name = "title", value = "标题", paramType = "body", dataType = "String", defaultValue = ""),
             @ApiImplicitParam(name = "area", value = "区域", paramType = "body", dataType = "String", defaultValue = ""),
             @ApiImplicitParam(name = "path", value = "提交路径(不传参)", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"),
     })
     @PostMapping("/sub")
     public ResponseResult DataSub(@RequestBody DataSubmit dataSubmit) {
+        String userId=dataSubmit.getUserId();
+        userId="1";
+        String upCachePath=upLoadPath+"_user"+userId;
         System.out.println(dataSubmit);
         String fileName = null;
         Integer count = 0;
         dataSubmit.setSubtype("1");
         dataSubmit.setStatus(0);
         dataSubmit.setApprover("审核人");
+        if((adminUserService.getUserById(Integer.parseInt(userId)))!=null){
+            dataSubmit.setSubmitor(adminUserService.getUserById(Integer.parseInt(userId)).getSysUserName());
+        }
         DataSubmit dataSubmit_new = dataSubmit;
         DataSubmit dataSubmit_new2 = dataSubmit;
         String path = dataMenuService.queryById(dataSubmit.getMenuid()).getUrl();
         dataSubmit.setPath(path);
-        File baseFile = new File(upLoadPath);
+        File baseFile = new File(upCachePath);
         File[] files = baseFile.listFiles();
         File file = null;
 //        List<String> pathListNew = new ArrayList<>();
         for (int i = 0; i < files.length; i++) {
             file = files[i];
             if (file.isDirectory()) {
-                dataSubmit.setFileNumbers(FileUtil.getAllFile(upLoadPath + file.getName()).size());
+                dataSubmit.setFileNumbers(FileUtil.getAllFile(upCachePath +File.separator+ file.getName()).size());
                 dataSubmit.setFileSize(FileUtil.FormetFileSize(FileUtils.sizeOfDirectory(file)));
                 fileName = FileUtil.getFileName(file.getName());
-                file.renameTo(new File(upLoadPath + fileName));
+                file.renameTo(new File(upCachePath +File.separator+ fileName));
             } else {
                 fileName = file.getName();
                 dataSubmit.setFileSize(FileUtil.FormetFileSize(file.length()));
@@ -274,8 +286,8 @@ public class FileSubmitController {
             dataSubmit_new.setId(dataSubmit_new2.getId());
         }
 
-        if (FileUtil.copyFolder(upLoadPath, path) && count == files.length) {
-            FileUtil.deleteDir(upLoadPath);
+        if (FileUtil.copyFolder(upCachePath, path) && count == files.length) {
+            FileUtil.deleteDir(upCachePath);
             return ResponseResult.success("表单信息提交成功！");
         }
 
@@ -290,10 +302,15 @@ public class FileSubmitController {
      * */
     @ApiOperation(value = "文件上传")
     @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
-    @ApiImplicitParam(name = "files", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = "")
-    public ResponseResult uploadFile(@ApiParam(value = "二进制文件流") @RequestBody MultipartFile[] file) {
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件夹下的文件list", paramType = "body", dataType = "List", defaultValue = ""),
+            @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"),
+    })
+    public ResponseResult uploadFile(@ApiParam(value = "二进制文件流")  MultipartFile[] file,String userId) {
 //        String filepath = "/root/upLoad";
-        String filepath = upLoadPath;
+        userId="1";
+        String upCachePath=upLoadPath+"_user"+userId;
+        String filepath = upCachePath;
         String result = FileUtil.uploadFile(file, filepath);
         if (!result.contains("上传失败"))
             return ResponseResult.success(result);
@@ -308,10 +325,11 @@ public class FileSubmitController {
      * */
     @ApiOperation(value = "清空历史上传")
     @RequestMapping(value = "/clearUploadFile", method = RequestMethod.POST)
-    @ApiImplicitParam(name = "不需要传递参数", value = "null")
-    public ResponseResult clearUploadFile() {
-        FileUtil.deleteDir(upLoadPath);
-        File file = new File(upLoadPath);
+    @ApiImplicitParam(name = "userId", value = "当前用户id")
+    public ResponseResult clearUploadFile(String userId) {
+        String upCachePath=upLoadPath+"_user"+userId;
+        FileUtil.deleteDir(upCachePath);
+        File file = new File(upCachePath);
         if (!file.exists()) {
             return ResponseResult.success("历史上传清空成功");
         }
@@ -331,10 +349,14 @@ public class FileSubmitController {
             String filePath = dataFileService.queryById(Long.parseLong(fileId)).getFilePath();
             String fileName = dataFileService.queryById(Long.parseLong(fileId)).getFileName();
             String whole_dir = filePath+File.separator+fileName;
-            return ResponseResult.success(FileUtil.getAllFile(whole_dir));
+            List<String> stringList = FileUtil.getAllFile(whole_dir);
+            List<String> fileNames = new ArrayList<String>();
+            for(int i=0;i<stringList.size();i++){
+                fileNames.add(stringList.get(i).substring(stringList.get(i).indexOf(fileName)));
+            }
+            return ResponseResult.success(fileNames);
         }
         return ResponseResult.error("没有该文件夹！");
-
     }
 
 
diff --git a/src/main/java/com/cetc32/dh/entity/DataFile.java b/src/main/java/com/cetc32/dh/entity/DataFile.java
index a9e38aa..a7cccc6 100644
--- a/src/main/java/com/cetc32/dh/entity/DataFile.java
+++ b/src/main/java/com/cetc32/dh/entity/DataFile.java
@@ -37,7 +37,8 @@ public class DataFile {
      * 有参构造函数
      */
     public DataFile(Long id, String fileName, String fileType, String fileSecurity, String filePath, Date createTime,
-                    String region, Integer fileYear, String fileSize, Integer fileNumbers, String fileDiscription){
+                    String region, Integer fileYear, String fileSize, Integer fileNumbers, String fileDiscription,
+                    String submitor, String approver){
         this.id=id;
         this.fileName=fileName;
         this.fileType=fileType;
@@ -49,6 +50,8 @@ public class DataFile {
         this.fileSize=fileSize;
         this.fileNumbers=fileNumbers;
         this.fileDiscription=fileDiscription;
+        this.submitor=submitor;
+        this.approver=approver;
     }
 
     /**
@@ -116,6 +119,10 @@ public class DataFile {
     @Column(name = "file_discription")
     private String fileDiscription;
 
+    private String submitor;
+
+    private String approver;
+
     /**
      * 获取文件(夹)id
      *
@@ -314,6 +321,34 @@ public class DataFile {
         this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim();
     }
 
+    /**
+     * @return submitor
+     */
+    public String getSubmitor() {
+        return submitor;
+    }
+
+    /**
+     * @param submitor
+     */
+    public void setSubmitor(String submitor) {
+        this.submitor = submitor == null ? null : submitor.trim();
+    }
+
+    /**
+     * @return approver
+     */
+    public String getApprover() {
+        return approver;
+    }
+
+    /**
+     * @param approver
+     */
+    public void setApprover(String approver) {
+        this.approver = approver == null ? null : approver.trim();
+    }
+
     /**
      * 返回文件实体类的字符串形式
      */
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 41a55a9..5a3abd6 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -6,9 +6,6 @@ import java.util.Date;
 @Table(name = "data_submit")
 public class DataSubmit extends NumberS{
 
-
-
-
     public DataSubmit(){}
 
     public DataSubmit(Integer id, String subtype, Integer plevel, Integer status, String submitor, String approver,
@@ -77,6 +74,8 @@ public class DataSubmit extends NumberS{
 
     private String menuName;
 
+     private String userId;
+
     /**
      * @return id
      */
@@ -91,6 +90,22 @@ public class DataSubmit extends NumberS{
         this.id = id;
     }
 
+
+
+    /**
+     * @return userId
+     */
+    public String getUserId() {
+        return userId;
+    }
+
+    /**
+     * @param userId
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     /**
      * 获取'报送类型,外部接口上报或本地路径上报'
      *
diff --git a/src/main/java/com/cetc32/dh/entity/VfileMenu.java b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
index c2a8c91..045156a 100644
--- a/src/main/java/com/cetc32/dh/entity/VfileMenu.java
+++ b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
@@ -44,7 +44,8 @@ public class VfileMenu extends NumberS{
      * 有参构造函数
      */
     public VfileMenu( Long fileId, String fileName, String fileType, String fileSecurity, String filePath,Date createTime,
-                      String region,Long menuId,Integer fileYear,String fileSize,Integer fileNumbers,String fileDiscription){
+                      String region,Long menuId,Integer fileYear,String fileSize,Integer fileNumbers,String fileDiscription,
+                      String submitor, String approver){
         this.fileId=fileId;
         this.fileName=fileName;
         this.fileType=fileType;
@@ -57,6 +58,8 @@ public class VfileMenu extends NumberS{
         this.fileSize=fileSize;
         this.fileNumbers=fileNumbers;
         this.fileDiscription=fileDiscription;
+        this.submitor=submitor;
+        this.approver=approver;
     }
 
     /**
@@ -131,6 +134,10 @@ public class VfileMenu extends NumberS{
     @Column(name = "file_discription")
     private String fileDiscription;
 
+    private String submitor;
+
+    private String approver;
+
     /**
      * 目录节点menuId
      */
@@ -349,6 +356,36 @@ public class VfileMenu extends NumberS{
         this.fileDiscription = fileDiscription == null ? null : fileDiscription.trim();
     }
 
+
+
+    /**
+     * @return submitor
+     */
+    public String getSubmitor() {
+        return submitor;
+    }
+
+    /**
+     * @param submitor
+     */
+    public void setSubmitor(String submitor) {
+        this.submitor = submitor == null ? null : submitor.trim();
+    }
+
+    /**
+     * @return approver
+     */
+    public String getApprover() {
+        return approver;
+    }
+
+    /**
+     * @param approver
+     */
+    public void setApprover(String approver) {
+        this.approver = approver == null ? null : approver.trim();
+    }
+
     /**
      * @return numberId
      *//*
diff --git a/src/main/java/com/cetc32/dh/utils/FileUtil.java b/src/main/java/com/cetc32/dh/utils/FileUtil.java
index ef7a02d..5c64aaf 100644
--- a/src/main/java/com/cetc32/dh/utils/FileUtil.java
+++ b/src/main/java/com/cetc32/dh/utils/FileUtil.java
@@ -80,7 +80,7 @@ public class FileUtil {
             String flag = "";
             MultipartFile file = files[i];
             String fileName = file.getOriginalFilename();//获取文件名
-            String dirName = filepath +fileName;
+            String dirName = filepath +File.separator + fileName;
             FileDir = fileName;
             System.out.println(FileDir);
             System.out.println(dirName);
@@ -103,7 +103,11 @@ public class FileUtil {
             }
         }
         if (uploadsSum == files.length) {
-            return FileDir.substring(0,FileDir.indexOf("/"));
+            if (FileDir.contains("/")){
+                return FileDir.substring(0,FileDir.indexOf("/"));
+            }
+            return FileDir;
+
         }
         return FileDir+"上传失败";
     }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index db591a1..9dbc92a 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -39,4 +39,4 @@ logging:
     com.cetc32.dh.mybatis: debug
 
 storePath: /root/
-upLoadPath: ${storePath}upLoad/
\ No newline at end of file
+upLoadPath: ${storePath}upLoad
\ No newline at end of file
diff --git a/src/main/resources/mapper/DataFileMapper.xml b/src/main/resources/mapper/DataFileMapper.xml
index be25aca..3a49582 100644
--- a/src/main/resources/mapper/DataFileMapper.xml
+++ b/src/main/resources/mapper/DataFileMapper.xml
@@ -16,6 +16,8 @@
     <result column="file_size" jdbcType="VARCHAR" property="fileSize" />
     <result column="file_numbers" jdbcType="INTEGER" property="fileNumbers" />
     <result column="file_discription" jdbcType="VARCHAR" property="fileDiscription" />
+    <result column="submitor" jdbcType="VARCHAR" property="submitor" />
+    <result column="approver" jdbcType="VARCHAR" property="approver" />
   </resultMap>
 
   <select id="countAll" resultType="java.lang.Long">
@@ -68,6 +70,14 @@
         file_discription,
       </if>
 
+      <if test="approver!= null">
+        approver,
+      </if>
+
+      <if test="submitor!= null">
+        submitor,
+      </if>
+
     </trim>
 
 
@@ -115,6 +125,14 @@
         #{fileDiscription,jdbcType=VARCHAR},
       </if>
 
+      <if test="approver!= null">
+        #{approver,jdbcType=VARCHAR},
+      </if>
+
+      <if test="submitor!= null">
+        #{submitor,jdbcType=VARCHAR},
+      </if>
+
     </trim>
   </insert>
 
@@ -149,6 +167,14 @@
       <if test="fileDiscription != null">
         file_discription = #{fileDiscription,jdbcType=VARCHAR},
       </if>
+      <if test="approver!= null">
+        approver = #{approver,jdbcType=VARCHAR},
+      </if>
+
+      <if test="submitor!= null">
+        submitor = #{submitor,jdbcType=VARCHAR},
+      </if>
+
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
diff --git a/src/main/resources/mapper/VfileMenuMapper.xml b/src/main/resources/mapper/VfileMenuMapper.xml
index d7b22c9..344cbc5 100644
--- a/src/main/resources/mapper/VfileMenuMapper.xml
+++ b/src/main/resources/mapper/VfileMenuMapper.xml
@@ -17,6 +17,8 @@
     <result column="file_size" jdbcType="VARCHAR" property="fileSize" />
     <result column="file_numbers" jdbcType="INTEGER" property="fileNumbers" />
     <result column="file_discription" jdbcType="VARCHAR" property="fileDiscription" />
+    <result column="submitor" jdbcType="VARCHAR" property="submitor" />
+    <result column="approver" jdbcType="VARCHAR" property="approver" />
   </resultMap>
 
 
-- 
Gitee