diff --git a/pom.xml b/pom.xml index 9aa357eec..8d9a17fa9 100644 --- a/pom.xml +++ b/pom.xml @@ -90,6 +90,12 @@ 1.6.9 + + org.springdoc + springdoc-openapi-javadoc + 1.6.9 + + org.apache.poi poi @@ -326,6 +332,18 @@ ${java.version} ${java.version} ${project.build.sourceEncoding} + + + com.github.therapi + therapi-runtime-javadoc-scribe + 0.13.0 + + + org.projectlombok + lombok + 1.18.24 + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java index 6865d162f..c80315f35 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java @@ -19,7 +19,6 @@ import com.ruoyi.sms.config.properties.SmsProperties; import com.ruoyi.sms.core.SmsTemplate; import com.ruoyi.sms.entity.SmsResult; import com.ruoyi.system.service.ISysConfigService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -53,7 +52,6 @@ public class CaptchaController { /** * 短信验证码 */ - @Operation(summary = "短信验证码") @GetMapping("/captchaSms") public R smsCaptcha(@Parameter(name = "用户手机号") @NotBlank(message = "{user.phonenumber.not.blank}") @@ -80,7 +78,6 @@ public class CaptchaController { /** * 生成验证码 */ - @Operation(summary = "生成验证码") @GetMapping("/captchaImage") public R> getCode() { Map ajax = new HashMap<>(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java index e0dad9f8b..b3944127a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java @@ -5,7 +5,6 @@ import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysCache; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.connection.RedisServerCommands; @@ -41,7 +40,6 @@ public class CacheController { CACHES.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理")); } - @Operation(summary = "获取缓存监控详细信息") @SaCheckPermission("monitor:cache:list") @GetMapping() public R> getInfo() throws Exception { @@ -67,14 +65,12 @@ public class CacheController { return R.ok(result); } - @Operation(summary = "获取缓存名称列表") @SaCheckPermission("monitor:cache:list") @GetMapping("/getNames") public R> cache() { return R.ok(CACHES); } - @Operation(summary = "获取KEYS基于缓存名") @SaCheckPermission("monitor:cache:list") @GetMapping("/getKeys/{cacheName}") public R> getCacheKeys(@PathVariable String cacheName) { @@ -82,7 +78,6 @@ public class CacheController { return R.ok(cacheKyes); } - @Operation(summary = "获取值基于缓存名与KEY") @SaCheckPermission("monitor:cache:list") @GetMapping("/getValue/{cacheName}/{cacheKey}") public R getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey) { @@ -91,7 +86,6 @@ public class CacheController { return R.ok(sysCache); } - @Operation(summary = "清空缓存名") @SaCheckPermission("monitor:cache:list") @DeleteMapping("/clearCacheName/{cacheName}") public R clearCacheName(@PathVariable String cacheName) { @@ -100,7 +94,6 @@ public class CacheController { return R.ok(); } - @Operation(summary = "清空缓存KEY") @SaCheckPermission("monitor:cache:list") @DeleteMapping("/clearCacheKey/{cacheKey}") public R clearCacheKey(@PathVariable String cacheKey) { @@ -108,7 +101,6 @@ public class CacheController { return R.ok(); } - @Operation(summary = "清空所有缓存") @SaCheckPermission("monitor:cache:list") @DeleteMapping("/clearCacheAll") public R clearCacheAll() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index 6e2eaae66..4b82b4ac9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java @@ -10,7 +10,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.service.ISysLogininforService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -33,14 +32,12 @@ public class SysLogininforController extends BaseController { private final ISysLogininforService logininforService; - @Operation(summary = "查询系统访问记录列表") @SaCheckPermission("monitor:logininfor:list") @GetMapping("/list") public TableDataInfo list(SysLogininfor logininfor, PageQuery pageQuery) { return logininforService.selectPageLogininforList(logininfor, pageQuery); } - @Operation(summary = "导出系统访问记录列表") @Log(title = "登录日志", businessType = BusinessType.EXPORT) @SaCheckPermission("monitor:logininfor:export") @PostMapping("/export") @@ -49,7 +46,6 @@ public class SysLogininforController extends BaseController { ExcelUtil.exportExcel(list, "登录日志", SysLogininfor.class, response); } - @Operation(summary = "删除系统访问记录") @SaCheckPermission("monitor:logininfor:remove") @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") @@ -57,7 +53,6 @@ public class SysLogininforController extends BaseController { return toAjax(logininforService.deleteLogininforByIds(infoIds)); } - @Operation(summary = "清空系统访问记录") @SaCheckPermission("monitor:logininfor:remove") @Log(title = "登录日志", businessType = BusinessType.CLEAN) @DeleteMapping("/clean") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index 290c6e4a9..d7dcff4b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -10,7 +10,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.service.ISysOperLogService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -33,14 +32,12 @@ public class SysOperlogController extends BaseController { private final ISysOperLogService operLogService; - @Operation(summary = "查询操作日志记录列表") @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") public TableDataInfo list(SysOperLog operLog, PageQuery pageQuery) { return operLogService.selectPageOperLogList(operLog, pageQuery); } - @Operation(summary = "导出操作日志记录列表") @Log(title = "操作日志", businessType = BusinessType.EXPORT) @SaCheckPermission("monitor:operlog:export") @PostMapping("/export") @@ -49,7 +46,6 @@ public class SysOperlogController extends BaseController { ExcelUtil.exportExcel(list, "操作日志", SysOperLog.class, response); } - @Operation(summary = "删除操作日志记录") @Log(title = "操作日志", businessType = BusinessType.DELETE) @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/{operIds}") @@ -57,7 +53,6 @@ public class SysOperlogController extends BaseController { return toAjax(operLogService.deleteOperLogByIds(operIds)); } - @Operation(summary = "清空操作日志记录") @Log(title = "操作日志", businessType = BusinessType.CLEAN) @SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/clean") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index d5bcc1364..f35549c04 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java @@ -15,7 +15,6 @@ import com.ruoyi.common.utils.StreamUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.redis.RedisUtils; import com.ruoyi.system.domain.SysUserOnline; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -35,7 +34,6 @@ import java.util.List; @RequestMapping("/monitor/online") public class SysUserOnlineController extends BaseController { - @Operation(summary = "在线用户列表") @SaCheckPermission("monitor:online:list") @GetMapping("/list") public TableDataInfo list(String ipaddr, String userName) { @@ -73,7 +71,6 @@ public class SysUserOnlineController extends BaseController { /** * 强退用户 */ - @Operation(summary = "强退用户") @SaCheckPermission("monitor:online:forceLogout") @Log(title = "在线用户", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index ce73439eb..3e269799c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -11,7 +11,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.service.ISysConfigService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -38,14 +37,12 @@ public class SysConfigController extends BaseController { /** * 获取参数配置列表 */ - @Operation(summary = "获取参数配置列表") @SaCheckPermission("system:config:list") @GetMapping("/list") public TableDataInfo list(SysConfig config, PageQuery pageQuery) { return configService.selectPageConfigList(config, pageQuery); } - @Operation(summary = "导出参数配置列表") @Log(title = "参数管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:config:export") @PostMapping("/export") @@ -57,7 +54,6 @@ public class SysConfigController extends BaseController { /** * 根据参数编号获取详细信息 */ - @Operation(summary = "根据参数编号获取详细信息") @SaCheckPermission("system:config:query") @GetMapping(value = "/{configId}") public R getInfo(@Parameter(name = "参数ID") @PathVariable Long configId) { @@ -67,7 +63,6 @@ public class SysConfigController extends BaseController { /** * 根据参数键名查询参数值 */ - @Operation(summary = "根据参数键名查询参数值") @GetMapping(value = "/configKey/{configKey}") public R getConfigKey(@Parameter(name = "参数Key") @PathVariable String configKey) { return R.ok(configService.selectConfigByKey(configKey)); @@ -76,7 +71,6 @@ public class SysConfigController extends BaseController { /** * 新增参数配置 */ - @Operation(summary = "新增参数配置") @SaCheckPermission("system:config:add") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping @@ -90,7 +84,6 @@ public class SysConfigController extends BaseController { /** * 修改参数配置 */ - @Operation(summary = "修改参数配置") @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping @@ -104,7 +97,6 @@ public class SysConfigController extends BaseController { /** * 根据参数键名修改参数配置 */ - @Operation(summary = "根据参数键名修改参数配置") @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping("/updateByKey") @@ -115,7 +107,6 @@ public class SysConfigController extends BaseController { /** * 删除参数配置 */ - @Operation(summary = "删除参数配置") @SaCheckPermission("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") @@ -127,7 +118,6 @@ public class SysConfigController extends BaseController { /** * 刷新参数缓存 */ - @Operation(summary = "刷新参数缓存") @SaCheckPermission("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index e99e330dc..3dedb11db 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -11,7 +11,6 @@ import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysDeptService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -39,7 +38,6 @@ public class SysDeptController extends BaseController { /** * 获取部门列表 */ - @Operation(summary = "获取部门列表") @SaCheckPermission("system:dept:list") @GetMapping("/list") public R> list(SysDept dept) { @@ -50,7 +48,6 @@ public class SysDeptController extends BaseController { /** * 查询部门列表(排除节点) */ - @Operation(summary = "查询部门列表(排除节点)") @SaCheckPermission("system:dept:list") @GetMapping("/list/exclude/{deptId}") public R> excludeChild(@Parameter(name = "部门ID") @PathVariable(value = "deptId", required = false) Long deptId) { @@ -63,7 +60,6 @@ public class SysDeptController extends BaseController { /** * 根据部门编号获取详细信息 */ - @Operation(summary = "根据部门编号获取详细信息") @SaCheckPermission("system:dept:query") @GetMapping(value = "/{deptId}") public R getInfo(@Parameter(name = "部门ID") @PathVariable Long deptId) { @@ -74,7 +70,6 @@ public class SysDeptController extends BaseController { /** * 获取部门下拉树列表 */ - @Operation(summary = "获取部门下拉树列表") @GetMapping("/treeselect") public R>> treeselect(SysDept dept) { List depts = deptService.selectDeptList(dept); @@ -84,7 +79,6 @@ public class SysDeptController extends BaseController { /** * 加载对应角色部门列表树 */ - @Operation(summary = "加载对应角色部门列表树") @GetMapping(value = "/roleDeptTreeselect/{roleId}") public R> roleDeptTreeselect(@Parameter(name = "角色ID") @PathVariable("roleId") Long roleId) { List depts = deptService.selectDeptList(new SysDept()); @@ -97,7 +91,6 @@ public class SysDeptController extends BaseController { /** * 新增部门 */ - @Operation(summary = "新增部门") @SaCheckPermission("system:dept:add") @Log(title = "部门管理", businessType = BusinessType.INSERT) @PostMapping @@ -111,7 +104,6 @@ public class SysDeptController extends BaseController { /** * 修改部门 */ - @Operation(summary = "修改部门") @SaCheckPermission("system:dept:edit") @Log(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping @@ -132,7 +124,6 @@ public class SysDeptController extends BaseController { /** * 删除部门 */ - @Operation(summary = "删除部门") @SaCheckPermission("system:dept:remove") @Log(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index a6ef304f1..a659f6d20 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -12,7 +12,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -38,14 +37,12 @@ public class SysDictDataController extends BaseController { private final ISysDictDataService dictDataService; private final ISysDictTypeService dictTypeService; - @Operation(summary = "查询字典数据列表") @SaCheckPermission("system:dict:list") @GetMapping("/list") public TableDataInfo list(SysDictData dictData, PageQuery pageQuery) { return dictDataService.selectPageDictDataList(dictData, pageQuery); } - @Operation(summary = "导出字典数据列表") @Log(title = "字典数据", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") @@ -57,7 +54,6 @@ public class SysDictDataController extends BaseController { /** * 查询字典数据详细 */ - @Operation(summary = "查询字典数据详细") @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictCode}") public R getInfo(@Parameter(name = "字典code") @PathVariable Long dictCode) { @@ -67,7 +63,6 @@ public class SysDictDataController extends BaseController { /** * 根据字典类型查询字典数据信息 */ - @Operation(summary = "根据字典类型查询字典数据信息") @GetMapping(value = "/type/{dictType}") public R> dictType(@Parameter(name = "字典类型") @PathVariable String dictType) { List data = dictTypeService.selectDictDataByType(dictType); @@ -80,7 +75,6 @@ public class SysDictDataController extends BaseController { /** * 新增字典类型 */ - @Operation(summary = "新增字典类型") @SaCheckPermission("system:dict:add") @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping @@ -91,7 +85,6 @@ public class SysDictDataController extends BaseController { /** * 修改保存字典类型 */ - @Operation(summary = "修改保存字典类型") @SaCheckPermission("system:dict:edit") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping @@ -102,7 +95,6 @@ public class SysDictDataController extends BaseController { /** * 删除字典类型 */ - @Operation(summary = "删除字典类型") @SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index b5b28f25d..5cabe8573 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -11,7 +11,6 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.service.ISysDictTypeService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -35,14 +34,12 @@ public class SysDictTypeController extends BaseController { private final ISysDictTypeService dictTypeService; - @Operation(summary = "查询字典类型列表") @SaCheckPermission("system:dict:list") @GetMapping("/list") public TableDataInfo list(SysDictType dictType, PageQuery pageQuery) { return dictTypeService.selectPageDictTypeList(dictType, pageQuery); } - @Operation(summary = "导出字典类型列表") @Log(title = "字典类型", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") @@ -54,7 +51,6 @@ public class SysDictTypeController extends BaseController { /** * 查询字典类型详细 */ - @Operation(summary = "查询字典类型详细") @SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictId}") public R getInfo(@Parameter(name = "字典ID") @PathVariable Long dictId) { @@ -64,7 +60,6 @@ public class SysDictTypeController extends BaseController { /** * 新增字典类型 */ - @Operation(summary = "新增字典类型") @SaCheckPermission("system:dict:add") @Log(title = "字典类型", businessType = BusinessType.INSERT) @PostMapping @@ -78,7 +73,6 @@ public class SysDictTypeController extends BaseController { /** * 修改字典类型 */ - @Operation(summary = "修改字典类型") @SaCheckPermission("system:dict:edit") @Log(title = "字典类型", businessType = BusinessType.UPDATE) @PutMapping @@ -92,7 +86,6 @@ public class SysDictTypeController extends BaseController { /** * 删除字典类型 */ - @Operation(summary = "删除字典类型") @SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") @@ -104,7 +97,6 @@ public class SysDictTypeController extends BaseController { /** * 刷新字典缓存 */ - @Operation(summary = "刷新字典缓存") @SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") @@ -116,7 +108,6 @@ public class SysDictTypeController extends BaseController { /** * 获取字典选择框列表 */ - @Operation(summary = "获取字典选择框列表") @GetMapping("/optionselect") public R> optionselect() { List dictTypes = dictTypeService.selectDictTypeAll(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index db2c7ae6a..11d0d506f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -2,7 +2,6 @@ package com.ruoyi.web.controller.system; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.utils.StringUtils; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; @@ -26,7 +25,6 @@ public class SysIndexController { /** * 访问首页,提示语 */ - @Operation(summary = "访问首页,提示语") @GetMapping("/") public String index() { return StringUtils.format("欢迎使用{}后台管理框架,当前版本:v{},请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index d0b3152db..4cd9053d4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -13,7 +13,6 @@ import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.SysLoginService; import com.ruoyi.system.service.SysPermissionService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -51,7 +50,6 @@ public class SysLoginController { * @return 结果 */ @Anonymous - @Operation(summary = "登录方法") @PostMapping("/login") public R> login(@Validated @RequestBody LoginBody loginBody) { Map ajax = new HashMap<>(); @@ -69,7 +67,6 @@ public class SysLoginController { * @return 结果 */ @Anonymous - @Operation(summary = "短信登录(示例)") @PostMapping("/smsLogin") public R> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) { Map ajax = new HashMap<>(); @@ -86,7 +83,6 @@ public class SysLoginController { * @return 结果 */ @Anonymous - @Operation(summary = "小程序登录(示例)") @PostMapping("/xcxLogin") public R> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) { Map ajax = new HashMap<>(); @@ -97,7 +93,6 @@ public class SysLoginController { } @Anonymous - @Operation(summary = "登出方法") @PostMapping("/logout") public R logout() { loginService.logout(); @@ -109,7 +104,6 @@ public class SysLoginController { * * @return 用户信息 */ - @Operation(summary = "获取用户信息") @GetMapping("getInfo") public R> getInfo() { SysUser user = userService.selectUserById(LoginHelper.getUserId()); @@ -129,7 +123,6 @@ public class SysLoginController { * * @return 路由信息 */ - @Operation(summary = "获取路由信息") @GetMapping("getRouters") public R> getRouters() { Long userId = LoginHelper.getUserId(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 40c03d1aa..1e87e6707 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -10,7 +10,6 @@ import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.service.ISysMenuService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -38,7 +37,6 @@ public class SysMenuController extends BaseController { /** * 获取菜单列表 */ - @Operation(summary = "获取菜单列表") @SaCheckPermission("system:menu:list") @GetMapping("/list") public R> list(SysMenu menu) { @@ -49,7 +47,6 @@ public class SysMenuController extends BaseController { /** * 根据菜单编号获取详细信息 */ - @Operation(summary = "根据菜单编号获取详细信息") @SaCheckPermission("system:menu:query") @GetMapping(value = "/{menuId}") public R getInfo(@Parameter(name = "菜单ID") @PathVariable Long menuId) { @@ -59,7 +56,6 @@ public class SysMenuController extends BaseController { /** * 获取菜单下拉树列表 */ - @Operation(summary = "获取菜单下拉树列表") @GetMapping("/treeselect") public R>> treeselect(SysMenu menu) { List menus = menuService.selectMenuList(menu, getUserId()); @@ -69,7 +65,6 @@ public class SysMenuController extends BaseController { /** * 加载对应角色菜单列表树 */ - @Operation(summary = "加载对应角色菜单列表树") @GetMapping(value = "/roleMenuTreeselect/{roleId}") public R> roleMenuTreeselect(@Parameter(name = "角色ID") @PathVariable("roleId") Long roleId) { List menus = menuService.selectMenuList(getUserId()); @@ -82,7 +77,6 @@ public class SysMenuController extends BaseController { /** * 新增菜单 */ - @Operation(summary = "新增菜单") @SaCheckPermission("system:menu:add") @Log(title = "菜单管理", businessType = BusinessType.INSERT) @PostMapping @@ -98,7 +92,6 @@ public class SysMenuController extends BaseController { /** * 修改菜单 */ - @Operation(summary = "修改菜单") @SaCheckPermission("system:menu:edit") @Log(title = "菜单管理", businessType = BusinessType.UPDATE) @PutMapping @@ -116,7 +109,6 @@ public class SysMenuController extends BaseController { /** * 删除菜单 */ - @Operation(summary = "删除菜单") @SaCheckPermission("system:menu:remove") @Log(title = "菜单管理", businessType = BusinessType.DELETE) @DeleteMapping("/{menuId}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index de804cf80..10a8371c7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -9,7 +9,6 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.service.ISysNoticeService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -33,7 +32,6 @@ public class SysNoticeController extends BaseController { /** * 获取通知公告列表 */ - @Operation(summary = "获取通知公告列表") @SaCheckPermission("system:notice:list") @GetMapping("/list") public TableDataInfo list(SysNotice notice, PageQuery pageQuery) { @@ -43,7 +41,6 @@ public class SysNoticeController extends BaseController { /** * 根据通知公告编号获取详细信息 */ - @Operation(summary = "根据通知公告编号获取详细信息") @SaCheckPermission("system:notice:query") @GetMapping(value = "/{noticeId}") public R getInfo(@Parameter(name = "公告ID") @PathVariable Long noticeId) { @@ -53,7 +50,6 @@ public class SysNoticeController extends BaseController { /** * 新增通知公告 */ - @Operation(summary = "新增通知公告") @SaCheckPermission("system:notice:add") @Log(title = "通知公告", businessType = BusinessType.INSERT) @PostMapping @@ -64,7 +60,6 @@ public class SysNoticeController extends BaseController { /** * 修改通知公告 */ - @Operation(summary = "修改通知公告") @SaCheckPermission("system:notice:edit") @Log(title = "通知公告", businessType = BusinessType.UPDATE) @PutMapping @@ -75,7 +70,6 @@ public class SysNoticeController extends BaseController { /** * 删除通知公告 */ - @Operation(summary = "删除通知公告") @SaCheckPermission("system:notice:remove") @Log(title = "通知公告", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java index bb27c8469..023f349c1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java @@ -14,7 +14,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.bo.SysOssConfigBo; import com.ruoyi.system.domain.vo.SysOssConfigVo; import com.ruoyi.system.service.ISysOssConfigService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -44,7 +43,6 @@ public class SysOssConfigController extends BaseController { /** * 查询对象存储配置列表 */ - @Operation(summary = "查询对象存储配置列表") @SaCheckPermission("system:oss:list") @GetMapping("/list") public TableDataInfo list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { @@ -54,7 +52,6 @@ public class SysOssConfigController extends BaseController { /** * 获取对象存储配置详细信息 */ - @Operation(summary = "获取对象存储配置详细信息") @SaCheckPermission("system:oss:query") @GetMapping("/{ossConfigId}") public R getInfo(@Parameter(name = "OSS配置ID") @@ -66,7 +63,6 @@ public class SysOssConfigController extends BaseController { /** * 新增对象存储配置 */ - @Operation(summary = "新增对象存储配置") @SaCheckPermission("system:oss:add") @Log(title = "对象存储配置", businessType = BusinessType.INSERT) @RepeatSubmit() @@ -78,7 +74,6 @@ public class SysOssConfigController extends BaseController { /** * 修改对象存储配置 */ - @Operation(summary = "修改对象存储配置") @SaCheckPermission("system:oss:edit") @Log(title = "对象存储配置", businessType = BusinessType.UPDATE) @RepeatSubmit() @@ -90,7 +85,6 @@ public class SysOssConfigController extends BaseController { /** * 删除对象存储配置 */ - @Operation(summary = "删除对象存储配置") @SaCheckPermission("system:oss:remove") @Log(title = "对象存储配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ossConfigIds}") @@ -103,7 +97,6 @@ public class SysOssConfigController extends BaseController { /** * 状态修改 */ - @Operation(summary = "状态修改") @SaCheckPermission("system:oss:edit") @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java index e71ef9f87..e40c2f5d7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java @@ -19,7 +19,6 @@ import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.vo.SysOssVo; import com.ruoyi.system.service.ISysOssService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -55,7 +54,6 @@ public class SysOssController extends BaseController { /** * 查询OSS对象存储列表 */ - @Operation(summary = "查询OSS对象存储列表") @SaCheckPermission("system:oss:list") @GetMapping("/list") public TableDataInfo list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { @@ -65,7 +63,6 @@ public class SysOssController extends BaseController { /** * 查询OSS对象基于id串 */ - @Operation(summary = "查询OSS对象基于ID") @SaCheckPermission("system:oss:list") @GetMapping("/listByIds/{ossIds}") public R> listByIds(@Parameter(name = "OSS对象ID串") @@ -78,7 +75,6 @@ public class SysOssController extends BaseController { /** * 上传OSS对象存储 */ - @Operation(summary = "上传OSS对象存储") @Parameters({ @Parameter(name = "file", description = "文件", in = ParameterIn.QUERY, required = true) }) @@ -97,7 +93,6 @@ public class SysOssController extends BaseController { return R.ok(map); } - @Operation(summary = "下载OSS对象存储") @SaCheckPermission("system:oss:download") @GetMapping("/download/{ossId}") public void download(@Parameter(name = "OSS对象ID") @PathVariable Long ossId, HttpServletResponse response) throws IOException { @@ -124,7 +119,6 @@ public class SysOssController extends BaseController { /** * 删除OSS对象存储 */ - @Operation(summary = "删除OSS对象存储") @SaCheckPermission("system:oss:remove") @Log(title = "OSS对象存储", businessType = BusinessType.DELETE) @DeleteMapping("/{ossIds}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index 559e6cacf..a78ac4bfd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -11,7 +11,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.service.ISysPostService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -38,14 +37,12 @@ public class SysPostController extends BaseController { /** * 获取岗位列表 */ - @Operation(summary = "获取岗位列表") @SaCheckPermission("system:post:list") @GetMapping("/list") public TableDataInfo list(SysPost post, PageQuery pageQuery) { return postService.selectPagePostList(post, pageQuery); } - @Operation(summary = "导出岗位列表") @Log(title = "岗位管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:post:export") @PostMapping("/export") @@ -57,7 +54,6 @@ public class SysPostController extends BaseController { /** * 根据岗位编号获取详细信息 */ - @Operation(summary = "根据岗位编号获取详细信息") @SaCheckPermission("system:post:query") @GetMapping(value = "/{postId}") public R getInfo(@Parameter(name = "岗位ID") @PathVariable Long postId) { @@ -67,7 +63,6 @@ public class SysPostController extends BaseController { /** * 新增岗位 */ - @Operation(summary = "新增岗位") @SaCheckPermission("system:post:add") @Log(title = "岗位管理", businessType = BusinessType.INSERT) @PostMapping @@ -83,7 +78,6 @@ public class SysPostController extends BaseController { /** * 修改岗位 */ - @Operation(summary = "修改岗位") @SaCheckPermission("system:post:edit") @Log(title = "岗位管理", businessType = BusinessType.UPDATE) @PutMapping @@ -99,7 +93,6 @@ public class SysPostController extends BaseController { /** * 删除岗位 */ - @Operation(summary = "删除岗位") @SaCheckPermission("system:post:remove") @Log(title = "岗位管理", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") @@ -110,7 +103,6 @@ public class SysPostController extends BaseController { /** * 获取岗位选择框列表 */ - @Operation(summary = "获取岗位选择框列表") @GetMapping("/optionselect") public R> optionselect() { List posts = postService.selectPostAll(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 0710e8b51..bb63b0728 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -14,7 +14,6 @@ import com.ruoyi.common.utils.file.MimeTypeUtils; import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.service.ISysOssService; import com.ruoyi.system.service.ISysUserService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -46,7 +45,6 @@ public class SysProfileController extends BaseController { /** * 个人信息 */ - @Operation(summary = "个人信息") @GetMapping public R> profile() { SysUser user = userService.selectUserById(getUserId()); @@ -60,7 +58,6 @@ public class SysProfileController extends BaseController { /** * 修改用户 */ - @Operation(summary = "修改用户") @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping public R updateProfile(@RequestBody SysUser user) { @@ -84,7 +81,6 @@ public class SysProfileController extends BaseController { /** * 重置密码 */ - @Operation(summary = "重置密码") @Parameters({ @Parameter(name = "oldPassword", description = "旧密码", in = ParameterIn.QUERY), @Parameter(name = "newPassword", description = "新密码", in = ParameterIn.QUERY) @@ -111,7 +107,6 @@ public class SysProfileController extends BaseController { /** * 头像上传 */ - @Operation(summary = "头像上传") @Parameters({ @Parameter(name = "avatarfile", description = "用户头像", in = ParameterIn.QUERY, required = true) }) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index 5e90ebd84..cc0596036 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -6,7 +6,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.SysRegisterService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -29,7 +28,6 @@ public class SysRegisterController extends BaseController { private final ISysConfigService configService; @Anonymous - @Operation(summary = "用户注册") @PostMapping("/register") public R register(@Validated @RequestBody RegisterBody user) { if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 967635e43..fc0e5a7d0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -18,7 +18,6 @@ import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.SysPermissionService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -46,14 +45,12 @@ public class SysRoleController extends BaseController { private final ISysUserService userService; private final SysPermissionService permissionService; - @Operation(summary = "查询角色信息列表") @SaCheckPermission("system:role:list") @GetMapping("/list") public TableDataInfo list(SysRole role, PageQuery pageQuery) { return roleService.selectPageRoleList(role, pageQuery); } - @Operation(summary = "导出角色信息列表") @Log(title = "角色管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:role:export") @PostMapping("/export") @@ -65,7 +62,6 @@ public class SysRoleController extends BaseController { /** * 根据角色编号获取详细信息 */ - @Operation(summary = "根据角色编号获取详细信息") @SaCheckPermission("system:role:query") @GetMapping(value = "/{roleId}") public R getInfo(@Parameter(name = "角色ID") @PathVariable Long roleId) { @@ -76,7 +72,6 @@ public class SysRoleController extends BaseController { /** * 新增角色 */ - @Operation(summary = "新增角色") @SaCheckPermission("system:role:add") @Log(title = "角色管理", businessType = BusinessType.INSERT) @PostMapping @@ -93,7 +88,6 @@ public class SysRoleController extends BaseController { /** * 修改保存角色 */ - @Operation(summary = "修改保存角色") @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping @@ -122,7 +116,6 @@ public class SysRoleController extends BaseController { /** * 修改保存数据权限 */ - @Operation(summary = "修改保存数据权限") @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/dataScope") @@ -135,7 +128,6 @@ public class SysRoleController extends BaseController { /** * 状态修改 */ - @Operation(summary = "状态修改") @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") @@ -148,7 +140,6 @@ public class SysRoleController extends BaseController { /** * 删除角色 */ - @Operation(summary = "删除角色") @SaCheckPermission("system:role:remove") @Log(title = "角色管理", businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") @@ -159,7 +150,6 @@ public class SysRoleController extends BaseController { /** * 获取角色选择框列表 */ - @Operation(summary = "获取角色选择框列表") @SaCheckPermission("system:role:query") @GetMapping("/optionselect") public R> optionselect() { @@ -169,7 +159,6 @@ public class SysRoleController extends BaseController { /** * 查询已分配用户角色列表 */ - @Operation(summary = "查询已分配用户角色列表") @SaCheckPermission("system:role:list") @GetMapping("/authUser/allocatedList") public TableDataInfo allocatedList(SysUser user, PageQuery pageQuery) { @@ -179,7 +168,6 @@ public class SysRoleController extends BaseController { /** * 查询未分配用户角色列表 */ - @Operation(summary = "查询未分配用户角色列表") @SaCheckPermission("system:role:list") @GetMapping("/authUser/unallocatedList") public TableDataInfo unallocatedList(SysUser user, PageQuery pageQuery) { @@ -189,7 +177,6 @@ public class SysRoleController extends BaseController { /** * 取消授权用户 */ - @Operation(summary = "取消授权用户") @SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancel") @@ -200,7 +187,6 @@ public class SysRoleController extends BaseController { /** * 批量取消授权用户 */ - @Operation(summary = "批量取消授权用户") @Parameters({ @Parameter(name = "roleId", description = "角色ID", in = ParameterIn.QUERY), @Parameter(name = "userIds", description = "用户ID串", in = ParameterIn.QUERY) @@ -215,7 +201,6 @@ public class SysRoleController extends BaseController { /** * 批量选择用户授权 */ - @Operation(summary = "批量选择用户授权") @Parameters({ @Parameter(name = "roleId", description = "角色ID", in = ParameterIn.QUERY), @Parameter(name = "userIds", description = "用户ID串", in = ParameterIn.QUERY) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index f40c65924..cb564b6cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -26,7 +26,6 @@ import com.ruoyi.system.listener.SysUserImportListener; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -61,14 +60,12 @@ public class SysUserController extends BaseController { /** * 获取用户列表 */ - @Operation(summary = "获取用户列表") @SaCheckPermission("system:user:list") @GetMapping("/list") public TableDataInfo list(SysUser user, PageQuery pageQuery) { return userService.selectPageUserList(user, pageQuery); } - @Operation(summary = "导出用户列表") @Log(title = "用户管理", businessType = BusinessType.EXPORT) @SaCheckPermission("system:user:export") @PostMapping("/export") @@ -86,7 +83,6 @@ public class SysUserController extends BaseController { ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response); } - @Operation(summary = "导入用户列表") @Parameters({ @Parameter(name = "file", description = "导入文件", required = true), }) @@ -98,7 +94,6 @@ public class SysUserController extends BaseController { return R.ok(result.getAnalysis()); } - @Operation(summary = "下载导入模板") @PostMapping("/importTemplate") public void importTemplate(HttpServletResponse response) { ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response); @@ -107,7 +102,6 @@ public class SysUserController extends BaseController { /** * 根据用户编号获取详细信息 */ - @Operation(summary = "根据用户编号获取详细信息") @SaCheckPermission("system:user:query") @GetMapping(value = {"/", "/{userId}"}) public R> getInfo(@Parameter(name = "用户ID") @PathVariable(value = "userId", required = false) Long userId) { @@ -128,7 +122,6 @@ public class SysUserController extends BaseController { /** * 新增用户 */ - @Operation(summary = "新增用户") @SaCheckPermission("system:user:add") @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping @@ -149,7 +142,6 @@ public class SysUserController extends BaseController { /** * 修改用户 */ - @Operation(summary = "修改用户") @SaCheckPermission("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping @@ -169,7 +161,6 @@ public class SysUserController extends BaseController { /** * 删除用户 */ - @Operation(summary = "删除用户") @SaCheckPermission("system:user:remove") @Log(title = "用户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") @@ -183,7 +174,6 @@ public class SysUserController extends BaseController { /** * 重置密码 */ - @Operation(summary = "重置密码") @SaCheckPermission("system:user:resetPwd") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/resetPwd") @@ -197,7 +187,6 @@ public class SysUserController extends BaseController { /** * 状态修改 */ - @Operation(summary = "状态修改") @SaCheckPermission("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") @@ -210,7 +199,6 @@ public class SysUserController extends BaseController { /** * 根据用户编号获取授权角色 */ - @Operation(summary = "根据用户编号获取授权角色") @SaCheckPermission("system:user:query") @GetMapping("/authRole/{userId}") public R> authRole(@Parameter(name = "用户ID") @PathVariable("userId") Long userId) { @@ -225,7 +213,6 @@ public class SysUserController extends BaseController { /** * 用户授权角色 */ - @Operation(summary = "用户授权角色") @Parameters({ @Parameter(name = "userId", description = "用户Id", in = ParameterIn.QUERY), @Parameter(name = "roleIds", description = "角色ID串", in = ParameterIn.QUERY) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 017b5dff4..3c11d01c0 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -215,11 +215,11 @@ springdoc: enabled: true #这里定义了两个分组,可定义多个,也可以不定义 group-configs: - - group: 演示模块 + - group: 1.演示模块 packages-to-scan: com.ruoyi.demo - - group: 系统模块 + - group: 2.系统模块 packages-to-scan: com.ruoyi.web - - group: 代码生成模块 + - group: 3.代码生成模块 packages-to-scan: com.ruoyi.generator # 防止XSS攻击 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index e55dc5094..78ad596b7 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -130,6 +130,11 @@ springdoc-openapi-ui + + org.springdoc + springdoc-openapi-javadoc + + org.springframework.boot diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index 1d12b4e5b..5a20f9d0c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -2,7 +2,6 @@ package com.ruoyi.common.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -24,42 +23,36 @@ public class BaseEntity implements Serializable { /** * 搜索值 */ - @Schema(name = "搜索值") @TableField(exist = false) private String searchValue; /** * 创建者 */ - @Schema(name = "创建者") @TableField(fill = FieldFill.INSERT) private String createBy; /** * 创建时间 */ - @Schema(name = "创建时间") @TableField(fill = FieldFill.INSERT) private Date createTime; /** * 更新者 */ - @Schema(name = "更新者") @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; /** * 更新时间 */ - @Schema(name = "更新时间") @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; /** * 请求参数 */ - @Schema(name = "请求参数") @TableField(exist = false) private Map params = new HashMap<>(); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java index 533ca79ec..f3e2c4a56 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.sql.SqlUtil; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -24,25 +23,21 @@ public class PageQuery implements Serializable { /** * 分页大小 */ - @Schema(name = "分页大小") private Integer pageSize; /** * 当前页数 */ - @Schema(name = "当前页数") private Integer pageNum; /** * 排序列 */ - @Schema(name = "排序列") private String orderByColumn; /** * 排序的方向desc或者asc */ - @Schema(name = "排序的方向", example = "asc,desc") private String isAsc; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java index 999974d7b..70584c6d3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java @@ -1,6 +1,5 @@ package com.ruoyi.common.core.domain; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; @@ -13,7 +12,6 @@ import java.io.Serializable; */ @Data @NoArgsConstructor -@Schema(name = "请求响应对象") public class R implements Serializable { private static final long serialVersionUID = 1L; @@ -27,13 +25,10 @@ public class R implements Serializable { */ public static final int FAIL = 500; - @Schema(name = "消息状态码") private int code; - @Schema(name = "消息内容") private String msg; - @Schema(name = "数据对象") private T data; public static R ok() { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java index 0d28291aa..c7bb9b4ff 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java @@ -1,7 +1,6 @@ package com.ruoyi.common.core.domain; import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,20 +23,17 @@ public class TreeEntity extends BaseEntity { * 父菜单名称 */ @TableField(exist = false) - @Schema(name = "父菜单名称") private String parentName; /** * 父菜单ID */ - @Schema(name = "父菜单ID") private Long parentId; /** * 子部门 */ @TableField(exist = false) - @Schema(name = "子部门") private List children = new ArrayList<>(); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index fcf2e4a65..857f9b8db 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.TreeEntity; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,21 +21,18 @@ import javax.validation.constraints.Size; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_dept") -@Schema(name = "部门业务对象") public class SysDept extends TreeEntity { private static final long serialVersionUID = 1L; /** * 部门ID */ - @Schema(name = "部门id") @TableId(value = "dept_id") private Long deptId; /** * 部门名称 */ - @Schema(name = "部门名称") @NotBlank(message = "部门名称不能为空") @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") private String deptName; @@ -44,27 +40,23 @@ public class SysDept extends TreeEntity { /** * 显示顺序 */ - @Schema(name = "显示顺序") @NotNull(message = "显示顺序不能为空") private Integer orderNum; /** * 负责人 */ - @Schema(name = "负责人") private String leader; /** * 联系电话 */ - @Schema(name = "联系电话") @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") private String phone; /** * 邮箱 */ - @Schema(name = "邮箱") @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") private String email; @@ -72,20 +64,17 @@ public class SysDept extends TreeEntity { /** * 部门状态:0正常,1停用 */ - @Schema(name = "部门状态:0正常,1停用") private String status; /** * 删除标志(0代表存在 2代表删除) */ - @Schema(name = "删除标志(0代表存在 2代表删除)") @TableLogic private String delFlag; /** * 祖级列表 */ - @Schema(name = "祖级列表") private String ancestors; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java index 4b0213848..e20f96aa7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -8,7 +8,6 @@ import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,13 +24,11 @@ import javax.validation.constraints.Size; @EqualsAndHashCode(callSuper = true) @TableName("sys_dict_data") @ExcelIgnoreUnannotated -@Schema(name = "字典数据业务对象") public class SysDictData extends BaseEntity { /** * 字典编码 */ - @Schema(name = "字典编码") @ExcelProperty(value = "字典编码") @TableId(value = "dict_code") private Long dictCode; @@ -39,14 +36,12 @@ public class SysDictData extends BaseEntity { /** * 字典排序 */ - @Schema(name = "字典排序") @ExcelProperty(value = "字典排序") private Integer dictSort; /** * 字典标签 */ - @Schema(name = "字典标签") @ExcelProperty(value = "字典标签") @NotBlank(message = "字典标签不能为空") @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") @@ -55,7 +50,6 @@ public class SysDictData extends BaseEntity { /** * 字典键值 */ - @Schema(name = "字典键值") @ExcelProperty(value = "字典键值") @NotBlank(message = "字典键值不能为空") @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") @@ -64,7 +58,6 @@ public class SysDictData extends BaseEntity { /** * 字典类型 */ - @Schema(name = "字典类型") @ExcelProperty(value = "字典类型") @NotBlank(message = "字典类型不能为空") @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") @@ -73,20 +66,17 @@ public class SysDictData extends BaseEntity { /** * 样式属性(其他样式扩展) */ - @Schema(name = "样式属性(其他样式扩展)") @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") private String cssClass; /** * 表格字典样式 */ - @Schema(name = "表格字典样式") private String listClass; /** * 是否默认(Y是 N否) */ - @Schema(name = "是否默认(Y是 N否)") @ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_yes_no") private String isDefault; @@ -94,7 +84,6 @@ public class SysDictData extends BaseEntity { /** * 状态(0正常 1停用) */ - @Schema(name = "状态(0正常 1停用)") @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_normal_disable") private String status; @@ -102,7 +91,6 @@ public class SysDictData extends BaseEntity { /** * 备注 */ - @Schema(name = "备注") private String remark; public boolean getDefault() { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index 095aba037..36e38a971 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,13 +24,11 @@ import javax.validation.constraints.Size; @EqualsAndHashCode(callSuper = true) @TableName("sys_dict_type") @ExcelIgnoreUnannotated -@Schema(name = "字典类型业务对象") public class SysDictType extends BaseEntity { /** * 字典主键 */ - @Schema(name = "字典主键") @ExcelProperty(value = "字典主键") @TableId(value = "dict_id") private Long dictId; @@ -39,7 +36,6 @@ public class SysDictType extends BaseEntity { /** * 字典名称 */ - @Schema(name = "字典名称") @ExcelProperty(value = "字典名称") @NotBlank(message = "字典名称不能为空") @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") @@ -48,7 +44,6 @@ public class SysDictType extends BaseEntity { /** * 字典类型 */ - @Schema(name = "字典类型") @ExcelProperty(value = "字典类型") @NotBlank(message = "字典类型不能为空") @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") @@ -58,7 +53,6 @@ public class SysDictType extends BaseEntity { /** * 状态(0正常 1停用) */ - @Schema(name = "状态(0正常 1停用)") @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_normal_disable") private String status; @@ -66,7 +60,6 @@ public class SysDictType extends BaseEntity { /** * 备注 */ - @Schema(name = "备注") private String remark; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java index 554bc3a5f..6e366a753 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.core.domain.TreeEntity; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,20 +20,17 @@ import javax.validation.constraints.Size; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_menu") -@Schema(name = "菜单权限业务对象") public class SysMenu extends TreeEntity { /** * 菜单ID */ - @Schema(name = "菜单ID") @TableId(value = "menu_id") private Long menuId; /** * 菜单名称 */ - @Schema(name = "菜单名称") @NotBlank(message = "菜单名称不能为空") @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") private String menuName; @@ -42,65 +38,55 @@ public class SysMenu extends TreeEntity { /** * 显示顺序 */ - @Schema(name = "显示顺序") @NotNull(message = "显示顺序不能为空") private Integer orderNum; /** * 路由地址 */ - @Schema(name = "路由地址") @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") private String path; /** * 组件路径 */ - @Schema(name = "组件路径") @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") private String component; /** * 路由参数 */ - @Schema(name = "路由参数") private String queryParam; /** * 是否为外链(0是 1否) */ - @Schema(name = "是否为外链(0是 1否)") private String isFrame; /** * 是否缓存(0缓存 1不缓存) */ - @Schema(name = "是否缓存(0缓存 1不缓存)") private String isCache; /** * 类型(M目录 C菜单 F按钮) */ - @Schema(name = "类型(M目录 C菜单 F按钮)") @NotBlank(message = "菜单类型不能为空") private String menuType; /** * 显示状态(0显示 1隐藏) */ - @Schema(name = "显示状态(0显示 1隐藏)") private String visible; /** * 菜单状态(0显示 1隐藏) */ - @Schema(name = "菜单状态(0显示 1隐藏)") private String status; /** * 权限字符串 */ - @Schema(name = "权限字符串") @JsonInclude(JsonInclude.Include.NON_NULL) @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") private String perms; @@ -108,13 +94,11 @@ public class SysMenu extends TreeEntity { /** * 菜单图标 */ - @Schema(name = "菜单图标") private String icon; /** * 备注 */ - @Schema(name = "备注") private String remark; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 3955a59f6..b7caaea3e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -10,7 +10,6 @@ import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -35,7 +34,6 @@ public class SysRole extends BaseEntity { /** * 角色ID */ - @Schema(name = "角色ID") @ExcelProperty(value = "角色序号") @TableId(value = "role_id") private Long roleId; @@ -43,7 +41,6 @@ public class SysRole extends BaseEntity { /** * 角色名称 */ - @Schema(name = "角色名称") @ExcelProperty(value = "角色名称") @NotBlank(message = "角色名称不能为空") @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符") @@ -52,7 +49,6 @@ public class SysRole extends BaseEntity { /** * 角色权限 */ - @Schema(name = "角色权限") @ExcelProperty(value = "角色权限") @NotBlank(message = "权限字符不能为空") @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符") @@ -61,7 +57,6 @@ public class SysRole extends BaseEntity { /** * 角色排序 */ - @Schema(name = "角色排序") @ExcelProperty(value = "角色排序") @NotNull(message = "显示顺序不能为空") private Integer roleSort; @@ -69,7 +64,6 @@ public class SysRole extends BaseEntity { /** * 数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限;5:仅本人数据权限) */ - @Schema(name = "数据范围(1:所有数据权限;2:自定义数据权限;3:本部门数据权限;4:本部门及以下数据权限;5:仅本人数据权限)") @ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限") private String dataScope; @@ -77,19 +71,16 @@ public class SysRole extends BaseEntity { /** * 菜单树选择项是否关联显示( 0:父子不互相关联显示 1:父子互相关联显示) */ - @Schema(name = "菜单树选择项是否关联显示( 0:父子不互相关联显示 1:父子互相关联显示)") private Boolean menuCheckStrictly; /** * 部门树选择项是否关联显示(0:父子不互相关联显示 1:父子互相关联显示 ) */ - @Schema(name = "部门树选择项是否关联显示(0:父子不互相关联显示 1:父子互相关联显示 )") private Boolean deptCheckStrictly; /** * 角色状态(0正常 1停用) */ - @Schema(name = "角色状态(0正常 1停用)") @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_common_status") private String status; @@ -97,34 +88,29 @@ public class SysRole extends BaseEntity { /** * 删除标志(0代表存在 2代表删除) */ - @Schema(name = "删除标志(0代表存在 2代表删除)") @TableLogic private String delFlag; /** * 备注 */ - @Schema(name = "备注") private String remark; /** * 用户是否存在此角色标识 默认不存在 */ - @Schema(name = "用户是否存在此角色标识 默认不存在") @TableField(exist = false) private boolean flag = false; /** * 菜单组 */ - @Schema(name = "菜单组") @TableField(exist = false) private Long[] menuIds; /** * 部门组(数据权限) */ - @Schema(name = "部门组(数据权限)") @TableField(exist = false) private Long[] deptIds; @@ -132,7 +118,6 @@ public class SysRole extends BaseEntity { this.roleId = roleId; } - @Schema(name = "是否管理员") public boolean isAdmin() { return UserConstants.ADMIN_ID.equals(this.roleId); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 3a35916f5..f2d961b7a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -6,7 +6,6 @@ import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.enums.SensitiveStrategy; import com.ruoyi.common.xss.Xss; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -27,26 +26,22 @@ import java.util.List; @NoArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName("sys_user") -@Schema(name = "用户信息业务对象") public class SysUser extends BaseEntity { /** * 用户ID */ - @Schema(name = "用户ID") @TableId(value = "user_id") private Long userId; /** * 部门ID */ - @Schema(name = "部门ID") private Long deptId; /** * 用户账号 */ - @Schema(name = "用户账号") @Xss(message = "用户账号不能包含脚本字符") @NotBlank(message = "用户账号不能为空") @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") @@ -55,7 +50,6 @@ public class SysUser extends BaseEntity { /** * 用户昵称 */ - @Schema(name = "用户昵称") @Xss(message = "用户昵称不能包含脚本字符") @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") private String nickName; @@ -63,14 +57,12 @@ public class SysUser extends BaseEntity { /** * 用户类型(sys_user系统用户) */ - @Schema(name = "用户类型") private String userType; /** * 用户邮箱 */ @Sensitive(strategy = SensitiveStrategy.EMAIL) - @Schema(name = "用户邮箱") @Email(message = "邮箱格式不正确") @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") private String email; @@ -79,25 +71,21 @@ public class SysUser extends BaseEntity { * 手机号码 */ @Sensitive(strategy = SensitiveStrategy.PHONE) - @Schema(name = "手机号码") private String phonenumber; /** * 用户性别 */ - @Schema(name = "用户性别") private String sex; /** * 用户头像 */ - @Schema(name = "用户头像") private String avatar; /** * 密码 */ - @Schema(name = "密码") @TableField( insertStrategy = FieldStrategy.NOT_EMPTY, updateStrategy = FieldStrategy.NOT_EMPTY, @@ -108,66 +96,56 @@ public class SysUser extends BaseEntity { /** * 帐号状态(0正常 1停用) */ - @Schema(name = "帐号状态(0正常 1停用)") private String status; /** * 删除标志(0代表存在 2代表删除) */ - @Schema(name = "删除标志(0代表存在 2代表删除)") @TableLogic private String delFlag; /** * 最后登录IP */ - @Schema(name = "最后登录IP") private String loginIp; /** * 最后登录时间 */ - @Schema(name = "最后登录时间") private Date loginDate; /** * 备注 */ - @Schema(name = "备注") private String remark; /** * 部门对象 */ - @Schema(name = "部门对象") @TableField(exist = false) private SysDept dept; /** * 角色对象 */ - @Schema(name = "角色对象") @TableField(exist = false) private List roles; /** * 角色组 */ - @Schema(name = "角色组") @TableField(exist = false) private Long[] roleIds; /** * 岗位组 */ - @Schema(name = "岗位组") @TableField(exist = false) private Long[] postIds; /** * 数据权限 当前角色ID */ - @Schema(name = "角色ID") @TableField(exist = false) private Long roleId; @@ -175,7 +153,6 @@ public class SysUser extends BaseEntity { this.userId = userId; } - @Schema(name = "是否管理员") public boolean isAdmin() { return UserConstants.ADMIN_ID.equals(this.userId); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java index 18c37a9b3..4a4cfb518 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java @@ -1,7 +1,6 @@ package com.ruoyi.common.core.domain.model; import com.ruoyi.common.constant.UserConstants; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -14,7 +13,6 @@ import javax.validation.constraints.NotBlank; */ @Data -@Schema(name = "用户登录对象") public class LoginBody { /** @@ -22,7 +20,6 @@ public class LoginBody { */ @NotBlank(message = "{user.username.not.blank}") @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") - @Schema(name = "用户名") private String username; /** @@ -30,19 +27,16 @@ public class LoginBody { */ @NotBlank(message = "{user.password.not.blank}") @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") - @Schema(name = "用户密码") private String password; /** * 验证码 */ - @Schema(name = "验证码") private String code; /** * 唯一标识 */ - @Schema(name = "唯一标识") private String uuid; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java index 37f52a767..88367e7b0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java @@ -1,6 +1,5 @@ package com.ruoyi.common.core.domain.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,10 +10,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -@Schema(name = "用户注册对象") public class RegisterBody extends LoginBody { - @Schema(name = "用户类型") private String userType; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java index d89a8c15b..ce774ac7e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java @@ -1,6 +1,5 @@ package com.ruoyi.common.core.domain.model; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -12,21 +11,18 @@ import javax.validation.constraints.NotBlank; */ @Data -@Schema(name = "短信登录对象") public class SmsLoginBody { /** * 用户名 */ @NotBlank(message = "{user.phonenumber.not.blank}") - @Schema(name = "用户手机号") private String phonenumber; /** * 用户密码 */ @NotBlank(message = "{sms.code.not.blank}") - @Schema(name = "短信验证码") private String smsCode; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java index b44175ac7..5f3f2d1ad 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java @@ -2,7 +2,6 @@ package com.ruoyi.common.core.page; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,32 +16,27 @@ import java.util.List; @Data @NoArgsConstructor -@Schema(name = "分页响应对象") public class TableDataInfo implements Serializable { private static final long serialVersionUID = 1L; /** * 总记录数 */ - @Schema(name = "总记录数") private long total; /** * 列表数据 */ - @Schema(name = "列表数据") private List rows; /** * 消息状态码 */ - @Schema(name = "消息状态码") private int code; /** * 消息内容 */ - @Schema(name = "消息内容") private String msg; /** diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java index c88baecd7..d86289d24 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java @@ -2,7 +2,6 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.email.MailUtils; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -26,7 +25,6 @@ import java.io.File; @RequestMapping("/demo/mail") public class MailController { - @Operation(summary = "发送邮件") @GetMapping("/sendSimpleMessage") public R sendSimpleMessage(@Parameter(name = "接收人") String to, @Parameter(name = "标题") String subject, @@ -35,7 +33,6 @@ public class MailController { return R.ok(); } - @Operation(summary = "发送邮件(带附件)") @GetMapping("/sendMessageWithAttachment") public R sendMessageWithAttachment(@Parameter(name = "接收人") String to, @Parameter(name = "标题") String subject, diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java index b80a9a8cd..c2baa71e7 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java @@ -41,7 +41,6 @@ public class RedisCacheController { *

* cacheNames 为配置文件内 groupId */ - @Operation(summary = "测试 @Cacheable") @Cacheable(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null") @GetMapping("/test1") public R test1(String key, String value) { @@ -56,7 +55,6 @@ public class RedisCacheController { *

* cacheNames 为 配置文件内 groupId */ - @Operation(summary = "测试 @CachePut") @CachePut(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null") @GetMapping("/test2") public R test2(String key, String value) { @@ -71,7 +69,6 @@ public class RedisCacheController { *

* cacheNames 为 配置文件内 groupId */ - @Operation(summary = "测试 @CacheEvict") @CacheEvict(cacheNames = "redissonCacheMap", key = "#key", condition = "#key != null") @GetMapping("/test3") public R test3(String key, String value) { @@ -83,7 +80,6 @@ public class RedisCacheController { * 手动设置过期时间10秒 * 11秒后获取 判断是否相等 */ - @Operation(summary = "测试设置过期时间") @GetMapping("/test6") public R test6(String key, String value) { RedisUtils.setCacheObject(key, value); diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java index f9803c601..0e1bb8428 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java @@ -5,7 +5,6 @@ import com.baomidou.lock.LockTemplate; import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.executor.RedissonLockExecutor; import com.ruoyi.common.core.domain.R; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +32,6 @@ public class RedisLockController { /** * 测试lock4j 注解 */ - @Operation(summary = "测试lock4j 注解") @Lock4j(keys = {"#key"}) @GetMapping("/testLock4j") public R testLock4j(String key, String value) { @@ -50,7 +48,6 @@ public class RedisLockController { /** * 测试lock4j 工具 */ - @Operation(summary = "测试lock4j 工具") @GetMapping("/testLock4jLockTemplate") public R testLock4jLockTemplate(String key, String value) { final LockInfo lockInfo = lockTemplate.lock(key, 30000L, 5000L, RedissonLockExecutor.class); diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java index da8522b5a..344abc142 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java @@ -2,7 +2,6 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.redis.RedisUtils; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -21,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/demo/redis/pubsub") public class RedisPubSubController { - @Operation(summary = "发布消息") @GetMapping("/pub") public R pub(@Parameter(name = "通道Key") String key, @Parameter(name = "发送内容") String value) { RedisUtils.publish(key, value, consumer -> { @@ -30,7 +28,6 @@ public class RedisPubSubController { return R.ok("操作成功"); } - @Operation(summary = "订阅消息") @GetMapping("/sub") public R sub(@Parameter(name = "通道Key") String key) { RedisUtils.subscribe(key, String.class, msg -> { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java index 80cf07325..abb59ace9 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java @@ -3,7 +3,6 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.annotation.RateLimiter; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.LimitType; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; @@ -26,7 +25,6 @@ public class RedisRateLimiterController { * 测试全局限流 * 全局影响 */ - @Operation(summary = "测试全局限流") @RateLimiter(count = 2, time = 10) @GetMapping("/test") public R test(String value) { @@ -37,7 +35,6 @@ public class RedisRateLimiterController { * 测试请求IP限流 * 同一IP请求受影响 */ - @Operation(summary = "测试请求IP限流") @RateLimiter(count = 2, time = 10, limitType = LimitType.IP) @GetMapping("/testip") public R testip(String value) { @@ -48,7 +45,6 @@ public class RedisRateLimiterController { * 测试集群实例限流 * 启动两个后端服务互不影响 */ - @Operation(summary = "测试集群实例限流") @RateLimiter(count = 2, time = 10, limitType = LimitType.CLUSTER) @GetMapping("/testcluster") public R testcluster(String value) { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java index c9e51b1ff..a9c806174 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java @@ -4,7 +4,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.sms.config.properties.SmsProperties; import com.ruoyi.sms.core.SmsTemplate; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -34,7 +33,6 @@ public class SmsController { // private final SmsTemplate smsTemplate; // 可以使用spring注入 // private final AliyunSmsTemplate smsTemplate; // 也可以注入某个厂家的模板工具 - @Operation(summary = "发送短信Aliyun") @GetMapping("/sendAliyun") public R sendAliyun(@Parameter(name = "电话号") String phones, @Parameter(name = "模板ID") String templateId) { @@ -51,7 +49,6 @@ public class SmsController { return R.ok(send); } - @Operation(summary = "发送短信Tencent") @GetMapping("/sendTencent") public R sendTencent(@Parameter(name = "电话号") String phones, @Parameter(name = "模板ID") String templateId) { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java index c538e2c9a..af0e104ab 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java @@ -1,7 +1,6 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.core.domain.R; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -26,7 +25,6 @@ public class Swagger3DemoController { * 上传请求 * 必须使用 @RequestPart 注解标注为文件 */ - @Operation(summary = "通用上传请求") @Parameters({ @Parameter(name = "file", description = "文件", in = ParameterIn.QUERY, required = true) }) diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java index 1824ae409..e821eaac6 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java @@ -5,7 +5,6 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.demo.domain.TestDemo; import com.ruoyi.demo.mapper.TestDemoMapper; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.DeleteMapping; @@ -38,7 +37,6 @@ public class TestBatchController extends BaseController { *

* 3.5.0 版本 增加 rewriteBatchedStatements=true 批处理参数 使 MP 原生批处理可以达到同样的速度 */ - @Operation(summary = "新增批量方法") @PostMapping("/add") // @DS("slave") public R add() { @@ -58,7 +56,6 @@ public class TestBatchController extends BaseController { *

* 3.5.0 版本 增加 rewriteBatchedStatements=true 批处理参数 使 MP 原生批处理可以达到同样的速度 */ - @Operation(summary = "新增或更新批量方法") @PostMapping("/addOrUpdate") // @DS("slave") public R addOrUpdate() { @@ -84,7 +81,6 @@ public class TestBatchController extends BaseController { /** * 删除批量方法 */ - @Operation(summary = "删除批量方法") @DeleteMapping() // @DS("slave") public R remove() { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java index d63c31719..50bcbd073 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java @@ -20,7 +20,6 @@ import com.ruoyi.demo.domain.bo.TestDemoBo; import com.ruoyi.demo.domain.bo.TestDemoImportVo; import com.ruoyi.demo.domain.vo.TestDemoVo; import com.ruoyi.demo.service.ITestDemoService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.enums.ParameterIn; @@ -55,7 +54,6 @@ public class TestDemoController extends BaseController { /** * 查询测试单表列表 */ - @Operation(summary = "查询测试单表列表") @SaCheckPermission("demo:demo:list") @GetMapping("/list") public TableDataInfo list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { @@ -65,14 +63,12 @@ public class TestDemoController extends BaseController { /** * 自定义分页查询 */ - @Operation(summary = "自定义分页查询") @SaCheckPermission("demo:demo:list") @GetMapping("/page") public TableDataInfo page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { return iTestDemoService.customPageList(bo, pageQuery); } - @Operation(summary = "导入测试-校验") @Parameters({ @Parameter(name = "file", description = "导入文件", in = ParameterIn.QUERY, required = true), }) @@ -90,7 +86,6 @@ public class TestDemoController extends BaseController { /** * 导出测试单表列表 */ - @Operation(summary = "导出测试单表列表") @SaCheckPermission("demo:demo:export") @Log(title = "测试单表", businessType = BusinessType.EXPORT) @PostMapping("/export") @@ -106,7 +101,6 @@ public class TestDemoController extends BaseController { /** * 获取测试单表详细信息 */ - @Operation(summary = "获取测试单表详细信息") @SaCheckPermission("demo:demo:query") @GetMapping("/{id}") public R getInfo(@Parameter(name = "测试ID") @@ -118,7 +112,6 @@ public class TestDemoController extends BaseController { /** * 新增测试单表 */ - @Operation(summary = "新增测试单表") @SaCheckPermission("demo:demo:add") @Log(title = "测试单表", businessType = BusinessType.INSERT) @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS, message = "{repeat.submit.message}") @@ -133,7 +126,6 @@ public class TestDemoController extends BaseController { /** * 修改测试单表 */ - @Operation(summary = "修改测试单表") @SaCheckPermission("demo:demo:edit") @Log(title = "测试单表", businessType = BusinessType.UPDATE) @RepeatSubmit @@ -145,7 +137,6 @@ public class TestDemoController extends BaseController { /** * 删除测试单表 */ - @Operation(summary = "删除测试单表") @SaCheckPermission("demo:demo:remove") @Log(title = "测试单表", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java index cc67ca46b..b241cc80d 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java @@ -2,7 +2,6 @@ package com.ruoyi.demo.controller; import cn.hutool.core.collection.CollUtil; import com.ruoyi.common.utils.poi.ExcelUtil; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; @@ -29,7 +28,6 @@ public class TestExcelController { /** * 单列表多数据 */ - @Operation(summary = "单列表多数据") @GetMapping("/exportTemplateOne") public void exportTemplateOne(HttpServletResponse response) { Map map = new HashMap<>(); @@ -49,7 +47,6 @@ public class TestExcelController { /** * 多列表多数据 */ - @Operation(summary = "多列表多数据") @GetMapping("/exportTemplateMuliti") public void exportTemplateMuliti(HttpServletResponse response) { Map map = new HashMap<>(); diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java index 6c7686686..a0044630d 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java @@ -2,7 +2,6 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.MessageUtils; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.Data; @@ -33,7 +32,6 @@ public class TestI18nController { *

* 测试使用 user.register.success */ - @Operation(summary = "通过code获取国际化内容") @GetMapping() public R get(@Parameter(name = "国际化code") String code) { return R.ok(MessageUtils.message(code)); @@ -45,7 +43,6 @@ public class TestI18nController { *

* 测试使用 not.null */ - @Operation(summary = "Validator 校验国际化") @GetMapping("/test1") public R test1(@NotBlank(message = "{not.null}") String str) { return R.ok(str); @@ -57,7 +54,6 @@ public class TestI18nController { *

* 测试使用 not.null */ - @Operation(summary = "Bean 校验国际化") @GetMapping("/test2") public R test2(@Validated TestI18nBo bo) { return R.ok(bo); diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java index 54a1913fa..9b7f34aaa 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java @@ -4,7 +4,6 @@ import com.ruoyi.common.annotation.Sensitive; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.SensitiveStrategy; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.Data; import org.springframework.web.bind.annotation.GetMapping; @@ -29,7 +28,6 @@ public class TestSensitiveController extends BaseController { /** * 测试数据脱敏 */ - @Operation(summary = "查询测试单表列表") @GetMapping("/test") public R test() { TestSensitive testSensitive = new TestSensitive(); diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java index 4f0b4af99..c6bad6774 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java @@ -13,7 +13,6 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.demo.domain.bo.TestTreeBo; import com.ruoyi.demo.domain.vo.TestTreeVo; import com.ruoyi.demo.service.ITestTreeService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -44,7 +43,6 @@ public class TestTreeController extends BaseController { /** * 查询测试树表列表 */ - @Operation(summary = "查询测试树表列表") @SaCheckPermission("demo:tree:list") @GetMapping("/list") public R> list(@Validated(QueryGroup.class) TestTreeBo bo) { @@ -55,7 +53,6 @@ public class TestTreeController extends BaseController { /** * 导出测试树表列表 */ - @Operation(summary = "导出测试树表列表") @SaCheckPermission("demo:tree:export") @Log(title = "测试树表", businessType = BusinessType.EXPORT) @GetMapping("/export") @@ -67,7 +64,6 @@ public class TestTreeController extends BaseController { /** * 获取测试树表详细信息 */ - @Operation(summary = "获取测试树表详细信息") @SaCheckPermission("demo:tree:query") @GetMapping("/{id}") public R getInfo(@Parameter(name = "测试树ID") @@ -79,7 +75,6 @@ public class TestTreeController extends BaseController { /** * 新增测试树表 */ - @Operation(summary = "新增测试树表") @SaCheckPermission("demo:tree:add") @Log(title = "测试树表", businessType = BusinessType.INSERT) @RepeatSubmit @@ -91,7 +86,6 @@ public class TestTreeController extends BaseController { /** * 修改测试树表 */ - @Operation(summary = "修改测试树表") @SaCheckPermission("demo:tree:edit") @Log(title = "测试树表", businessType = BusinessType.UPDATE) @RepeatSubmit @@ -103,7 +97,6 @@ public class TestTreeController extends BaseController { /** * 删除测试树表 */ - @Operation(summary = "删除测试树表") @SaCheckPermission("demo:tree:remove") @Log(title = "测试树表", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java index d41f87e28..a940c2ccf 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java @@ -2,7 +2,6 @@ package com.ruoyi.demo.controller.queue; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.redis.QueueUtils; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.RestController; public class BoundedQueueController { - @Operation(summary = "添加队列数据") @GetMapping("/add") public R add(@Parameter(name = "队列名") String queueName, @Parameter(name = "容量") int capacity) { @@ -56,7 +54,6 @@ public class BoundedQueueController { return R.ok("操作成功"); } - @Operation(summary = "删除队列数据") @GetMapping("/remove") public R remove(@Parameter(name = "队列名") String queueName) { String data = "data-" + 5; @@ -68,7 +65,6 @@ public class BoundedQueueController { return R.ok("操作成功"); } - @Operation(summary = "获取队列数据") @GetMapping("/get") public R get(@Parameter(name = "队列名") String queueName) { String data; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java index 5958824a6..0abcc4bea 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java @@ -2,7 +2,6 @@ package com.ruoyi.demo.controller.queue; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.redis.QueueUtils; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -32,7 +31,6 @@ import java.util.concurrent.TimeUnit; @RequestMapping("/demo/queue/delayed") public class DelayedQueueController { - @Operation(summary = "订阅队列") @GetMapping("/subscribe") public R subscribe(@Parameter(name = "队列名") String queueName) { log.info("通道: {} 监听中......", queueName); @@ -44,7 +42,6 @@ public class DelayedQueueController { return R.ok("操作成功"); } - @Operation(summary = "添加队列数据") @GetMapping("/add") public R add(@Parameter(name = "队列名") String queueName, @Parameter(name = "订单号") String orderNum, @@ -55,7 +52,6 @@ public class DelayedQueueController { return R.ok("操作成功"); } - @Operation(summary = "删除队列数据") @GetMapping("/remove") public R remove(@Parameter(name = "队列名") String queueName, @Parameter(name = "订单号") String orderNum) { @@ -67,7 +63,6 @@ public class DelayedQueueController { return R.ok("操作成功"); } - @Operation(summary = "销毁队列") @GetMapping("/destroy") public R destroy(@Parameter(name = "队列名") String queueName) { // 用完了一定要销毁 否则会一直存在 diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java index 6d11e151f..1651631f1 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java @@ -3,7 +3,6 @@ package com.ruoyi.demo.controller.queue; import cn.hutool.core.util.RandomUtil; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.redis.QueueUtils; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/demo/queue/priority") public class PriorityQueueController { - @Operation(summary = "添加队列数据") @GetMapping("/add") public R add(@Parameter(name = "队列名") String queueName) { // 用完了一定要销毁 否则会一直存在 @@ -58,7 +56,6 @@ public class PriorityQueueController { return R.ok("操作成功"); } - @Operation(summary = "删除队列数据") @GetMapping("/remove") public R remove(@Parameter(name = "队列名") String queueName, @Parameter(name = "对象名") String name, @@ -74,7 +71,6 @@ public class PriorityQueueController { return R.ok("操作成功"); } - @Operation(summary = "获取队列数据") @GetMapping("/get") public R get(@Parameter(name = "队列名") String queueName) { PriorityDemo data; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java index e569466bd..54ecae117 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java @@ -3,7 +3,6 @@ package com.ruoyi.demo.domain.bo; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,48 +18,41 @@ import javax.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = true) -@Schema(name = "测试单表业务对象") public class TestDemoBo extends BaseEntity { /** * 主键 */ - @Schema(name = "主键") @NotNull(message = "主键不能为空", groups = {EditGroup.class}) private Long id; /** * 部门id */ - @Schema(name = "部门id") @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long deptId; /** * 用户id */ - @Schema(name = "用户id") @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long userId; /** * 排序号 */ - @Schema(name = "排序号") @NotNull(message = "排序号不能为空", groups = {AddGroup.class, EditGroup.class}) private Integer orderNum; /** * key键 */ - @Schema(name = "key键") @NotBlank(message = "key键不能为空", groups = {AddGroup.class, EditGroup.class}) private String testKey; /** * 值 */ - @Schema(name = "值") @NotBlank(message = "值不能为空", groups = {AddGroup.class, EditGroup.class}) private String value; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java index 269188a5a..8f417fb2e 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java @@ -1,7 +1,6 @@ package com.ruoyi.demo.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -14,13 +13,11 @@ import javax.validation.constraints.NotNull; * @date 2021-07-26 */ @Data -@Schema(name = "测试单表业务对象") public class TestDemoImportVo { /** * 部门id */ - @Schema(name = "部门id") @NotNull(message = "部门id不能为空") @ExcelProperty(value = "部门id") private Long deptId; @@ -28,7 +25,6 @@ public class TestDemoImportVo { /** * 用户id */ - @Schema(name = "用户id") @NotNull(message = "用户id不能为空") @ExcelProperty(value = "用户id") private Long userId; @@ -36,7 +32,6 @@ public class TestDemoImportVo { /** * 排序号 */ - @Schema(name = "排序号") @NotNull(message = "排序号不能为空") @ExcelProperty(value = "排序号") private Long orderNum; @@ -44,7 +39,6 @@ public class TestDemoImportVo { /** * key键 */ - @Schema(name = "key键") @NotBlank(message = "key键不能为空") @ExcelProperty(value = "key键") private String testKey; @@ -52,7 +46,6 @@ public class TestDemoImportVo { /** * 值 */ - @Schema(name = "值") @NotBlank(message = "值不能为空") @ExcelProperty(value = "值") private String value; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java index a4f914388..a51b3fe37 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java @@ -3,7 +3,6 @@ package com.ruoyi.demo.domain.bo; import com.ruoyi.common.core.domain.TreeEntity; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,34 +18,29 @@ import javax.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = true) -@Schema(name = "测试树表业务对象") public class TestTreeBo extends TreeEntity { /** * 主键 */ - @Schema(name = "主键") @NotNull(message = "主键不能为空", groups = {EditGroup.class}) private Long id; /** * 部门id */ - @Schema(name = "部门id") @NotNull(message = "部门id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long deptId; /** * 用户id */ - @Schema(name = "用户id") @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long userId; /** * 树节点名 */ - @Schema(name = "树节点名") @NotBlank(message = "树节点名不能为空", groups = {AddGroup.class, EditGroup.class}) private String treeName; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java index 561d208a5..c4a46edf3 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java @@ -2,7 +2,6 @@ package com.ruoyi.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.Date; @@ -15,7 +14,6 @@ import java.util.Date; * @date 2021-07-26 */ @Data -@Schema(name = "测试单表视图对象") @ExcelIgnoreUnannotated public class TestDemoVo { @@ -25,70 +23,60 @@ public class TestDemoVo { * 主键 */ @ExcelProperty(value = "主键") - @Schema(name = "主键") private Long id; /** * 部门id */ @ExcelProperty(value = "部门id") - @Schema(name = "部门id") private Long deptId; /** * 用户id */ @ExcelProperty(value = "用户id") - @Schema(name = "用户id") private Long userId; /** * 排序号 */ @ExcelProperty(value = "排序号") - @Schema(name = "排序号") private Integer orderNum; /** * key键 */ @ExcelProperty(value = "key键") - @Schema(name = "key键") private String testKey; /** * 值 */ @ExcelProperty(value = "值") - @Schema(name = "值") private String value; /** * 创建时间 */ @ExcelProperty(value = "创建时间") - @Schema(name = "创建时间") private Date createTime; /** * 创建人 */ @ExcelProperty(value = "创建人") - @Schema(name = "创建人") private String createBy; /** * 更新时间 */ @ExcelProperty(value = "更新时间") - @Schema(name = "更新时间") private Date updateTime; /** * 更新人 */ @ExcelProperty(value = "更新人") - @Schema(name = "更新人") private String updateBy; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java index f0eadfcdf..6836c06bb 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java @@ -2,7 +2,6 @@ package com.ruoyi.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.Date; @@ -15,7 +14,6 @@ import java.util.Date; * @date 2021-07-26 */ @Data -@Schema(name = "测试树表视图对象") @ExcelIgnoreUnannotated public class TestTreeVo { @@ -24,42 +22,36 @@ public class TestTreeVo { /** * 主键 */ - @Schema(name = "主键") private Long id; /** * 父id */ @ExcelProperty(value = "父id") - @Schema(name = "父id") private Long parentId; /** * 部门id */ @ExcelProperty(value = "部门id") - @Schema(name = "部门id") private Long deptId; /** * 用户id */ @ExcelProperty(value = "用户id") - @Schema(name = "用户id") private Long userId; /** * 树节点名 */ @ExcelProperty(value = "树节点名") - @Schema(name = "树节点名") private String treeName; /** * 创建时间 */ @ExcelProperty(value = "创建时间") - @Schema(name = "创建时间") private Date createTime; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index d003ca8fe..d8c405e11 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -12,7 +12,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.generator.service.IGenTableService; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -41,7 +40,6 @@ public class GenController extends BaseController { /** * 查询代码生成列表 */ - @Operation(summary = "查询代码生成列表") @SaCheckPermission("tool:gen:list") @GetMapping("/list") public TableDataInfo genList(GenTable genTable, PageQuery pageQuery) { @@ -51,7 +49,6 @@ public class GenController extends BaseController { /** * 修改代码生成业务 */ - @Operation(summary = "修改代码生成业务") @SaCheckPermission("tool:gen:query") @GetMapping(value = "/{tableId}") public R> getInfo(@PathVariable Long tableId) { @@ -68,7 +65,6 @@ public class GenController extends BaseController { /** * 查询数据库列表 */ - @Operation(summary = "查询数据库列表") @SaCheckPermission("tool:gen:list") @GetMapping("/db/list") public TableDataInfo dataList(GenTable genTable, PageQuery pageQuery) { @@ -78,7 +74,6 @@ public class GenController extends BaseController { /** * 查询数据表字段列表 */ - @Operation(summary = "查询数据表字段列表") @SaCheckPermission("tool:gen:list") @GetMapping(value = "/column/{tableId}") public TableDataInfo columnList(Long tableId) { @@ -92,7 +87,6 @@ public class GenController extends BaseController { /** * 导入表结构(保存) */ - @Operation(summary = "导入表结构(保存)") @SaCheckPermission("tool:gen:import") @Log(title = "代码生成", businessType = BusinessType.IMPORT) @PostMapping("/importTable") @@ -107,7 +101,6 @@ public class GenController extends BaseController { /** * 修改保存代码生成业务 */ - @Operation(summary = "修改保存代码生成业务") @SaCheckPermission("tool:gen:edit") @Log(title = "代码生成", businessType = BusinessType.UPDATE) @PutMapping @@ -120,7 +113,6 @@ public class GenController extends BaseController { /** * 删除代码生成 */ - @Operation(summary = "删除代码生成") @SaCheckPermission("tool:gen:remove") @Log(title = "代码生成", businessType = BusinessType.DELETE) @DeleteMapping("/{tableIds}") @@ -132,7 +124,6 @@ public class GenController extends BaseController { /** * 预览代码 */ - @Operation(summary = "预览代码") @SaCheckPermission("tool:gen:preview") @GetMapping("/preview/{tableId}") public R> preview(@PathVariable("tableId") Long tableId) throws IOException { @@ -143,7 +134,6 @@ public class GenController extends BaseController { /** * 生成代码(下载方式) */ - @Operation(summary = "生成代码(下载方式)") @SaCheckPermission("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/download/{tableName}") @@ -155,7 +145,6 @@ public class GenController extends BaseController { /** * 生成代码(自定义路径) */ - @Operation(summary = "生成代码(自定义路径)") @SaCheckPermission("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/genCode/{tableName}") @@ -167,7 +156,6 @@ public class GenController extends BaseController { /** * 同步数据库 */ - @Operation(summary = "同步数据库") @SaCheckPermission("tool:gen:edit") @Log(title = "代码生成", businessType = BusinessType.UPDATE) @GetMapping("/synchDb/{tableName}") @@ -179,7 +167,6 @@ public class GenController extends BaseController { /** * 批量生成代码 */ - @Operation(summary = "批量生成代码") @SaCheckPermission("tool:gen:code") @Log(title = "代码生成", businessType = BusinessType.GENCODE) @GetMapping("/batchGenCode") diff --git a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm index 0d0af368b..fab95ca68 100644 --- a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/bo.java.vm @@ -33,7 +33,6 @@ import com.ruoyi.common.core.domain.TreeEntity; @Data @EqualsAndHashCode(callSuper = true) -@Schema(name = "${functionName}业务对象") public class ${ClassName}Bo extends ${Entity} { #foreach ($column in $columns) @@ -49,14 +48,12 @@ public class ${ClassName}Bo extends ${Entity} { #set($Group="EditGroup.class") #end #if($column.isRequired == 1) - @Schema(name = "$column.columnComment", required = true) #if($column.javaType == 'String') @NotBlank(message = "$column.columnComment不能为空", groups = { $Group }) #else @NotNull(message = "$column.columnComment不能为空", groups = { $Group }) #end #else - @Schema(name = "$column.columnComment") #end private $column.javaType $column.javaField; diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm index 9ea772fc3..5b307640b 100644 --- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm @@ -27,7 +27,6 @@ import ${packageName}.service.I${ClassName}Service; import com.ruoyi.common.core.page.TableDataInfo; #elseif($table.tree) #end -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; /** @@ -48,7 +47,6 @@ public class ${ClassName}Controller extends BaseController { /** * 查询${functionName}列表 */ - @Operation(summary = "查询${functionName}列表") @SaCheckPermission("${permissionPrefix}:list") @GetMapping("/list") #if($table.crud || $table.sub) @@ -65,7 +63,6 @@ public class ${ClassName}Controller extends BaseController { /** * 导出${functionName}列表 */ - @Operation(summary = "导出${functionName}列表") @SaCheckPermission("${permissionPrefix}:export") @Log(title = "${functionName}", businessType = BusinessType.EXPORT) @PostMapping("/export") @@ -77,7 +74,6 @@ public class ${ClassName}Controller extends BaseController { /** * 获取${functionName}详细信息 */ - @Operation(summary = "获取${functionName}详细信息") @SaCheckPermission("${permissionPrefix}:query") @GetMapping("/{${pkColumn.javaField}}") public R<${ClassName}Vo> getInfo(@Parameter(name = "主键") @@ -89,7 +85,6 @@ public class ${ClassName}Controller extends BaseController { /** * 新增${functionName} */ - @Operation(summary = "新增${functionName}") @SaCheckPermission("${permissionPrefix}:add") @Log(title = "${functionName}", businessType = BusinessType.INSERT) @RepeatSubmit() @@ -101,7 +96,6 @@ public class ${ClassName}Controller extends BaseController { /** * 修改${functionName} */ - @Operation(summary = "修改${functionName}") @SaCheckPermission("${permissionPrefix}:edit") @Log(title = "${functionName}", businessType = BusinessType.UPDATE) @RepeatSubmit() @@ -113,7 +107,6 @@ public class ${ClassName}Controller extends BaseController { /** * 删除${functionName} */ - @Operation(summary = "删除${functionName}") @SaCheckPermission("${permissionPrefix}:remove") @Log(title = "${functionName}", businessType = BusinessType.DELETE) @DeleteMapping("/{${pkColumn.javaField}s}") diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm index 1fc974d20..c6d8b2462 100644 --- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm @@ -21,7 +21,6 @@ import java.util.Date; * @date ${datetime} */ @Data -@Schema(name = "${functionName}视图对象") @ExcelIgnoreUnannotated public class ${ClassName}Vo { @@ -47,7 +46,6 @@ public class ${ClassName}Vo { #else @ExcelProperty(value = "${comment}") #end - @Schema(name = "$column.columnComment") private $column.javaType $column.javaField; #end diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java index b42eb3dc4..974019dd9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java @@ -1,7 +1,6 @@ package com.ruoyi.system.domain; import com.ruoyi.common.utils.StringUtils; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,31 +11,26 @@ import lombok.NoArgsConstructor; */ @Data @NoArgsConstructor -@Schema(name = "缓存信息") public class SysCache { /** * 缓存名称 */ - @Schema(name = "缓存名称") private String cacheName = ""; /** * 缓存键名 */ - @Schema(name = "缓存键名") private String cacheKey = ""; /** * 缓存内容 */ - @Schema(name = "缓存内容") private String cacheValue = ""; /** * 备注 */ - @Schema(name = "备注") private String remark = ""; public SysCache(String cacheName, String remark) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index 946255710..40bc2821d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,13 +23,11 @@ import javax.validation.constraints.Size; @EqualsAndHashCode(callSuper = true) @TableName("sys_config") @ExcelIgnoreUnannotated -@Schema(name = "参数配置业务对象") public class SysConfig extends BaseEntity { /** * 参数主键 */ - @Schema(name = "参数主键") @ExcelProperty(value = "参数主键") @TableId(value = "config_id") private Long configId; @@ -38,7 +35,6 @@ public class SysConfig extends BaseEntity { /** * 参数名称 */ - @Schema(name = "参数名称") @ExcelProperty(value = "参数名称") @NotBlank(message = "参数名称不能为空") @Size(min = 0, max = 100, message = "参数名称不能超过100个字符") @@ -47,7 +43,6 @@ public class SysConfig extends BaseEntity { /** * 参数键名 */ - @Schema(name = "参数键名") @ExcelProperty(value = "参数键名") @NotBlank(message = "参数键名长度不能为空") @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") @@ -56,7 +51,6 @@ public class SysConfig extends BaseEntity { /** * 参数键值 */ - @Schema(name = "参数键值") @ExcelProperty(value = "参数键值") @NotBlank(message = "参数键值不能为空") @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符") @@ -65,7 +59,6 @@ public class SysConfig extends BaseEntity { /** * 系统内置(Y是 N否) */ - @Schema(name = "系统内置(Y是 N否)") @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_yes_no") private String configType; @@ -73,7 +66,6 @@ public class SysConfig extends BaseEntity { /** * 备注 */ - @Schema(name = "备注") private String remark; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index d87800612..f95b332e7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -24,14 +23,12 @@ import java.util.Map; @Data @TableName("sys_logininfor") @ExcelIgnoreUnannotated -@Schema(name = "系统访问记录业务对象") public class SysLogininfor implements Serializable { private static final long serialVersionUID = 1L; /** * ID */ - @Schema(name = "访问ID") @ExcelProperty(value = "序号") @TableId(value = "info_id") private Long infoId; @@ -39,14 +36,12 @@ public class SysLogininfor implements Serializable { /** * 用户账号 */ - @Schema(name = "用户账号") @ExcelProperty(value = "用户账号") private String userName; /** * 登录状态 0成功 1失败 */ - @Schema(name = "登录状态 0成功 1失败") @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_common_status") private String status; @@ -54,49 +49,42 @@ public class SysLogininfor implements Serializable { /** * 登录IP地址 */ - @Schema(name = "登录IP地址") @ExcelProperty(value = "登录地址") private String ipaddr; /** * 登录地点 */ - @Schema(name = "登录地点") @ExcelProperty(value = "登录地点") private String loginLocation; /** * 浏览器类型 */ - @Schema(name = "浏览器类型") @ExcelProperty(value = "浏览器") private String browser; /** * 操作系统 */ - @Schema(name = "操作系统") @ExcelProperty(value = "操作系统") private String os; /** * 提示消息 */ - @Schema(name = "提示消息") @ExcelProperty(value = "提示消息") private String msg; /** * 访问时间 */ - @Schema(name = "访问时间") @ExcelProperty(value = "访问时间") private Date loginTime; /** * 请求参数 */ - @Schema(name = "请求参数") @TableField(exist = false) private Map params = new HashMap<>(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 36177c82e..f9457406a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.xss.Xss; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,7 +24,6 @@ public class SysNotice extends BaseEntity { /** * 公告ID */ - @Schema(name = "公告ID") @TableId(value = "notice_id") private Long noticeId; @@ -33,7 +31,6 @@ public class SysNotice extends BaseEntity { * 公告标题 */ @Xss(message = "公告标题不能包含脚本字符") - @Schema(name = "公告标题") @NotBlank(message = "公告标题不能为空") @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") private String noticeTitle; @@ -41,25 +38,21 @@ public class SysNotice extends BaseEntity { /** * 公告类型(1通知 2公告) */ - @Schema(name = "公告类型(1通知 2公告)") private String noticeType; /** * 公告内容 */ - @Schema(name = "公告内容") private String noticeContent; /** * 公告状态(0正常 1关闭) */ - @Schema(name = "公告状态(0正常 1关闭)") private String status; /** * 备注 */ - @Schema(name = "备注") private String remark; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index ebb3a4b7c..84af07b91 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -24,7 +23,6 @@ import java.util.Map; @Data @TableName("sys_oper_log") @ExcelIgnoreUnannotated -@Schema(name = "操作日志记录业务对象") public class SysOperLog implements Serializable { private static final long serialVersionUID = 1L; @@ -32,7 +30,6 @@ public class SysOperLog implements Serializable { /** * 日志主键 */ - @Schema(name = "日志主键") @ExcelProperty(value = "日志主键") @TableId(value = "oper_id") private Long operId; @@ -40,14 +37,12 @@ public class SysOperLog implements Serializable { /** * 操作模块 */ - @Schema(name = "操作模块") @ExcelProperty(value = "操作模块") private String title; /** * 业务类型(0其它 1新增 2修改 3删除) */ - @Schema(name = "业务类型(0其它 1新增 2修改 3删除)") @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_oper_type") private Integer businessType; @@ -55,28 +50,24 @@ public class SysOperLog implements Serializable { /** * 业务类型数组 */ - @Schema(name = "业务类型数组") @TableField(exist = false) private Integer[] businessTypes; /** * 请求方法 */ - @Schema(name = "请求方法") @ExcelProperty(value = "请求方法") private String method; /** * 请求方式 */ - @Schema(name = "请求方式") @ExcelProperty(value = "请求方式") private String requestMethod; /** * 操作类别(0其它 1后台用户 2手机端用户) */ - @Schema(name = "操作类别(0其它 1后台用户 2手机端用户)") @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class) @ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户") private Integer operatorType; @@ -84,56 +75,48 @@ public class SysOperLog implements Serializable { /** * 操作人员 */ - @Schema(name = "操作人员") @ExcelProperty(value = "操作人员") private String operName; /** * 部门名称 */ - @Schema(name = "部门名称") @ExcelProperty(value = "部门名称") private String deptName; /** * 请求url */ - @Schema(name = "请求url") @ExcelProperty(value = "请求地址") private String operUrl; /** * 操作地址 */ - @Schema(name = "操作地址") @ExcelProperty(value = "操作地址") private String operIp; /** * 操作地点 */ - @Schema(name = "操作地点") @ExcelProperty(value = "操作地点") private String operLocation; /** * 请求参数 */ - @Schema(name = "请求参数") @ExcelProperty(value = "请求参数") private String operParam; /** * 返回参数 */ - @Schema(name = "返回参数") @ExcelProperty(value = "返回参数") private String jsonResult; /** * 操作状态(0正常 1异常) */ - @Schema(name = "操作状态(0正常 1异常)") @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_common_status") private Integer status; @@ -141,21 +124,18 @@ public class SysOperLog implements Serializable { /** * 错误消息 */ - @Schema(name = "错误消息") @ExcelProperty(value = "错误消息") private String errorMsg; /** * 操作时间 */ - @Schema(name = "操作时间") @ExcelProperty(value = "操作时间") private Date operTime; /** * 请求参数 */ - @Schema(name = "请求参数") @TableField(exist = false) private Map params = new HashMap<>(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index f479a881d..2fde8fcdb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -26,13 +25,11 @@ import javax.validation.constraints.Size; @EqualsAndHashCode(callSuper = true) @TableName("sys_post") @ExcelIgnoreUnannotated -@Schema(name = "岗位信息业务对象") public class SysPost extends BaseEntity { /** * 岗位序号 */ - @Schema(name = "岗位序号") @ExcelProperty(value = "岗位序号") @TableId(value = "post_id") private Long postId; @@ -40,7 +37,6 @@ public class SysPost extends BaseEntity { /** * 岗位编码 */ - @Schema(name = "岗位编码") @ExcelProperty(value = "岗位编码") @NotBlank(message = "岗位编码不能为空") @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") @@ -49,7 +45,6 @@ public class SysPost extends BaseEntity { /** * 岗位名称 */ - @Schema(name = "岗位名称") @ExcelProperty(value = "岗位名称") @NotBlank(message = "岗位名称不能为空") @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") @@ -58,7 +53,6 @@ public class SysPost extends BaseEntity { /** * 岗位排序 */ - @Schema(name = "岗位排序") @ExcelProperty(value = "岗位排序") @NotNull(message = "显示顺序不能为空") private Integer postSort; @@ -66,7 +60,6 @@ public class SysPost extends BaseEntity { /** * 状态(0正常 1停用) */ - @Schema(name = "状态(0正常 1停用)") @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) @ExcelDictFormat(dictType = "sys_common_status") private String status; @@ -74,13 +67,11 @@ public class SysPost extends BaseEntity { /** * 备注 */ - @Schema(name = "备注") private String remark; /** * 用户是否存在此岗位标识 默认不存在 */ - @Schema(name = "用户是否存在此岗位标识 默认不存在") @TableField(exist = false) private boolean flag = false; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java index a0497c8a5..38e7048c4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java @@ -3,7 +3,6 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -14,20 +13,17 @@ import lombok.Data; @Data @TableName("sys_role_dept") -@Schema(name = "角色和部门关联") public class SysRoleDept { /** * 角色ID */ @TableId(type = IdType.INPUT) - @Schema(name = "角色ID") private Long roleId; /** * 部门ID */ - @Schema(name = "部门ID") private Long deptId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java index 5c99a0e38..dd359c425 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java @@ -3,7 +3,6 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -14,20 +13,17 @@ import lombok.Data; @Data @TableName("sys_role_menu") -@Schema(name = "角色和菜单关联") public class SysRoleMenu { /** * 角色ID */ @TableId(type = IdType.INPUT) - @Schema(name = "角色ID") private Long roleId; /** * 菜单ID */ - @Schema(name = "角色ID") private Long menuId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java index 4473d3b18..e8fa5bffa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java @@ -1,6 +1,5 @@ package com.ruoyi.system.domain; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -10,55 +9,46 @@ import lombok.Data; */ @Data -@Schema(name = "当前在线会话业务对象") public class SysUserOnline { /** * 会话编号 */ - @Schema(name = "会话编号") private String tokenId; /** * 部门名称 */ - @Schema(name = "部门名称") private String deptName; /** * 用户名称 */ - @Schema(name = "用户名称") private String userName; /** * 登录IP地址 */ - @Schema(name = "登录IP地址") private String ipaddr; /** * 登录地址 */ - @Schema(name = "登录地址") private String loginLocation; /** * 浏览器类型 */ - @Schema(name = "浏览器类型") private String browser; /** * 操作系统 */ - @Schema(name = "操作系统") private String os; /** * 登录时间 */ - @Schema(name = "登录时间") private Long loginTime; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java index 6a5f43c5e..a6980557c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java @@ -3,7 +3,6 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -14,20 +13,17 @@ import lombok.Data; @Data @TableName("sys_user_post") -@Schema(name = "用户和岗位关联") public class SysUserPost { /** * 用户ID */ @TableId(type = IdType.INPUT) - @Schema(name = "用户ID") private Long userId; /** * 岗位ID */ - @Schema(name = "岗位ID") private Long postId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java index 4be15f86e..8d3543702 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java @@ -3,7 +3,6 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -14,20 +13,17 @@ import lombok.Data; @Data @TableName("sys_user_role") -@Schema(name = "用户和角色关联") public class SysUserRole { /** * 用户ID */ @TableId(type = IdType.INPUT) - @Schema(name = "用户ID") private Long userId; /** * 角色ID */ - @Schema(name = "角色ID") private Long roleId; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java index bc1d296c5..3f5ab4a8d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java @@ -1,7 +1,6 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,33 +11,27 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -@Schema(name = "OSS对象存储分页查询对象") public class SysOssBo extends BaseEntity { /** * 文件名 */ - @Schema(name = "文件名") private String fileName; /** * 原名 */ - @Schema(name = "原名") private String originalName; /** * 文件后缀名 */ - @Schema(name = "文件后缀名") private String fileSuffix; /** * URL地址 */ - @Schema(name = "URL地址") private String url; /** * 服务商 */ - @Schema(name = "服务商") private String service; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java index b45a37872..e9f481d5e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java @@ -3,7 +3,6 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -21,20 +20,17 @@ import javax.validation.constraints.Size; @Data @EqualsAndHashCode(callSuper = true) -@Schema(name = "对象存储配置业务对象") public class SysOssConfigBo extends BaseEntity { /** * 主建 */ - @Schema(name = "主建", required = true) @NotNull(message = "主建不能为空", groups = {EditGroup.class}) private Long ossConfigId; /** * 配置key */ - @Schema(name = "配置key", required = true) @NotBlank(message = "配置key不能为空", groups = {AddGroup.class, EditGroup.class}) @Size(min = 2, max = 100, message = "configKey长度必须介于2和20 之间") private String configKey; @@ -42,7 +38,6 @@ public class SysOssConfigBo extends BaseEntity { /** * accessKey */ - @Schema(name = "accessKey", required = true) @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class}) @Size(min = 2, max = 100, message = "accessKey长度必须介于2和100 之间") private String accessKey; @@ -50,7 +45,6 @@ public class SysOssConfigBo extends BaseEntity { /** * 秘钥 */ - @Schema(name = "secretKey", required = true) @NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class}) @Size(min = 2, max = 100, message = "secretKey长度必须介于2和100 之间") private String secretKey; @@ -58,7 +52,6 @@ public class SysOssConfigBo extends BaseEntity { /** * 桶名称 */ - @Schema(name = "桶名称", required = true) @NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class}) @Size(min = 2, max = 100, message = "bucketName长度必须介于2和100之间") private String bucketName; @@ -66,13 +59,11 @@ public class SysOssConfigBo extends BaseEntity { /** * 前缀 */ - @Schema(name = "前缀") private String prefix; /** * 访问站点 */ - @Schema(name = "访问站点", required = true) @NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class}) @Size(min = 2, max = 100, message = "endpoint长度必须介于2和100之间") private String endpoint; @@ -80,37 +71,31 @@ public class SysOssConfigBo extends BaseEntity { /** * 自定义域名 */ - @Schema(name = "自定义域名") private String domain; /** * 是否https(Y=是,N=否) */ - @Schema(name = "是否https(Y=是,N=否)") private String isHttps; /** * 状态(0=正常,1=停用) */ - @Schema(name = "状态(0=正常,1=停用)") private String status; /** * 域 */ - @Schema(name = "域") private String region; /** * 扩展字段 */ - @Schema(name = "扩展字段") private String ext1; /** * 备注 */ - @Schema(name = "备注") private String remark; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java index 3b864daf5..ec1f02e19 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java @@ -1,7 +1,6 @@ package com.ruoyi.system.domain.vo; import com.ruoyi.common.utils.StringUtils; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; /** @@ -11,31 +10,26 @@ import lombok.Data; */ @Data -@Schema(name = "路由显示信息") public class MetaVo { /** * 设置该路由在侧边栏和面包屑中展示的名字 */ - @Schema(name = "设置该路由在侧边栏和面包屑中展示的名字") private String title; /** * 设置该路由的图标,对应路径src/assets/icons/svg */ - @Schema(name = "设置该路由的图标,对应路径src/assets/icons/svg") private String icon; /** * 设置为true,则不会被 缓存 */ - @Schema(name = "设置为true,则不会被 缓存") private boolean noCache; /** * 内链地址(http(s)://开头) */ - @Schema(name = "内链地址(http(s)://开头)") private String link; public MetaVo(String title, String icon) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java index 7f961a7be..8351f7c34 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java @@ -1,7 +1,6 @@ package com.ruoyi.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @@ -13,61 +12,51 @@ import java.util.List; */ @Data @JsonInclude(JsonInclude.Include.NON_EMPTY) -@Schema(name = "路由配置信息") public class RouterVo { /** * 路由名字 */ - @Schema(name = "路由名字") private String name; /** * 路由地址 */ - @Schema(name = "路由地址") private String path; /** * 是否隐藏路由,当设置 true 的时候该路由不会再侧边栏出现 */ - @Schema(name = "是否隐藏路由,当设置 true 的时候该路由不会再侧边栏出现") private boolean hidden; /** * 重定向地址,当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 */ - @Schema(name = "重定向地址,当设置 noRedirect 的时候该路由在面包屑导航中不可被点击") private String redirect; /** * 组件地址 */ - @Schema(name = "组件地址") private String component; /** * 路由参数:如 {"id": 1, "name": "ry"} */ - @Schema(name = "路由参数:如 {\"id\": 1, \"name\": \"ry\"}") private String query; /** * 当你一个路由下面的 children 声明的路由大于1个时,自动会变成嵌套的模式--如组件页面 */ - @Schema(name = "当你一个路由下面的 children 声明的路由大于1个时,自动会变成嵌套的模式--如组件页面") private Boolean alwaysShow; /** * 其他元素 */ - @Schema(name = "其他元素") private MetaVo meta; /** * 子路由 */ - @Schema(name = "子路由") private List children; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java index 833dc3b93..f8b31d6b5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java @@ -1,7 +1,6 @@ package com.ruoyi.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -13,7 +12,6 @@ import lombok.Data; * @date 2021-08-13 */ @Data -@Schema(name = "对象存储配置视图对象") @ExcelIgnoreUnannotated public class SysOssConfigVo { @@ -22,79 +20,66 @@ public class SysOssConfigVo { /** * 主建 */ - @Schema(name = "主建") private Long ossConfigId; /** * 配置key */ - @Schema(name = "配置key") private String configKey; /** * accessKey */ - @Schema(name = "accessKey") private String accessKey; /** * 秘钥 */ - @Schema(name = "secretKey") private String secretKey; /** * 桶名称 */ - @Schema(name = "桶名称") private String bucketName; /** * 前缀 */ - @Schema(name = "前缀") private String prefix; /** * 访问站点 */ - @Schema(name = "访问站点") private String endpoint; /** * 自定义域名 */ - @Schema(name = "自定义域名") private String domain; /** * 是否https(Y=是,N=否) */ - @Schema(name = "是否https(Y=是,N=否)") private String isHttps; /** * 域 */ - @Schema(name = "域") private String region; /** * 状态(0=正常,1=停用) */ - @Schema(name = "状态(0=正常,1=停用)") private String status; /** * 扩展字段 */ - @Schema(name = "扩展字段") private String ext1; /** * 备注 */ - @Schema(name = "备注") private String remark; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java index b0b8da34c..53f5f8de8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java @@ -1,6 +1,5 @@ package com.ruoyi.system.domain.vo; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.Date; @@ -11,7 +10,6 @@ import java.util.Date; * @author Lion Li */ @Data -@Schema(name = "OSS对象存储视图对象") public class SysOssVo { private static final long serialVersionUID = 1L; @@ -19,49 +17,41 @@ public class SysOssVo { /** * 对象存储主键 */ - @Schema(name = "对象存储主键") private Long ossId; /** * 文件名 */ - @Schema(name = "文件名") private String fileName; /** * 原名 */ - @Schema(name = "原名") private String originalName; /** * 文件后缀名 */ - @Schema(name = "文件后缀名") private String fileSuffix; /** * URL地址 */ - @Schema(name = "URL地址") private String url; /** * 创建时间 */ - @Schema(name = "创建时间") private Date createTime; /** * 上传人 */ - @Schema(name = "上传人") private String createBy; /** * 服务商 */ - @Schema(name = "服务商") private String service;