From 19736717802d803e44fd4284f02947b187f4c1d7 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 9 Mar 2022 11:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=BA=93=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOController.java      | 69 +++++++------------
 1 file changed, 25 insertions(+), 44 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
index e8f88c00d..84237fe61 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java
@@ -13,6 +13,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,27 +48,6 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	@Autowired
 	private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
 
-	/**
-	 * 分页列表查询
-	 *
-	 * @param bussDocumentLibraryEO
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "文档库信息表-分页列表查询")
-	@ApiOperation(value="文档库信息表-分页列表查询", notes="文档库信息表-分页列表查询")
-	@GetMapping(value = "/page")
-	public Result<?> queryPageList(BussDocumentLibraryEO bussDocumentLibraryEO,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<BussDocumentLibraryEO> queryWrapper = QueryGenerator.initQueryWrapper(bussDocumentLibraryEO, req.getParameterMap());
-		Page<BussDocumentLibraryEO> page = new Page<BussDocumentLibraryEO>(pageNo, pageSize);
-		IPage<BussDocumentLibraryEO> pageList = bussDocumentLibraryEOService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
 
 	 /**
 	  * 分页列表查询
@@ -78,6 +58,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @ApiOperation(value="分页查询", notes="分页查询")
 	 @PostMapping(value = "/queryPageInfo")
 	 @ResponseBody
+//     @RequiresPermissions("document:queryPageInfo")
 	 public JSONObject queryPageInfo(@RequestBody Map<String,Object> parameter) {
 		 IPage infoPage = bussDocumentLibraryEOService.getInfoPage(parameter);
 		 Result<IPage> ok = Result.OK(infoPage);
@@ -94,6 +75,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @ApiOperation(value="代替标准分页列表查询", notes="代替标准分页列表查询")
 	 @PostMapping(value = "/replacePageInfo")
 	 @ResponseBody
+//     @RequiresPermissions("document:replacePageInfo")
 	 public Result<?> replacePageInfo(@RequestBody Map<String,Object> parameter) {
 		 IPage infoPage = bussDocumentLibraryEOService.replacePageInfo(parameter);
 //		 Result<IPage> ok = Result.OK(infoPage);
@@ -110,6 +92,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @ApiOperation(value="ocr识别调取已入库文件", notes="ocr识别调取已入库文件")
 	 @PostMapping(value = "/ocrPageInfo")
 	 @ResponseBody
+//     @RequiresPermissions("document:ocrPageInfo")
 	 public Result<?> ocrPageInfo(@RequestBody Map<String,Object> parameter) {
 		 IPage infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
 		 return Result.OK(infoPage);
@@ -138,6 +121,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	@AutoLog(value = "文档库信息表-通过id删除")
 	@ApiOperation(value="文档库信息表-通过id删除", notes="文档库信息表-通过id删除")
 	@DeleteMapping(value = "/delete")
+    @RequiresPermissions("document:deleteBatch")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 		bussDocumentLibraryEOService.deleteById(id);
 		return Result.OK("删除成功!");
@@ -152,6 +136,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	@AutoLog(value = "文档库信息表-批量删除")
 	@ApiOperation(value="文档库信息表-批量删除", notes="文档库信息表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
+    @RequiresPermissions("document:deleteBatch")
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.bussDocumentLibraryEOService.deleteByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
@@ -166,6 +151,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	@AutoLog(value = "文档库信息表-通过id查询")
 	@ApiOperation(value="文档库信息表-通过id查询", notes="文档库信息表-通过id查询")
 	@GetMapping(value = "/queryById")
+//    @RequiresPermissions("document:queryById")
 	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
 		BussDocumentLibraryEO bussDocumentLibraryEO = bussDocumentLibraryEOService.queryById(id);
 		if(bussDocumentLibraryEO==null) {
@@ -174,28 +160,6 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 		return Result.OK(bussDocumentLibraryEO);
 	}
 
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param bussDocumentLibraryEO
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, BussDocumentLibraryEO bussDocumentLibraryEO) {
-        return super.exportXls(request, bussDocumentLibraryEO, BussDocumentLibraryEO.class, "文档库信息表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, BussDocumentLibraryEO.class);
-    }
 
 
 	 /**
@@ -206,6 +170,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "文档库信息表-查询条件")
 	 @ApiOperation(value="文档库信息表-查询条件", notes="文档库信息表-查询条件")
 	 @GetMapping(value = "/queryCondition")
+//     @RequiresPermissions("document:queryCondition")
 	 public Result<List<Map<String,Object>>> queryCondition(@RequestParam(name="flag",required=true) String flag,
 															@RequestParam(name="cut",required=true) String cut) {
 		 List<Map<String,Object>> list = bussDocumentLibraryEOService.queryCondition(flag,cut);
@@ -220,6 +185,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "文档库信息表-列表表头")
 	 @ApiOperation(value="文档库信息表-列表表头", notes="文档库信息表-列表表头")
 	 @GetMapping(value = "/getHeader")
+//     @RequiresPermissions("document:getHeader")
 	 public Result<List<Map<String,Object>>> getHeader(@RequestParam(name="flag",required=true) String flag,
 													   @RequestParam(name="cut",required=true) String cut) {
 		 List<Map<String,Object>> list = bussDocumentLibraryEOService.getHeader(flag,cut);
@@ -234,6 +200,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "文档库信息表-新增表单")
 	 @ApiOperation(value="文档库信息表-新增表单", notes="文档库信息表-新增表单")
 	 @GetMapping(value = "/getAddForm")
+//     @RequiresPermissions("document:getAddForm")
 	 public Result<List<Map<String,Object>>> getAddForm(@RequestParam(name="flag",required=true) String flag,
 														@RequestParam(name="cut",required=true) String cut,
 														@RequestParam(name="type",required=true) String type) {
@@ -249,6 +216,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	@AutoLog(value = "文档库信息表-ocr表头和查询条件")
 	@ApiOperation(value="文档库信息表-ocr表头和查询条件", notes="文档库信息表-ocr表头和查询条件")
 	@GetMapping(value = "/getHeaderOrConditionForOcr")
+//    @RequiresPermissions("document:getHeaderOrConditionForOcr")
 	public Result<List<Map<String,Object>>> getHeaderOrConditionForOcr(@RequestParam(name="flag",required=true) String flag,
 													   @RequestParam(name="cut",required=true) String cut) {
 		List<Map<String, Object>> list = bussDocumentLibraryEOService.getHeaderOrConditionForOcr(flag,cut);
@@ -263,6 +231,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "编辑数据查询")
 	 @ApiOperation(value="编辑数据查询", notes="编辑数据查询")
 	 @GetMapping(value = "/getDocumentInfoById")
+//     @RequiresPermissions("document:getDocumentInfoById")
 	 public Result<List<Map<String,Object>>> getDocumentInfoById(@RequestParam(name="id",required=true) String id,
 																 @RequestParam(name="cut",required=true) String cut) {
 		 List<Map<String, Object>> list = bussDocumentLibraryEOService.getDocumentInfoById(id,cut);
@@ -276,6 +245,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "详情数据查询")
 	 @ApiOperation(value="详情数据查询", notes="详情数据查询")
 	 @GetMapping(value = "/getInfoById")
+//     @RequiresPermissions("document:getInfoById")
 	 public Result<List<Map<String,Object>>> getInfoById(@RequestParam(name="id",required=true) String id,
 														 @RequestParam(name="cut",required=true) String cut) {
 		 List<Map<String, Object>> list = bussDocumentLibraryEOService.getInfoById(id,cut);
@@ -290,7 +260,8 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "新增数据")
 	 @ApiOperation(value="新增数据", notes="新增数据")
 	 @PostMapping(value = "/addInfo")
-	 public Result<?> addInfo(@RequestBody Map<String,Object> map) {
+     @RequiresPermissions("document:getInfoById")
+	 public Result<?> getInfoById(@RequestBody Map<String,Object> map) {
 		 try {
 			 bussDocumentLibraryEOService.addInfo(map);
 		 } catch (Exception e) {
@@ -307,6 +278,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "编辑数据")
 	 @ApiOperation(value="编辑数据", notes="编辑数据")
 	 @PostMapping(value = "/updateInfo")
+     @RequiresPermissions("document:updateInfo")
 	 public Result<?> updateInfo(@RequestBody Map<String,Object> map) {
 		 try {
 			 bussDocumentLibraryEOService.updateInfo(map);
@@ -325,6 +297,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "添加收藏")
 	 @ApiOperation(value="添加收藏", notes="添加收藏")
 	 @GetMapping(value = "/addCollect")
+     @RequiresPermissions("document:addCollect")
 	 public Result<?> addCollect(String id) {
 		 try {
 			 bussDocumentLibraryEOService.addCollect(id);
@@ -342,6 +315,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "取消收藏")
 	 @ApiOperation(value="取消收藏", notes="取消收藏")
 	 @GetMapping(value = "/cancelCollect")
+     @RequiresPermissions("document:addCollect")
 	 public Result<?> cancelCollect(String id) {
 		 try {
 			 bussDocumentLibraryEOService.cancelCollect(id);
@@ -359,6 +333,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "添加订阅")
 	 @ApiOperation(value="添加订阅", notes="添加订阅")
 	 @GetMapping(value = "/addSubscribe")
+     @RequiresPermissions("document:addSubscribe")
 	 public Result<?> addSubscribe(String id) {
 		 try {
 			 bussDocumentLibraryEOService.addSubscribe(id);
@@ -376,6 +351,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 	 @AutoLog(value = "取消订阅")
 	 @ApiOperation(value="取消订阅", notes="取消订阅")
 	 @GetMapping(value = "/cancelSubscribe")
+     @RequiresPermissions("document:addSubscribe")
 	 public Result<?> cancelSubscribe(String id) {
 		 try {
 			 bussDocumentLibraryEOService.cancelSubscribe(id);
@@ -388,6 +364,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 
      @ApiOperation(value = "导出excel")
      @GetMapping(value = "/exportExcel")
+     @RequiresPermissions("document:exportExcel")
      public void exportExcel(@RequestParam Map<String,Object> map,
                                           HttpServletResponse response,
                                           HttpServletRequest request){
@@ -396,6 +373,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 
      @ApiOperation(value = "带文件导出")
      @GetMapping(value = "/exportZip")
+     @RequiresPermissions("document:exportZip")
      public void exportZip(@RequestParam Map<String,Object> map,
                                           HttpServletResponse response,
                                           HttpServletRequest request) throws Exception {
@@ -405,6 +383,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 
 	@ApiOperation(value = "模板下载")
 	@GetMapping(value = "/exportTemplate")
+    @RequiresPermissions("document:exportTemplate")
 	public void exportTemplate(@RequestParam Map<String,Object> map, HttpServletResponse response, HttpServletRequest request) throws Exception {
 		bussDocumentLibraryEOService.exportTemplate(map,response,request);
 	}
@@ -412,6 +391,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 
 	@ApiOperation(value = "导入.zip")
 	@PostMapping(value = "/importZip")
+    @RequiresPermissions("document:importZip")
 	public Result<?> importZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
 		String result = bussDocumentLibraryEOService.importZip(file);
 		return Result.OK(result);
@@ -419,6 +399,7 @@ public class BussDocumentLibraryEOController extends JeroController<BussDocument
 
 	@ApiOperation(value = "推送")
 	@GetMapping(value = "/pullMessage")
+    @RequiresPermissions("document:pullMessage")
 	public Result<?> pullMessage(String departIds,String userIds,String documentIds) {
 
 		bussDocumentLibraryEOService.pullMessage(departIds,userIds,documentIds);