From 0e721c38652f7212b3bdabe3f3bc4c851ad545a5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 16 Nov 2023 17:18:13 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysDictController.java | 31 +++++++++------- .../controller/SysDictItemController.java | 21 +++++++++-- .../system/controller/SysRoleController.java | 8 +++++ .../system/controller/SysUserController.java | 11 +++--- .../LawsContactManageController.java | 11 ++++++ .../SarFileSplitInfoController.java | 35 +++++++++---------- .../SarFileSplitMenuEOController.java | 12 ------- ...LawsEnterprisestandardLevelController.java | 2 ++ .../LawsFriendlyLinksController.java | 9 +++++ .../LawsWorkingGroupController.java | 10 ++++++ .../LawsWorkingGroupUserController.java | 12 ++++++- .../tag/controller/LawsTagController.java | 22 +++++------- 12 files changed, 121 insertions(+), 63 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 6bfc59f1..ea3d64ee 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; @@ -64,7 +66,8 @@ import java.util.*; * @since 2018-12-28 */ @RestController -@Api(tags = "字典控制器") +@ApiSupport(order = 103) +@Api(tags = "数据字典") @RequestMapping("/sys/dict") @Slf4j public class SysDictController { @@ -81,7 +84,8 @@ public class SysDictController { private static final String DEL_SUCCESS = "删除成功!"; @GetMapping("/page") - @ApiOperation(value = "字典控制器-分页列表查询", notes = "字典控制器-分页列表查询") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "数据字典-分页列表查询", notes = "数据字典-分页列表查询") public Result> queryPageList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -97,10 +101,10 @@ public class SysDictController { /** * 标签内容-分页查询 - * @param params * @return */ @AutoLog(value = "标签内容-分页列表查询") + @ApiOperationSupport(order = 2) @ApiOperation(value="标签内容-分页列表查询", notes="区域管理表-分页列表查询") //@RequiresPermissions("dict:tagDictPage") @GetMapping(value = "/tagDictPage") @@ -123,7 +127,6 @@ public class SysDictController { * @param req * @return */ - @ApiOperation(value = "字典控制器-树形字典数据", notes = "字典控制器-树形字典数据") @GetMapping("/treeList") public Result> treeList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @@ -150,7 +153,8 @@ public class SysDictController { * * @return */ - @ApiOperation(value = "字典控制器-获取全部字典数据", notes = "字典控制器-获取全部字典数据") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "数据字典-获取全部字典数据", notes = "数据字典-获取全部字典数据") @GetMapping("/queryAllDictItems") public Result>> queryAllDictItems(HttpServletRequest request) { Map> res ; @@ -163,7 +167,8 @@ public class SysDictController { * @param dictCode * @return */ - @ApiOperation(value = "字典控制器-通过字典code和字典值key获取字典数据", notes = "字典控制器-通过字典code和字典值key获取字典数据") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "数据字典-通过字典code和字典值key获取字典数据", notes = "数据字典-通过字典code和字典值key获取字典数据") @GetMapping("/getDictText/{dictCode}/{key}") public Result getDictText(@PathVariable("dictCode") String dictCode, @PathVariable("key") String key) { log.info(" dictCode : "+ dictCode); @@ -313,7 +318,6 @@ public class SysDictController { * 【接口签名验证】 * 根据表名——显示字段-存储字段 pid 加载树形数据 */ - @ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 pid 加载树形数据") @GetMapping("/loadTreeData") public Result> loadTreeData(@RequestParam(name="pid") String pid, @RequestParam(name="pidField") String pidField, @RequestParam(name="tableName") String tbname, @@ -335,7 +339,6 @@ public class SysDictController { /** * 查询后返回树型数据 */ - @ApiOperation(value = "字典控制器-根据表名—显示字段-存储字段 加载树形数据", notes = "字典控制器-根据表名—显示字段-存储字段 加载树形数据") @GetMapping("/queryAllTreeData") public Result> queryAllTreeData(@RequestParam(name="pidField") String pidField, @RequestParam(name="tableName") String tbname, @@ -358,7 +361,8 @@ public class SysDictController { * @param sysDict * @return */ - @ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "数据字典-新增字典", notes = "数据字典-新增字典") @PostMapping("/add") @RequiresPermissions("sys:dict:operation") public Result add(@RequestBody SysDict sysDict) { @@ -380,7 +384,8 @@ public class SysDictController { * @param sysDict * @return */ - @ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "数据字典-编辑字典", notes = "数据字典-编辑字典") @PostMapping("/edit") @RequiresPermissions("sys:dict:operation") public Result edit(@RequestBody SysDict sysDict) { @@ -410,7 +415,8 @@ public class SysDictController { * @param map * @return */ - @ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "数据字典-删除字典", notes = "数据字典-删除字典") @PostMapping(value = "/delete") @RequiresPermissions("sys:dict:operation") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @@ -435,7 +441,8 @@ public class SysDictController { * @功能：批量删除 * @return */ - @ApiOperation(value = "字典控制器-批量删除字典", notes = "字典控制器-批量删除字典") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "数据字典-批量删除字典", notes = "数据字典-批量删除字典") @PostMapping(value = "/deleteBatch") @RequiresPermissions("sys:dict:operation") @CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 23f66855..341eaccf 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -21,6 +21,8 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.constant.enums.LanguageEnum; @@ -29,6 +31,7 @@ import com.jero.modules.enums.FixedFieldEnum; import com.jero.modules.system.entity.SysDict; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.util.TreeUtils; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -57,6 +60,8 @@ import lombok.extern.slf4j.Slf4j; * @since 2018-12-28 */ @RestController +@ApiSupport(order = 106) +@Api(tags = "数据字典内容") @RequestMapping("/sys/dictItem") @Slf4j public class SysDictItemController { @@ -74,6 +79,7 @@ public class SysDictItemController { * @param req * @return */ + @ApiOperationSupport(order = 1) @ApiOperation(value = "查询字典内容列表") @GetMapping("/page") public Result> queryPageList(SysDictItem sysDictItem, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -94,6 +100,7 @@ public class SysDictItemController { * @param req * @return */ + @ApiOperationSupport(order = 2) @ApiOperation(value = "查询字典内容树形列表") @GetMapping("/treeList") public Result>> queryTreeList(SysDictItem sysDictItem, @@ -171,7 +178,7 @@ public class SysDictItemController { } } } - + @ApiOperationSupport(order = 3) @ApiOperation(value = "选择框查询字典内容树形列表") @GetMapping("/treeListOption") public Result treeListOption(SysDictItem sysDictItem, @@ -214,7 +221,7 @@ public class SysDictItemController { JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(treeNodes,SerializerFeature.WriteMapNullValue)); return Result.OK(jsonArray != null ? jsonArray : new JSONArray()); } - + @ApiOperationSupport(order = 4) @ApiOperation(value = "根据codes查询列表信息") @GetMapping("/listByCodes") public Result> listByCodes(@RequestParam(name = "codes") String codes) { @@ -228,6 +235,8 @@ public class SysDictItemController { * @功能：新增 * @return */ + @ApiOperationSupport(order = 5) + @ApiOperation(value = "新增字典内容") @PostMapping("/add") @RequiresPermissions("sys:dict:operation") @CacheEvict(value= {CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @@ -252,6 +261,8 @@ public class SysDictItemController { * @param sysDictItem * @return */ + @ApiOperationSupport(order = 6) + @ApiOperation(value = "编辑字典内容") @PostMapping("/edit") @RequiresPermissions("sys:dict:operation") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @@ -279,6 +290,8 @@ public class SysDictItemController { * @param map * @return */ + @ApiOperationSupport(order = 7) + @ApiOperation(value = "删除字典内容") @PostMapping("/delete") @RequiresPermissions("sys:dict:operation") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @@ -308,6 +321,8 @@ public class SysDictItemController { * @param map * @return */ + @ApiOperationSupport(order = 8) + @ApiOperation(value = "批量删除字典内容") @PostMapping("/deleteBatch") @RequiresPermissions("sys:dict:operation") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) @@ -339,6 +354,8 @@ public class SysDictItemController { * @param request * @return */ + @ApiOperationSupport(order = 9) + @ApiOperation(value = "字典值重复校验") @GetMapping("/dictItemCheck") public Result doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) { int num = 0; diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index 32c29b7b..4c90befc 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -11,9 +11,13 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.UUIDGenerator; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -56,6 +60,8 @@ import lombok.extern.slf4j.Slf4j; * @Author scott * @since 2018-12-19 */ +@ApiSupport(order = 102) +@Api(tags = "角色管理") @RestController @RequestMapping("/sys/role") @Slf4j @@ -82,6 +88,8 @@ public class SysRoleController { * @param req * @return */ + @ApiOperationSupport(order = 1) + @ApiOperation(value="角色列表查询", notes="角色列表查询") @GetMapping("/page") public Result> queryPageList(SysRole role, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 61f7ecd6..811fa329 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -121,6 +121,8 @@ public class SysUserController { * @param req * @return */ + @ApiOperationSupport(order = 1) + @ApiOperation(value="用户列表查询", notes="用户列表查询") @PermissionData(pageComponent = "system/UserList") @GetMapping("/page") public Result> queryPageList(SysUser user, @@ -166,8 +168,7 @@ public class SysUserController { SysUserController.log.info(pageList.toString()); return result; } - @ApiOperationSupport(order = 1) - @ApiOperation(value="用户添加", notes="用户添加") + @RequiresPermissions("user:add") @PostMapping("/add") public Result add(@RequestBody JSONObject jsonObject) { @@ -220,8 +221,6 @@ public class SysUserController { } } - @ApiOperationSupport(order = 2) - @ApiOperation(value="用户编辑", notes="用户编辑") @RequiresPermissions("user:edit") @PostMapping("/edit") public Result edit(@RequestBody JSONObject jsonObject) { @@ -750,6 +749,8 @@ public class SysUserController { * @param * @return */ + @ApiOperationSupport(order = 3) + @ApiOperation(value="给指定角色添加用户", notes="给指定角色添加用户") @RequiresPermissions("user:add") @PostMapping("/addSysUserRole") public Result addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) { @@ -1457,7 +1458,7 @@ public class SysUserController { return ls; } - @ApiOperationSupport(order = 3) + @ApiOperationSupport(order = 2) @ApiOperation(value="角色配置", notes="角色配置") @PostMapping(value = "/setRole") public Result setRole(@RequestBody JSONObject jsonObject) { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java b/laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java index 9c699b2c..a7886e42 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/system/controller/LawsContactManageController.java @@ -4,6 +4,9 @@ import java.util.Arrays; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.util.MessageUtils; import com.jero.common.api.vo.ResultCommon; @@ -28,6 +31,7 @@ import org.apache.poi.ss.formula.functions.T; * @Date: 2023-10-13 * @Version: V1.0 */ +@ApiSupport(order = 111) @Api(tags="联络人管理") @RestController @RequestMapping("/laws/system/lawsContactManage") @@ -46,6 +50,7 @@ public class LawsContactManageController extends JeroController> queryPageList(LawsContactManage lawsContactManage, @@ -64,6 +69,7 @@ public class LawsContactManageController extends JeroController> queryList(LawsContactManage lawsContactManage, HttpServletRequest req) { @@ -78,6 +84,7 @@ public class LawsContactManageController extends JeroController add(@Validated @RequestBody LawsContactManage lawsContactManage) { @@ -92,6 +99,7 @@ public class LawsContactManageController extends JeroController edit(@Validated @RequestBody LawsContactManage lawsContactManage) { @@ -106,6 +114,7 @@ public class LawsContactManageController extends JeroController delete(@RequestBody Map map) { @@ -123,6 +132,7 @@ public class LawsContactManageController extends JeroController deleteBatch(@RequestBody Map map) { @@ -140,6 +150,7 @@ public class LawsContactManageController extends JeroController queryById(@RequestParam(name="id") String id) { diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index 549c9458..452ebcb3 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; @@ -44,7 +46,8 @@ import java.util.stream.Collectors; * @Date: 2022-03-03 * @Version: V1.0 */ -@Api(tags="文档拆分表") +@ApiSupport(order = 302) +@Api(tags="标准拆分") @RestController @RequestMapping("/split/sarFileSplitInfo") @Slf4j @@ -68,6 +71,7 @@ public class SarFileSplitInfoController extends JeroController> queryList() { - List list = sarFileSplitInfoService.queryList(); - return Result.OK(list); - } - @AutoLog(value = "文档拆分表-回传至文档库") + @ApiOperationSupport(order = 2) @ApiOperation(value="文档拆分表-回传至文档库", notes="文档拆分表-回传至文档库") @GetMapping(value = "/bindToDocumentLibrary") // @RequiresPermissions("split:sarFileSplitInfo:bind") @@ -143,6 +135,7 @@ public class SarFileSplitInfoController extends JeroController add1(@RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { sarFileSplitInfoEO.setStartNumber(0); @@ -184,6 +175,7 @@ public class SarFileSplitInfoController extends JeroController updatePermissions(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { @@ -203,6 +195,7 @@ public class SarFileSplitInfoController extends JeroController publish(@Validated @RequestBody SarFileSplitInfoEO sarFileSplitInfoEO) { @@ -220,7 +213,8 @@ public class SarFileSplitInfoController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { @@ -266,6 +262,7 @@ public class SarFileSplitInfoController extends JeroController> page(SarFileSplitMenuEOPage page) throws Exception { -// List rows = sarFileSplitMenuEOService.queryByPage(page); -// IPage pageList = null; -// pageList.setRecords(rows); -// pageList.setCurrent(page.getPage()); -// pageList.setSize(page.getPageSize()); -// pageList.setTotal(sarFileSplitMenuEOService.queryByCount(page)); -// return Result.OK(pageList); -// } @ApiOperation(value = "文档拆分条款目录-查询Y") @GetMapping("/getSplitMenusByInfoId") diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsEnterprisestandardLevelController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsEnterprisestandardLevelController.java index 2b5c5b6a..656c9510 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsEnterprisestandardLevelController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsEnterprisestandardLevelController.java @@ -1,6 +1,7 @@ package com.jero.modules.sys.controller; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.sys.entity.LawsEnterpriseStandardLevel; import com.jero.modules.sys.service.ILawsEnterpriseStandardLevelService; @@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController; * @Date: 2023-09-06 * @Version: V1.0 */ +@ApiSupport(order = 109) @Api(tags="企标级别映射管理") @RestController @RequestMapping("/sys/lawsEnterprisestandardLevel") diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java index e6d9c0ea..434986b1 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java @@ -6,6 +6,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; import com.jero.common.util.MessageUtils; @@ -31,6 +34,7 @@ import org.apache.poi.ss.formula.functions.T; * @Date: 2023-09-07 * @Version: V1.0 */ +@ApiSupport(order = 110) @Api(tags="友情链接管理") @RestController @RequestMapping("/sys/lawsFriendlyLinks") @@ -44,6 +48,7 @@ public class LawsFriendlyLinksController extends JeroController> queryList(LawsFriendlyLinks lawsFriendlyLinks, HttpServletRequest req) { @@ -56,6 +61,7 @@ public class LawsFriendlyLinksController extends JeroController add(@Validated @RequestBody LawsFriendlyLinks lawsFriendlyLinks) { @@ -71,6 +77,7 @@ public class LawsFriendlyLinksController extends JeroController edit(@RequestBody LawsFriendlyLinks lawsFriendlyLinks) { @@ -85,6 +92,7 @@ public class LawsFriendlyLinksController extends JeroController delete(@RequestBody Map map) { @@ -102,6 +110,7 @@ public class LawsFriendlyLinksController extends JeroController deleteBatch(@RequestBody Map map) { diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java index 152fe974..19b9c951 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java @@ -1,6 +1,8 @@ package com.jero.modules.sys.controller; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; @@ -36,6 +38,7 @@ import java.util.Objects; * @Date: 2023-09-06 * @Version: V1.0 */ +@ApiSupport(order = 107) @Api(tags="内部工作组") @RestController @RequestMapping("/sys/lawsWorkingGroup") @@ -52,6 +55,7 @@ public class LawsWorkingGroupController extends JeroController> queryList(LawsWorkingGroup lawsWorkingGroup) { @@ -88,6 +92,7 @@ public class LawsWorkingGroupController extends JeroController add(@Validated @RequestBody LawsWorkingGroup lawsWorkingGroup) { @@ -110,6 +115,7 @@ public class LawsWorkingGroupController extends JeroController addWorkGroup(@Validated @RequestBody LawsWorkingGroup lawsWorkingGroup) { @@ -135,6 +141,7 @@ public class LawsWorkingGroupController extends JeroController edit(@Validated @RequestBody LawsWorkingGroup lawsWorkingGroup) { @@ -147,6 +154,7 @@ public class LawsWorkingGroupController extends JeroController editWorkGroup(@Validated @RequestBody LawsWorkingGroup lawsWorkingGroup) { @@ -159,6 +167,7 @@ public class LawsWorkingGroupController extends JeroController deleteWorkGroup(@RequestBody Map map) { @@ -188,6 +197,7 @@ public class LawsWorkingGroupController extends JeroController delete(@RequestBody Map map) { diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java index bf12d0a7..2536213b 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java @@ -2,6 +2,8 @@ package com.jero.modules.sys.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.CommonConstant; @@ -46,7 +48,8 @@ import java.util.stream.IntStream; * @Date: 2023-09-06 * @Version: V1.0 */ -@Api(tags = "内部工作组人员关联表") +@ApiSupport(order = 108) +@Api(tags = "内部工作组人员关联") @RestController @RequestMapping("/sys/lawsWorkingGroupUser") @Slf4j @@ -63,6 +66,7 @@ public class LawsWorkingGroupUserController extends JeroController> queryPageList(LawsWorkingGroupUser lawsWorkingGroupUser, @@ -80,6 +84,7 @@ public class LawsWorkingGroupUserController extends JeroController> queryList(LawsWorkingGroupUser lawsWorkingGroupUser, HttpServletRequest req) { @@ -94,6 +99,7 @@ public class LawsWorkingGroupUserController extends JeroController add(@Validated @RequestBody LawsWorkingGroupUser lawsWorkingGroupUser) { @@ -139,6 +145,7 @@ public class LawsWorkingGroupUserController extends JeroController delete(@RequestBody Map map) { @@ -160,6 +167,7 @@ public class LawsWorkingGroupUserController extends JeroController importFile(MultipartFile file, String workingGroupId) throws Exception { @@ -233,6 +241,7 @@ public class LawsWorkingGroupUserController extends JeroController * @return */ @AutoLog(value = "标签管理-分页列表查询") + @ApiOperationSupport(order = 1) @ApiOperation(value="标签管理-分页列表查询", notes="标签管理-分页列表查询") //@RequiresPermissions("tag:page") @GetMapping(value = "/page") @@ -65,19 +69,6 @@ public class LawsTagController extends JeroController return Result.OK(pageList); } - /** - * 列表查询 - * - * @return - */ - //@AutoLog(value = "标签管理-列表查询") - //@ApiOperation(value="标签管理-列表查询", notes="标签管理-列表查询") - //@GetMapping(value = "/list") - //public Result> queryList(LawsArea lawsArea) { - // List list = lawsTagService.queryList(lawsArea); - // return Result.OK(list); - //} - /** * 添加 * @@ -85,6 +76,7 @@ public class LawsTagController extends JeroController * @return */ @AutoLog(value = "标签管理-添加") + @ApiOperationSupport(order = 2) @ApiOperation(value="标签管理-添加", notes="标签管理-添加") @PostMapping(value = "/add") @RequiresPermissions("tag:add") @@ -150,6 +142,7 @@ public class LawsTagController extends JeroController * @return */ @AutoLog(value = "标签管理-编辑") + @ApiOperationSupport(order = 3) @ApiOperation(value="标签管理-编辑", notes="标签管理-编辑") @PostMapping(value = "/edit") @RequiresPermissions("tag:edit") @@ -217,6 +210,7 @@ public class LawsTagController extends JeroController *（0非固定字段 1固定字段 2字段固定，内部可配） */ @AutoLog(value = "标签管理-通过id删除") + @ApiOperationSupport(order = 4) @ApiOperation(value="标签管理-通过id删除", notes="标签管理-通过id删除") @PostMapping(value = "/logicDelete") @RequiresPermissions("tag:logicDelete") @@ -244,6 +238,7 @@ public class LawsTagController extends JeroController * 批量逻辑删除 */ @AutoLog(value = "标签管理-批量删除") + @ApiOperationSupport(order = 5) @ApiOperation(value="标签管理-批量删除", notes="标签管理-批量删除") @PostMapping(value = "/logicDeleteBatch") @RequiresPermissions("tag:logicDeleteBatch") @@ -279,6 +274,7 @@ public class LawsTagController extends JeroController * @return */ @AutoLog(value = "标签管理-通过id查询") + @ApiOperationSupport(order = 6) @ApiOperation(value="标签管理-通过id查询", notes="标签管理-通过id查询") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) {