add 系统管理接口排序

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<IPage<SysDict>> 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<List<SysDictTree>> 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<Map<String, List<DictModel>>> queryAllDictItems(HttpServletRequest request) {
 		Map<String, List<DictModel>> 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<String> 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<List<TreeSelectModel>> 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<List<TreeSelectModel>> 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<Object> 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<Object> 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)

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<IPage<SysDictItem>> 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<Page<Tree<String>>> queryTreeList(SysDictItem sysDictItem,
@@ -171,7 +178,7 @@ public class SysDictItemController {
 			}
 		}
 	}
-
+	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "选择框查询字典内容树形列表")
 	@GetMapping("/treeListOption")
 	public Result<JSONArray> 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<List<SysDictItem>> 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<Object> doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) {
 		int num = 0;

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<IPage<SysRole>> queryPageList(SysRole role,
                                                 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,

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<IPage<SysUser>> 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<Object> add(@RequestBody JSONObject jsonObject) {
@@ -220,8 +221,6 @@ public class SysUserController {
         }
     }
 
-    @ApiOperationSupport(order = 2)
-    @ApiOperation(value="用户编辑", notes="用户编辑")
     @RequiresPermissions("user:edit")
     @PostMapping("/edit")
 	public Result<SysUser> 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<String> 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<SysUser> setRole(@RequestBody JSONObject jsonObject) {