From 53a46c188fd2e738b598533e143a245f7209ecae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=81=B0=E5=A4=AA=E7=8B=BC?= <1214761728@qq.com>
Date: Fri, 16 Oct 2020 14:25:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EDataSubmit=E7=9B=B8=E5=85=B3m?=
 =?UTF-8?q?aper=E5=8F=8Aservice=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E5=B0=9A=E6=9C=AA=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  8 ++-
 .../com/cetc32/dh/config/SwaggerConfig.java   |  4 +-
 .../controller/rest/DataFileController.java   |  8 ++-
 .../controller/rest/DataMenuController.java   | 23 +++----
 .../controller/rest/FileSubmitController.java | 63 +++++++++++++++++++
 .../controller/rest/VfileMenuController.java  | 36 ++++++++---
 .../java/com/cetc32/dh/entity/VfileMenu.java  | 15 +++++
 7 files changed, 131 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1dbb8a5..9ea3fd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
             <artifactId>java-jwt</artifactId>
             <version>3.2.0</version>
         </dependency>
-        <!-- swagger -->
+        <!-- swagger start-->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
@@ -179,6 +179,12 @@
             <artifactId>springfox-swagger-ui</artifactId>
             <version>2.9.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>swagger-bootstrap-ui</artifactId>
+            <version>1.8.7</version>
+        </dependency>
+        <!--swagger end-->
     </dependencies>
 
     <!--<dependencyManagement>
