From d67bc5ae79c232198e159e59ecf905d47900b9c2 Mon Sep 17 00:00:00 2001 From: root <123> Date: Tue, 20 Oct 2020 16:27:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B9=B4=E4=BB=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rest/VfileMenuController.java | 35 ++++++++++--------- .../cetc32/dh/mybatis/VfileMenuMapper.java | 2 ++ .../cetc32/dh/service/VfileMenuService.java | 2 ++ .../dh/service/impl/VfileMenuServiceImpl.java | 8 +++++ src/main/resources/mapper/VfileMenuMapper.xml | 5 +++ 5 files changed, 36 insertions(+), 16 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 c61348a..45104de 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java @@ -17,6 +17,8 @@ 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 java.util.ArrayList; import java.util.Date; import java.util.List; @@ -163,35 +165,22 @@ public class VfileMenuController { /** * 根据目录节点id和文件视图对象查询文件 - * @param page - * @param results * @param vfileMenu * @return pdr * 备注:无 */ @ApiOperation(value="查询所有数据接口",notes="至少传入page,和current两个参数") @PostMapping("/find") - public PageDataResult queryFilesByObj(//@ApiParam(value="当前页码",required = true,defaultValue = "1")@RequestBody Integer page, - //@ApiParam(value="每页数据条数",required = true,defaultValue = "2")@RequestBody Integer results, - /*@ApiParam(value="文件名称")String fileName, - @ApiParam(value="文件年份")Integer fileYear, - @ApiParam(value="文件区域")String region, - @ApiParam(value="目录节点")Long menuId, - @ApiParam(value="文件类型")String fileType, - @ApiParam(value="文件安全等级")String fileSecurity){*/ - - @RequestBody VfileMenu vfileMenu){ + public PageDataResult queryFilesByObj(@RequestBody VfileMenu vfileMenu){ Integer page=vfileMenu.getPage(); Integer results=vfileMenu.getResults(); - //if(vfil) - System.out.println(page); - System.out.println(results); - System.out.println(vfileMenu.getFileYear()); + if (page == null || page <= 0) { page = 1; } if (results == null || results <= 0) results = 10; + int offset=(page - 1) * results; return new PageDataResult(vfileMenuService.countFilesByObj(vfileMenu), @@ -200,4 +189,18 @@ public class VfileMenuController { } + /**查询数据库中所有的不同年份 + * @return List + */ + @RequestMapping("/AllYear") + public ResponseResult distinctAllYear(){ + List vfileMenuList = vfileMenuService.distinctAllYear(); + List yearList = new ArrayList(); + for(int i=0;i { public Integer countFilesByObj(VfileMenu vfileMenu); + public List distinctAllYear(); + } \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/service/VfileMenuService.java b/src/main/java/com/cetc32/dh/service/VfileMenuService.java index a9bf75c..f49b578 100644 --- a/src/main/java/com/cetc32/dh/service/VfileMenuService.java +++ b/src/main/java/com/cetc32/dh/service/VfileMenuService.java @@ -37,5 +37,7 @@ public interface VfileMenuService { public Integer countFilesByObj(VfileMenu vfileMenu); + public List distinctAllYear(); + } 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 35f677c..05fe1d6 100644 --- a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java @@ -102,4 +102,12 @@ public class VfileMenuServiceImpl implements VfileMenuService { public Integer countFilesByObj(VfileMenu vfileMenu){ return vfileMenuMapper.countFilesByObj(vfileMenu); } + + /**查询数据库中所有的不同年份 + * @return List + */ + @Override + public List distinctAllYear(){ + return vfileMenuMapper.distinctAllYear(); + } } diff --git a/src/main/resources/mapper/VfileMenuMapper.xml b/src/main/resources/mapper/VfileMenuMapper.xml index 42aab3b..27dd178 100644 --- a/src/main/resources/mapper/VfileMenuMapper.xml +++ b/src/main/resources/mapper/VfileMenuMapper.xml @@ -107,4 +107,9 @@ + + + \ No newline at end of file -- Gitee From fb099736623572dfdc9a815ed1a506b75d92ac1b Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 23 Oct 2020 11:02:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rest/FileSubmitController.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 9a9e039..1d4a0f4 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java @@ -107,4 +107,23 @@ public class FileSubmitController { return new PageDataResult(dataSubmitService.countReadyApprove(null), dataSubmitService.selectReadyApprove(ds),(page-1)*results); } + + /** + * 提交数据 + * @param dataSubmit 数据信息 + * @return 返回提交结果 + * */ + @ApiOperation(value="提交数据") + @PostMapping("/sub") + public ResponseResult DataSub(DataSubmit dataSubmit){ + + int count = dataSubmitService.insertDataSubmit(dataSubmit); + + if(0<=count){ + return ResponseResult.success("数据提交成功!"); + } + return ResponseResult.error("数据提交失败!"); + + } + } -- Gitee From bca3560d9e54dc04b8080303479e588a735ac817 Mon Sep 17 00:00:00 2001 From: root <123> Date: Fri, 23 Oct 2020 15:07:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/rest/VfileMenuController.java | 18 +++++++++++++++++- .../com/cetc32/dh/mybatis/VfileMenuMapper.java | 2 ++ .../cetc32/dh/service/VfileMenuService.java | 1 + .../dh/service/impl/VfileMenuServiceImpl.java | 10 +++++++++- src/main/resources/mapper/VfileMenuMapper.xml | 6 ++++++ 5 files changed, 35 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 159c53b..21743d7 100644 --- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java +++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java @@ -204,7 +204,9 @@ public class VfileMenuController { /**查询数据库中所有的不同年份 * @return List */ - @RequestMapping("/AllYear") + @ApiOperation(value="查询所有年份",notes="不需要传参数") + @PostMapping("/AllYear") + //@RequestMapping(value="/AllYear",method = RequestMethod.POST) public ResponseResult distinctAllYear(){ List vfileMenuList = vfileMenuService.distinctAllYear(); List yearList = new ArrayList(); @@ -215,4 +217,18 @@ public class VfileMenuController { return ResponseResult.success(yearList); } + /**查询数据库中所有的不同区域 + * @return List + */ + @ApiOperation(value="查询所有区域",notes="不需要传参数") + @PostMapping("/AllRegion") + public ResponseResult distinctAllRegion(){ + List vfileMenuList = vfileMenuService.distinctAllRegion(); + List regionList = new ArrayList(); + for(int i=0;i { public List distinctAllYear(); + public List distinctAllRegion(); + } \ No newline at end of file diff --git a/src/main/java/com/cetc32/dh/service/VfileMenuService.java b/src/main/java/com/cetc32/dh/service/VfileMenuService.java index f49b578..272884a 100644 --- a/src/main/java/com/cetc32/dh/service/VfileMenuService.java +++ b/src/main/java/com/cetc32/dh/service/VfileMenuService.java @@ -39,5 +39,6 @@ public interface VfileMenuService { public List distinctAllYear(); + public List distinctAllRegion(); } 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 05fe1d6..9a71fd4 100644 --- a/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java +++ b/src/main/java/com/cetc32/dh/service/impl/VfileMenuServiceImpl.java @@ -104,10 +104,18 @@ public class VfileMenuServiceImpl implements VfileMenuService { } /**查询数据库中所有的不同年份 - * @return List + * @return List */ @Override public List distinctAllYear(){ return vfileMenuMapper.distinctAllYear(); } + + /**查询数据库中所有的不同区域 + * @return List + */ + @Override + public List distinctAllRegion(){ + return vfileMenuMapper.distinctAllRegion(); + } } diff --git a/src/main/resources/mapper/VfileMenuMapper.xml b/src/main/resources/mapper/VfileMenuMapper.xml index 27dd178..d7e2f25 100644 --- a/src/main/resources/mapper/VfileMenuMapper.xml +++ b/src/main/resources/mapper/VfileMenuMapper.xml @@ -112,4 +112,10 @@ select distinct file_year from vfile_menu + + + + \ No newline at end of file -- Gitee