diff --git a/src/main/java/com/cetc32/dh/config/SwaggerConfig.java b/src/main/java/com/cetc32/dh/config/SwaggerConfig.java
index bf10251..e3f4d2e 100644
--- a/src/main/java/com/cetc32/dh/config/SwaggerConfig.java
+++ b/src/main/java/com/cetc32/dh/config/SwaggerConfig.java
@@ -27,7 +27,7 @@ public class SwaggerConfig {
     public Docket createRestApi(){
         return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.any())
+                .apis(RequestHandlerSelectors.basePackage("com.cetc32.dh.controller.rest"))
                 .paths(PathSelectors.any()).build();
     }
     /**
@@ -35,7 +35,7 @@ public class SwaggerConfig {
      * */
     private ApiInfo apiInfo(){
         return new ApiInfoBuilder()
-                .title("CETC DataManager API Doc")
+                .title("CETC DataManager OpenAPI Doc")
                 .description("This is a restful api document of CETC DataManager.")
                 .version("1.0")
                 .build();
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 df804bb..4a3aec6 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataFileController.java
@@ -1,7 +1,7 @@
 /**
  * Copyright(C)版权所有 中国电子科技集团公司第三十二研究所
  * @Title: VfileMenuController数据管理文件操作接口
- * @author: xiao
+ * @author: 肖小霞
  * @version: 1.0
  * @date: 2020/10/14
  * 备注:无
@@ -14,6 +14,7 @@ import com.cetc32.dh.entity.DataMenu;
 import com.cetc32.dh.service.DataFileService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
@@ -39,9 +40,10 @@ public class DataFileController {
     /**
      * 统计文件的个数
      * @return ResponseResult
-     * 备注:无
+     * 备注:2020.10.16 Deprecated By 徐文远
      */
-    @RequestMapping(value = "/count")
+    @Deprecated
+    //@PostMapping(value = "/count")
     public ResponseResult count() {
         Integer count = dataFileService.count();
         return ResponseResult.success(count);
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 c3f0aab..c89c0c0 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DataMenuController.java
@@ -16,6 +16,7 @@ import com.cetc32.dh.dto.DataMenuDTO;
 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.RestController;
 import java.util.List;
@@ -40,7 +41,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/count")
+    @PostMapping(value = "/count")
     public ResponseResult count() {
         Integer count = dataMenuService.count();
         return ResponseResult.success(count);
@@ -52,7 +53,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/insert")
+    @PostMapping(value = "/insert")
     public ResponseResult insert(DataMenu dataMenu) {
 //        DataMenu dataMenu=new DataMenu(2L,"test7",2L,"test7","test7");
         Integer count = dataMenuService.insertDataMenu(dataMenu);
@@ -65,7 +66,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/select")
+    @PostMapping(value = "/select")
     public ResponseResult select(Long id) {
 
         DataMenu dataMenu = dataMenuService.queryById(id);
@@ -81,7 +82,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/deleteOne")
+    @PostMapping(value = "/deleteOne")
     public ResponseResult delete(Long id) {
         Integer count = dataMenuService.deleteById(id);
         return ResponseResult.success(count);
@@ -93,7 +94,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/queryByPid")
+    @PostMapping(value = "/queryByPid")
     public ResponseResult queryByPid(Long pid) {
         DataMenu dataMenu = dataMenuService.queryByPid(pid);
         return ResponseResult.success(dataMenu);
@@ -105,7 +106,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/showFilesById")
+    @PostMapping(value = "/showFilesById")
     public ResponseResult showFilesById(Long menuId) {
         List<DataFile> dataFileList=dataMenuService.showFilesByMenuId(menuId);
         return ResponseResult.success(dataFileList);
@@ -117,7 +118,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/queryMenusByPIdSatisfyId")
+    @PostMapping(value = "/queryMenusByPIdSatisfyId")
     public ResponseResult queryMenusByPIdSatisfyId(Long id) {
         List<DataMenu> dataMenuList = dataMenuService.queryByPIdSatisfyId(id);
         return ResponseResult.success(dataMenuList);
@@ -129,7 +130,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/addOneMenu")
+    @PostMapping(value = "/addOneMenu")
     public ResponseResult addOneMenu(DataMenu dataMenu ) {
 //        dataMenu = new DataMenu(null, "test7", null, "test15", "test15");
         String message=dataMenuService.addDataMenu(dataMenu);
@@ -142,7 +143,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/updateDataMenu")
+    @PostMapping(value = "/updateDataMenu")
     public ResponseResult updateDataMenu(DataMenu dataMenu) {
 //        dataMenu=new DataMenu(5L,"test5",1L,"test5","test5555");
         Integer count = dataMenuService.updatebyId(dataMenu);
@@ -155,7 +156,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/deleteMenuTree")
+    @PostMapping(value = "/deleteMenuTree")
     public ResponseResult deleteDataMenuTree(Long id) {
         Integer count = dataMenuService.deleteMenuTree(id);
         System.out.println(count);
@@ -170,7 +171,7 @@ public class DataMenuController {
      * @return ResponseResult
      * 备注:无
      */
-    @RequestMapping(value = "/showMenuTree")
+    @PostMapping(value = "/showMenuTree")
     public ResponseResult  showMenuTree(Long id) {
             if (StringUtils.isEmpty(id)) {
                 id = 0L;
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 762dfdf..b8f366a 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -8,11 +8,21 @@
  */
 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.DataSubmit;
 import com.cetc32.dh.service.DataSubmitService;
+import org.apache.shiro.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RestController
+@RequestMapping("/rest/import/")
 public class FileSubmitController {
     DataSubmitService dataSubmitService;
 
@@ -21,4 +31,57 @@ public class FileSubmitController {
         this.dataSubmitService = dataSubmitService;
     }
 
+    /**
+     * 查询当前用户提交的所有导入请求
+     * @return 返回给前端分装好的结构体
+     * **/
+    @PostMapping("/submits")
+    public PageDataResult mySubmits(){
+        DataSubmit ds=new DataSubmit();
+        ds.setSumbitor("admin");
+        List<DataSubmit> list =new ArrayList<>();
+        Integer count =0;
+        list= dataSubmitService.selectMySubmit(ds);
+        return new PageDataResult(count,list);
+    }
+
+    /**
+     * 查询当前用户可以审核的所有导入请求
+     * @return 返回给前端分装好的结构体
+     * **/
+    @PostMapping("/approves")
+    public PageDataResult myApproves(){
+        DataSubmit ds=new DataSubmit();
+        ds.setSumbitor("admin");
+        List<DataSubmit> list =new ArrayList<>();
+        Integer count =0;
+        list= dataSubmitService.selectMyApprove(ds);
+        return new PageDataResult(count,list);
+    }
+
+    /**
+     * 拒绝导入请求
+     * @return 返回执行结果
+     * **/
+    @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();
+    }
+
+    /**
+     * 拒绝导入请求
+     * @return 返回执行结果
+     * **/
+    @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();
+    }
 }
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 a00161f..9fdde9a 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -172,18 +172,36 @@ public class VfileMenuController {
      * @return pdr
      * 备注:无
      */
-    @ApiOperation(value="queryFilesByKeywords",notes="")
-   /* @ApiImplicitParams({
-            @ApiImplicitParam(name = "current", value = "当前页码", required = true,
-                    dataType = "Integer", paramType = "query", defaultValue = "1"),
+    @ApiOperation(value="查询所有数据接口",notes="至少传入page，和current两个参数")
+    /*@ApiImplicitParams({
+        @ApiImplicitParam(name = "current", value = "当前页码", required = false,
+                dataType = "Integer", paramType = "query", defaultValue = "1"),
 
-            @ApiImplicitParam(name = "page", value = "每页数据条数", required = true,
-                    dataType = "Integer", paramType = "query", defaultValue = "10")
+        @ApiImplicitParam(name = "page", value = "每页数据条数", required = false,
+                dataType = "Integer", paramType = "query", defaultValue = "10"),
+
+        @ApiImplicitParam(name = "fileName", value = "文件名", required = false,
+               dataType = "string", paramType = "query", defaultValue = ""),
+
+        @ApiImplicitParam(name = "fileYear", value = "年份", required = false,
+               dataType = "string", paramType = "query", defaultValue = ""),
+
+        @ApiImplicitParam(name = "region", value = "区域", required = false,
+               dataType = "string", paramType = "query", defaultValue = ""),
+
+        @ApiImplicitParam(name = "fileType", value = "类型", required = false,
+               dataType = "Integer", paramType = "query", defaultValue = ""),
+
+        @ApiImplicitParam(name = "fileSecurity", value = "级别", required = false,
+                dataType = "Integer", paramType = "query", defaultValue = ""),
+
+        @ApiImplicitParam(name = "menuId", value = "菜单", required = false,
+                dataType = "Integer", paramType = "query", defaultValue = "")
     })*/
     @PostMapping("/find")
-    public PageDataResult queryFilesByObj(@ApiParam(value="pageNum",required = true,defaultValue = "1") @RequestParam("current") Integer pageNum,
-                                          @ApiParam(value="pageSize",required = true,defaultValue = "10") @RequestParam("page") Integer pageSize,
-                                          @ApiParam(value="vfileMenu")VfileMenu vfileMenu){
+    public PageDataResult queryFilesByObj(@ApiParam(value="当前页码",required = true,defaultValue = "1") @RequestParam("current") Integer pageNum,
+                                          @ApiParam(value="每页数据条数",required = true,defaultValue = "10")@RequestParam("page") Integer pageSize,
+                                          /*@ApiParam(value="vfileMenu")*/ VfileMenu vfileMenu){
         //if(vfil)
         //vfileMenu=new VfileMenu(null,null,null,null,null,null,null,13L,2017);
         PageDataResult pdr = new PageDataResult();
diff --git a/src/main/java/com/cetc32/dh/entity/VfileMenu.java b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
index 22b05ac..5ae4cf9 100644
--- a/src/main/java/com/cetc32/dh/entity/VfileMenu.java
+++ b/src/main/java/com/cetc32/dh/entity/VfileMenu.java
@@ -9,6 +9,9 @@
  */
 package com.cetc32.dh.entity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.util.Date;
 import javax.persistence.*;
 
@@ -19,6 +22,7 @@ import javax.persistence.*;
  * @version: 1.0
  * @date: 2020/11/21 13:43
  */
+@ApiModel("文件实体")
 @Table(name = "vfile_menu")
 public class VfileMenu {
 
@@ -54,58 +58,69 @@ public class VfileMenu {
     /**
      * 显示序号numberId
      */
+    @ApiModelProperty(hidden = true)
     private Integer numberId;
 
     /**
      * 文件fileId
      */
+    @ApiModelProperty(hidden = true)
     @Column(name = "file_id")
     private Long fileId;
 
     /**
      * 文件名字fileName
      */
+    @ApiModelProperty(value="文件名",example = "")
     @Column(name = "file_name")
     private String fileName;
 
     /**
      * 文件类型fileType
      */
+    @ApiModelProperty(value="文件类型",example = "")
     @Column(name = "file_type")
     private String fileType;
 
     /**
      * 文件安全等级fileSecurity
      */
+    @ApiModelProperty(value="文件安全等级",example = "")
     @Column(name = "file_security")
     private String fileSecurity;
 
     /**
      * 文件路径filePath
      */
+    @ApiModelProperty(hidden = true)
     @Column(name = "file_path")
     private String filePath;
 
     /**
      * 文件创建时间createTime
      */
+    @ApiModelProperty(hidden = true)
     @Column(name = "create_time")
     private Date createTime;
 
     /**
      * 文件区域region
      */
+    @ApiModelProperty(value="文件区域",example = "")
+    @Column(name = "region")
     private String region;
 
     /**
      * 目录节点menuId
      */
+    @ApiModelProperty(value="目录节点",example = "")
     @Column(name = "menu_id")
     private Long menuId;
 
     /**
      * 文件年份fileYear
      */
+    @ApiModelProperty(value="文件年份",example = "")
     @Column(name = "file_year")
     private Integer fileYear;
 
-- 
Gitee