Commit 117914d92b7398b6508d67c1b6f3db898765d7b8
1 parent
06887bff
多模块重构 4:system 模块的创建,去除 Sys
Showing
352 changed files
with
3966 additions
and
3983 deletions
Too many changes.
To preserve performance only 100 of 352 files are displayed.
http-client.env.json
| 1 | { | 1 | { |
| 2 | "local": { | 2 | "local": { |
| 3 | - "baseUrl": "http://127.0.0.1:48080/api", | 3 | + "baseUrl": "http://127.0.0.1:48080/admin-api", |
| 4 | "token": "test1", | 4 | "token": "test1", |
| 5 | + "adminTenentId": "1", | ||
| 5 | 6 | ||
| 6 | "userApi": "http://127.0.0.1:48080/app-api", | 7 | "userApi": "http://127.0.0.1:48080/app-api", |
| 7 | - "userToken": "test1", | ||
| 8 | - "userTenentId": "1" | 8 | + "appToken": "test1", |
| 9 | + "appTenentId": "1" | ||
| 9 | } | 10 | } |
| 10 | } | 11 | } |
yudao-admin-server/src/main/resources/application.yaml
| @@ -54,11 +54,11 @@ yudao: | @@ -54,11 +54,11 @@ yudao: | ||
| 54 | base-package: cn.iocoder.yudao.coreservice | 54 | base-package: cn.iocoder.yudao.coreservice |
| 55 | web: | 55 | web: |
| 56 | admin-api: | 56 | admin-api: |
| 57 | - prefix: /api | ||
| 58 | - controller: ${yudao.info.base-package} | 57 | + prefix: /admin-api |
| 58 | + controller: cn.iocoder.yudao.module.system.controller.admin # TODO 芋艿:需要改造 | ||
| 59 | app-api: | 59 | app-api: |
| 60 | prefix: /app-api | 60 | prefix: /app-api |
| 61 | - controller: cn.iocoder.yudao.module.member.controller.app | 61 | + controller: cn.iocoder.yudao.module.member.controller.app # TODO 芋艿:需要改造 |
| 62 | 62 | ||
| 63 | swagger: | 63 | swagger: |
| 64 | title: 管理后台 | 64 | title: 管理后台 |
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
| @@ -123,12 +123,13 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap | @@ -123,12 +123,13 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap | ||
| 123 | .accessDeniedHandler(accessDeniedHandler).and() | 123 | .accessDeniedHandler(accessDeniedHandler).and() |
| 124 | // 登出地址的配置 | 124 | // 登出地址的配置 |
| 125 | .logout().logoutSuccessHandler(logoutSuccessHandler).logoutRequestMatcher(request -> // 匹配多种用户类型的登出 | 125 | .logout().logoutSuccessHandler(logoutSuccessHandler).logoutRequestMatcher(request -> // 匹配多种用户类型的登出 |
| 126 | - StrUtil.equalsAny(request.getRequestURI(), buildAdminApi("/logout"), buildAppApi("/member/logout"))); | 126 | + StrUtil.equalsAny(request.getRequestURI(), buildAdminApi("/system/logout"), |
| 127 | + buildAppApi("/member/logout"))); | ||
| 127 | 128 | ||
| 128 | // 设置每个请求的权限 ①:全局共享规则 | 129 | // 设置每个请求的权限 ①:全局共享规则 |
| 129 | httpSecurity.authorizeRequests() | 130 | httpSecurity.authorizeRequests() |
| 130 | // 登录的接口,可匿名访问 | 131 | // 登录的接口,可匿名访问 |
| 131 | - .antMatchers(buildAdminApi("/login")).anonymous() | 132 | + .antMatchers(buildAdminApi("/system/login"), buildAdminApi("/member/login")).anonymous() |
| 132 | // 静态资源,可匿名访问 | 133 | // 静态资源,可匿名访问 |
| 133 | .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll() | 134 | .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll() |
| 134 | // 文件的获取接口,可匿名访问 | 135 | // 文件的获取接口,可匿名访问 |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/AppAuthController.http
| 1 | ### 请求 /login 接口 => 成功 | 1 | ### 请求 /login 接口 => 成功 |
| 2 | -POST {{userApi}}/member/login | 2 | +POST {{appApi}}/member/login |
| 3 | Content-Type: application/json | 3 | Content-Type: application/json |
| 4 | -tenant-id: {{userTenentId}} | 4 | +tenant-id: {{appTenentId}} |
| 5 | 5 | ||
| 6 | { | 6 | { |
| 7 | "mobile": "15601691300", | 7 | "mobile": "15601691300", |
| @@ -9,9 +9,9 @@ tenant-id: {{userTenentId}} | @@ -9,9 +9,9 @@ tenant-id: {{userTenentId}} | ||
| 9 | } | 9 | } |
| 10 | 10 | ||
| 11 | ### 请求 /send-sms-code 接口 => 成功 | 11 | ### 请求 /send-sms-code 接口 => 成功 |
| 12 | -POST {{userApi}}/member/send-sms-code | 12 | +POST {{appApi}}/member/send-sms-code |
| 13 | Content-Type: application/json | 13 | Content-Type: application/json |
| 14 | -tenant-id: {{userTenentId}} | 14 | +tenant-id: {{appTenentId}} |
| 15 | 15 | ||
| 16 | { | 16 | { |
| 17 | "mobile": "15601691399", | 17 | "mobile": "15601691399", |
| @@ -19,9 +19,9 @@ tenant-id: {{userTenentId}} | @@ -19,9 +19,9 @@ tenant-id: {{userTenentId}} | ||
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | ### 请求 /sms-login 接口 => 成功 | 21 | ### 请求 /sms-login 接口 => 成功 |
| 22 | -POST {{userApi}}/member/sms-login | 22 | +POST {{appApi}}/member/sms-login |
| 23 | Content-Type: application/json | 23 | Content-Type: application/json |
| 24 | -tenant-id: {{userTenentId}} | 24 | +tenant-id: {{appTenentId}} |
| 25 | 25 | ||
| 26 | { | 26 | { |
| 27 | "mobile": "15601691301", | 27 | "mobile": "15601691301", |
| @@ -29,7 +29,7 @@ tenant-id: {{userTenentId}} | @@ -29,7 +29,7 @@ tenant-id: {{userTenentId}} | ||
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | ### 请求 /logout 接口 => 成功 | 31 | ### 请求 /logout 接口 => 成功 |
| 32 | -POST {{userApi}}/member/logout | 32 | +POST {{appApi}}/member/logout |
| 33 | Content-Type: application/json | 33 | Content-Type: application/json |
| 34 | Authorization: Bearer c1b76bdaf2c146c581caa4d7fd81ee66 | 34 | Authorization: Bearer c1b76bdaf2c146c581caa4d7fd81ee66 |
| 35 | -tenant-id: {{userTenentId}} | 35 | +tenant-id: {{appTenentId}} |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/AppAuthController.java
| @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiImplicitParam; | @@ -14,6 +14,7 @@ import io.swagger.annotations.ApiImplicitParam; | ||
| 14 | import io.swagger.annotations.ApiImplicitParams; | 14 | import io.swagger.annotations.ApiImplicitParams; |
| 15 | import io.swagger.annotations.ApiOperation; | 15 | import io.swagger.annotations.ApiOperation; |
| 16 | import lombok.extern.slf4j.Slf4j; | 16 | import lombok.extern.slf4j.Slf4j; |
| 17 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 17 | import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; | 18 | import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; |
| 18 | import org.springframework.validation.annotation.Validated; | 19 | import org.springframework.validation.annotation.Validated; |
| 19 | import org.springframework.web.bind.annotation.*; | 20 | import org.springframework.web.bind.annotation.*; |
| @@ -26,14 +27,15 @@ import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getCli | @@ -26,14 +27,15 @@ import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getCli | ||
| 26 | import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getUserAgent; | 27 | import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getUserAgent; |
| 27 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | 28 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 28 | 29 | ||
| 29 | -@Api(tags = "APP 端 - 认证") | 30 | +@Api(tags = "用户 APP - 认证") |
| 30 | @RestController | 31 | @RestController |
| 31 | @RequestMapping("/member/") | 32 | @RequestMapping("/member/") |
| 32 | @Validated | 33 | @Validated |
| 33 | @Slf4j | 34 | @Slf4j |
| 34 | public class AppAuthController { | 35 | public class AppAuthController { |
| 35 | 36 | ||
| 36 | - @Resource | 37 | + @Autowired |
| 38 | + @SuppressWarnings("SpringJavaAutowiredFieldsWarningInspection") // AuthService 存在重名 | ||
| 37 | private AuthService authService; | 39 | private AuthService authService; |
| 38 | 40 | ||
| 39 | @Resource | 41 | @Resource |
| @@ -41,9 +43,6 @@ public class AppAuthController { | @@ -41,9 +43,6 @@ public class AppAuthController { | ||
| 41 | @Resource | 43 | @Resource |
| 42 | private SysSocialCoreService socialService; | 44 | private SysSocialCoreService socialService; |
| 43 | 45 | ||
| 44 | - @Resource | ||
| 45 | - private LogoutSuccessHandler logoutSuccessHandler; | ||
| 46 | - | ||
| 47 | @PostMapping("/login") | 46 | @PostMapping("/login") |
| 48 | @ApiOperation("使用手机 + 密码登录") | 47 | @ApiOperation("使用手机 + 密码登录") |
| 49 | @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 | 48 | @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthCheckCodeReqVO.java
| @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; | @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; | ||
| 16 | import javax.validation.constraints.Pattern; | 16 | import javax.validation.constraints.Pattern; |
| 17 | 17 | ||
| 18 | // TODO 芋艿:code review 相关逻辑 | 18 | // TODO 芋艿:code review 相关逻辑 |
| 19 | -@ApiModel("APP 端 - 校验验证码 Request VO") | 19 | +@ApiModel("用户 APP - 校验验证码 Request VO") |
| 20 | @Data | 20 | @Data |
| 21 | @NoArgsConstructor | 21 | @NoArgsConstructor |
| 22 | @AllArgsConstructor | 22 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthLoginReqVO.java
| @@ -11,7 +11,7 @@ import org.hibernate.validator.constraints.Length; | @@ -11,7 +11,7 @@ import org.hibernate.validator.constraints.Length; | ||
| 11 | 11 | ||
| 12 | import javax.validation.constraints.NotEmpty; | 12 | import javax.validation.constraints.NotEmpty; |
| 13 | 13 | ||
| 14 | -@ApiModel("APP 端 - 手机 + 密码登录 Request VO") | 14 | +@ApiModel("用户 APP - 手机 + 密码登录 Request VO") |
| 15 | @Data | 15 | @Data |
| 16 | @NoArgsConstructor | 16 | @NoArgsConstructor |
| 17 | @AllArgsConstructor | 17 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthLoginRespVO.java
| @@ -7,7 +7,7 @@ import lombok.Builder; | @@ -7,7 +7,7 @@ import lombok.Builder; | ||
| 7 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | import lombok.NoArgsConstructor; | 8 | import lombok.NoArgsConstructor; |
| 9 | 9 | ||
| 10 | -@ApiModel("APP 端 - 手机密码登录 Response VO") | 10 | +@ApiModel("用户 APP - 手机密码登录 Response VO") |
| 11 | @Data | 11 | @Data |
| 12 | @NoArgsConstructor | 12 | @NoArgsConstructor |
| 13 | @AllArgsConstructor | 13 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthResetPasswordReqVO.java
| @@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty; | @@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty; | ||
| 14 | import javax.validation.constraints.Pattern; | 14 | import javax.validation.constraints.Pattern; |
| 15 | 15 | ||
| 16 | // TODO 芋艿:code review 相关逻辑 | 16 | // TODO 芋艿:code review 相关逻辑 |
| 17 | -@ApiModel("APP 端 - 重置密码 Request VO") | 17 | +@ApiModel("用户 APP - 重置密码 Request VO") |
| 18 | @Data | 18 | @Data |
| 19 | @NoArgsConstructor | 19 | @NoArgsConstructor |
| 20 | @AllArgsConstructor | 20 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSendSmsReqVO.java
| @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; | @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; | ||
| 10 | 10 | ||
| 11 | import javax.validation.constraints.NotNull; | 11 | import javax.validation.constraints.NotNull; |
| 12 | 12 | ||
| 13 | -@ApiModel("APP 端 - 发送手机验证码 Response VO") | 13 | +@ApiModel("用户 APP - 发送手机验证码 Response VO") |
| 14 | @Data | 14 | @Data |
| 15 | @Accessors(chain = true) | 15 | @Accessors(chain = true) |
| 16 | public class AppAuthSendSmsReqVO { | 16 | public class AppAuthSendSmsReqVO { |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java
| @@ -12,7 +12,7 @@ import org.hibernate.validator.constraints.Length; | @@ -12,7 +12,7 @@ import org.hibernate.validator.constraints.Length; | ||
| 12 | import javax.validation.constraints.NotEmpty; | 12 | import javax.validation.constraints.NotEmpty; |
| 13 | import javax.validation.constraints.Pattern; | 13 | import javax.validation.constraints.Pattern; |
| 14 | 14 | ||
| 15 | -@ApiModel("APP 端 - 手机 + 验证码登录 Request VO") | 15 | +@ApiModel("用户 APP - 手机 + 验证码登录 Request VO") |
| 16 | @Data | 16 | @Data |
| 17 | @NoArgsConstructor | 17 | @NoArgsConstructor |
| 18 | @AllArgsConstructor | 18 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSocialBindReqVO.java
| @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; | @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; | ||
| 12 | import javax.validation.constraints.NotEmpty; | 12 | import javax.validation.constraints.NotEmpty; |
| 13 | import javax.validation.constraints.NotNull; | 13 | import javax.validation.constraints.NotNull; |
| 14 | 14 | ||
| 15 | -@ApiModel("APP 端 - 社交绑定 Request VO,使用 code 授权码") | 15 | +@ApiModel("用户 APP - 社交绑定 Request VO,使用 code 授权码") |
| 16 | @Data | 16 | @Data |
| 17 | @NoArgsConstructor | 17 | @NoArgsConstructor |
| 18 | @AllArgsConstructor | 18 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSocialLogin2ReqVO.java
| @@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty; | @@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty; | ||
| 14 | import javax.validation.constraints.NotNull; | 14 | import javax.validation.constraints.NotNull; |
| 15 | import javax.validation.constraints.Pattern; | 15 | import javax.validation.constraints.Pattern; |
| 16 | 16 | ||
| 17 | -@ApiModel("APP 端 - 社交登录 Request VO,使用 code 授权码 + 账号密码") | 17 | +@ApiModel("用户 APP - 社交登录 Request VO,使用 code 授权码 + 账号密码") |
| 18 | @Data | 18 | @Data |
| 19 | @NoArgsConstructor | 19 | @NoArgsConstructor |
| 20 | @AllArgsConstructor | 20 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java
| @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; | @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; | ||
| 12 | import javax.validation.constraints.NotEmpty; | 12 | import javax.validation.constraints.NotEmpty; |
| 13 | import javax.validation.constraints.NotNull; | 13 | import javax.validation.constraints.NotNull; |
| 14 | 14 | ||
| 15 | -@ApiModel("APP 端 - 社交登录 Request VO,使用 code 授权码") | 15 | +@ApiModel("用户 APP - 社交登录 Request VO,使用 code 授权码") |
| 16 | @Data | 16 | @Data |
| 17 | @NoArgsConstructor | 17 | @NoArgsConstructor |
| 18 | @AllArgsConstructor | 18 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSocialUnbindReqVO.java
| @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; | @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; | ||
| 12 | import javax.validation.constraints.NotEmpty; | 12 | import javax.validation.constraints.NotEmpty; |
| 13 | import javax.validation.constraints.NotNull; | 13 | import javax.validation.constraints.NotNull; |
| 14 | 14 | ||
| 15 | -@ApiModel("APP 端 - 取消社交绑定 Request VO,使用 code 授权码") | 15 | +@ApiModel("用户 APP - 取消社交绑定 Request VO,使用 code 授权码") |
| 16 | @Data | 16 | @Data |
| 17 | @NoArgsConstructor | 17 | @NoArgsConstructor |
| 18 | @AllArgsConstructor | 18 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthUpdatePasswordReqVO.java
| @@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank; | @@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank; | ||
| 12 | import javax.validation.constraints.NotEmpty; | 12 | import javax.validation.constraints.NotEmpty; |
| 13 | 13 | ||
| 14 | // TODO 芋艿:code review 相关逻辑 | 14 | // TODO 芋艿:code review 相关逻辑 |
| 15 | -@ApiModel("APP 端 - 修改密码 Request VO") | 15 | +@ApiModel("用户 APP - 修改密码 Request VO") |
| 16 | @Data | 16 | @Data |
| 17 | @NoArgsConstructor | 17 | @NoArgsConstructor |
| 18 | @AllArgsConstructor | 18 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/package-info.java deleted
| 1 | -package cn.iocoder.yudao.module.member.controller.app; |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java
| @@ -23,7 +23,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | @@ -23,7 +23,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | ||
| 23 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | 23 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 24 | import static cn.iocoder.yudao.module.member.enums.MemberErrorCodeConstants.FILE_IS_EMPTY; | 24 | import static cn.iocoder.yudao.module.member.enums.MemberErrorCodeConstants.FILE_IS_EMPTY; |
| 25 | 25 | ||
| 26 | -@Api(tags = "APP 端 - 用户个人中心") | 26 | +@Api(tags = "用户 APP - 用户个人中心") |
| 27 | @RestController | 27 | @RestController |
| 28 | @RequestMapping("/member/user") | 28 | @RequestMapping("/member/user") |
| 29 | @Validated | 29 | @Validated |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppUserInfoRespVO.java
| @@ -6,7 +6,7 @@ import lombok.AllArgsConstructor; | @@ -6,7 +6,7 @@ import lombok.AllArgsConstructor; | ||
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
| 8 | 8 | ||
| 9 | -@ApiModel("APP 端 - 用户个人信息 Response VO") | 9 | +@ApiModel("用户 APP - 用户个人信息 Response VO") |
| 10 | @Data | 10 | @Data |
| 11 | @NoArgsConstructor | 11 | @NoArgsConstructor |
| 12 | @AllArgsConstructor | 12 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppUserUpdateMobileReqVO.java
| @@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank; | @@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank; | ||
| 13 | import javax.validation.constraints.NotEmpty; | 13 | import javax.validation.constraints.NotEmpty; |
| 14 | import javax.validation.constraints.Pattern; | 14 | import javax.validation.constraints.Pattern; |
| 15 | 15 | ||
| 16 | -@ApiModel("APP 端 - 修改手机 Request VO") | 16 | +@ApiModel("用户 APP - 修改手机 Request VO") |
| 17 | @Data | 17 | @Data |
| 18 | @NoArgsConstructor | 18 | @NoArgsConstructor |
| 19 | @AllArgsConstructor | 19 | @AllArgsConstructor |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/package-info.java
| 1 | /** | 1 | /** |
| 2 | * 提供 RESTful API 给前端: | 2 | * 提供 RESTful API 给前端: |
| 3 | * 1. admin 包:提供给管理后台 yudao-ui-admin 前端项目 | 3 | * 1. admin 包:提供给管理后台 yudao-ui-admin 前端项目 |
| 4 | - * 2. app 包:提供给用户 APP yudao-ui-app 前端项目 | 4 | + * 2. app 包:提供给用户 APP yudao-ui-app 前端项目,它的 Controller 和 VO 都要添加 App 前缀,用于和管理后台进行区分 |
| 5 | */ | 5 | */ |
| 6 | package cn.iocoder.yudao.module.member.controller; | 6 | package cn.iocoder.yudao.module.member.controller; |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/auth/AuthServiceImpl.java
| @@ -51,7 +51,7 @@ import static cn.iocoder.yudao.module.member.enums.SysErrorCodeConstants.*; | @@ -51,7 +51,7 @@ import static cn.iocoder.yudao.module.member.enums.SysErrorCodeConstants.*; | ||
| 51 | * | 51 | * |
| 52 | * @author 芋道源码 | 52 | * @author 芋道源码 |
| 53 | */ | 53 | */ |
| 54 | -@Service | 54 | +@Service("memberAuthService") |
| 55 | @Slf4j | 55 | @Slf4j |
| 56 | public class AuthServiceImpl implements AuthService { | 56 | public class AuthServiceImpl implements AuthService { |
| 57 | 57 |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/user/UserServiceImpl.java
| @@ -32,7 +32,7 @@ import static cn.iocoder.yudao.module.member.enums.MemberErrorCodeConstants.USER | @@ -32,7 +32,7 @@ import static cn.iocoder.yudao.module.member.enums.MemberErrorCodeConstants.USER | ||
| 32 | * | 32 | * |
| 33 | * @author 芋道源码 | 33 | * @author 芋道源码 |
| 34 | */ | 34 | */ |
| 35 | -@Service | 35 | +@Service("memberUserService") |
| 36 | @Valid | 36 | @Valid |
| 37 | @Slf4j | 37 | @Slf4j |
| 38 | public class UserServiceImpl implements UserService { | 38 | public class UserServiceImpl implements UserService { |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/SysAuthController.http renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.http
| 1 | ### 请求 /login 接口 => 成功 | 1 | ### 请求 /login 接口 => 成功 |
| 2 | -POST {{baseUrl}}/login | 2 | +POST {{baseUrl}}/system/login |
| 3 | Content-Type: application/json | 3 | Content-Type: application/json |
| 4 | -tenant-id: 1 | 4 | +tenant-id: {{adminTenentId}} |
| 5 | 5 | ||
| 6 | { | 6 | { |
| 7 | "username": "admin", | 7 | "username": "admin", |
| @@ -11,16 +11,12 @@ tenant-id: 1 | @@ -11,16 +11,12 @@ tenant-id: 1 | ||
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | ### 请求 /get-permission-info 接口 => 成功 | 13 | ### 请求 /get-permission-info 接口 => 成功 |
| 14 | -GET {{baseUrl}}/get-permission-info | 14 | +GET {{baseUrl}}/system/get-permission-info |
| 15 | Authorization: Bearer {{token}} | 15 | Authorization: Bearer {{token}} |
| 16 | -tenant-id: 1 | 16 | +tenant-id: {{adminTenentId}} |
| 17 | 17 | ||
| 18 | ### 请求 /list-menus 接口 => 成功 | 18 | ### 请求 /list-menus 接口 => 成功 |
| 19 | -GET {{baseUrl}}/list-menus | 19 | +GET {{baseUrl}}/system/list-menus |
| 20 | Authorization: Bearer {{token}} | 20 | Authorization: Bearer {{token}} |
| 21 | #Authorization: Bearer a6aa7714a2e44c95aaa8a2c5adc2a67a | 21 | #Authorization: Bearer a6aa7714a2e44c95aaa8a2c5adc2a67a |
| 22 | -tenant-id: 1 | ||
| 23 | - | ||
| 24 | -### 请求 /druid/xxx 接口 => 失败 TODO 临时测试 | ||
| 25 | -GET http://127.0.0.1:8080/druid/123 | ||
| 26 | -Authorization: Bearer {{token}} | 22 | +tenant-id: {{adminTenentId}} |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/SysAuthController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.module.system.controller.auth.vo.auth.*; | ||
| 4 | -import cn.iocoder.yudao.module.system.convert.auth.SysAuthConvert; | ||
| 5 | -import cn.iocoder.yudao.module.system.dal.dataobject.permission.SysMenuDO; | 3 | +import cn.iocoder.yudao.module.system.controller.admin.auth.vo.auth.*; |
| 4 | +import cn.iocoder.yudao.module.system.convert.auth.AuthConvert; | ||
| 5 | +import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO; | ||
| 6 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO; | 6 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO; |
| 7 | import cn.iocoder.yudao.module.system.enums.permission.MenuTypeEnum; | 7 | import cn.iocoder.yudao.module.system.enums.permission.MenuTypeEnum; |
| 8 | -import cn.iocoder.yudao.module.system.service.auth.SysAuthService; | ||
| 9 | -import cn.iocoder.yudao.module.system.service.permission.SysPermissionService; | ||
| 10 | -import cn.iocoder.yudao.module.system.service.permission.SysRoleService; | 8 | +import cn.iocoder.yudao.module.system.service.auth.AuthService; |
| 9 | +import cn.iocoder.yudao.module.system.service.permission.PermissionService; | ||
| 10 | +import cn.iocoder.yudao.module.system.service.permission.RoleService; | ||
| 11 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; | 11 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; |
| 12 | import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialCoreService; | 12 | import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialCoreService; |
| 13 | import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService; | 13 | import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService; |
| @@ -21,6 +21,7 @@ import io.swagger.annotations.ApiImplicitParam; | @@ -21,6 +21,7 @@ import io.swagger.annotations.ApiImplicitParam; | ||
| 21 | import io.swagger.annotations.ApiImplicitParams; | 21 | import io.swagger.annotations.ApiImplicitParams; |
| 22 | import io.swagger.annotations.ApiOperation; | 22 | import io.swagger.annotations.ApiOperation; |
| 23 | import lombok.extern.slf4j.Slf4j; | 23 | import lombok.extern.slf4j.Slf4j; |
| 24 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 24 | import org.springframework.validation.annotation.Validated; | 25 | import org.springframework.validation.annotation.Validated; |
| 25 | import org.springframework.web.bind.annotation.*; | 26 | import org.springframework.web.bind.annotation.*; |
| 26 | 27 | ||
| @@ -34,36 +35,37 @@ import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getUse | @@ -34,36 +35,37 @@ import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getUse | ||
| 34 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | 35 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 35 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserRoleIds; | 36 | import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserRoleIds; |
| 36 | 37 | ||
| 37 | -@Api(tags = "认证") | 38 | +@Api(tags = "管理后台 - 认证") |
| 38 | @RestController | 39 | @RestController |
| 39 | -@RequestMapping("/") | 40 | +@RequestMapping("/system") // 暂时不跟 /auth 结尾 |
| 40 | @Validated | 41 | @Validated |
| 41 | @Slf4j | 42 | @Slf4j |
| 42 | -public class SysAuthController { | 43 | +public class AuthController { |
| 43 | 44 | ||
| 44 | - @Resource | ||
| 45 | - private SysAuthService authService; | 45 | + @Autowired |
| 46 | + @SuppressWarnings("SpringJavaAutowiredFieldsWarningInspection") // AuthService 存在重名 | ||
| 47 | + private AuthService authService; | ||
| 46 | @Resource | 48 | @Resource |
| 47 | private SysUserCoreService userCoreService; | 49 | private SysUserCoreService userCoreService; |
| 48 | @Resource | 50 | @Resource |
| 49 | - private SysRoleService roleService; | 51 | + private RoleService roleService; |
| 50 | @Resource | 52 | @Resource |
| 51 | - private SysPermissionService permissionService; | 53 | + private PermissionService permissionService; |
| 52 | @Resource | 54 | @Resource |
| 53 | private SysSocialCoreService socialCoreService; | 55 | private SysSocialCoreService socialCoreService; |
| 54 | 56 | ||
| 55 | @PostMapping("/login") | 57 | @PostMapping("/login") |
| 56 | @ApiOperation("使用账号密码登录") | 58 | @ApiOperation("使用账号密码登录") |
| 57 | @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 | 59 | @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 |
| 58 | - public CommonResult<SysAuthLoginRespVO> login(@RequestBody @Valid SysAuthLoginReqVO reqVO) { | 60 | + public CommonResult<AuthLoginRespVO> login(@RequestBody @Valid AuthLoginReqVO reqVO) { |
| 59 | String token = authService.login(reqVO, getClientIP(), getUserAgent()); | 61 | String token = authService.login(reqVO, getClientIP(), getUserAgent()); |
| 60 | // 返回结果 | 62 | // 返回结果 |
| 61 | - return success(SysAuthLoginRespVO.builder().token(token).build()); | 63 | + return success(AuthLoginRespVO.builder().token(token).build()); |
| 62 | } | 64 | } |
| 63 | 65 | ||
| 64 | @GetMapping("/get-permission-info") | 66 | @GetMapping("/get-permission-info") |
| 65 | @ApiOperation("获取登录用户的权限信息") | 67 | @ApiOperation("获取登录用户的权限信息") |
| 66 | - public CommonResult<SysAuthPermissionInfoRespVO> getPermissionInfo() { | 68 | + public CommonResult<AuthPermissionInfoRespVO> getPermissionInfo() { |
| 67 | // 获得用户信息 | 69 | // 获得用户信息 |
| 68 | SysUserDO user = userCoreService.getUser(getLoginUserId()); | 70 | SysUserDO user = userCoreService.getUser(getLoginUserId()); |
| 69 | if (user == null) { | 71 | if (user == null) { |
| @@ -72,24 +74,24 @@ public class SysAuthController { | @@ -72,24 +74,24 @@ public class SysAuthController { | ||
| 72 | // 获得角色列表 | 74 | // 获得角色列表 |
| 73 | List<SysRoleDO> roleList = roleService.getRolesFromCache(getLoginUserRoleIds()); | 75 | List<SysRoleDO> roleList = roleService.getRolesFromCache(getLoginUserRoleIds()); |
| 74 | // 获得菜单列表 | 76 | // 获得菜单列表 |
| 75 | - List<SysMenuDO> menuList = permissionService.getRoleMenusFromCache( | 77 | + List<MenuDO> menuList = permissionService.getRoleMenusFromCache( |
| 76 | getLoginUserRoleIds(), // 注意,基于登录的角色,因为后续的权限判断也是基于它 | 78 | getLoginUserRoleIds(), // 注意,基于登录的角色,因为后续的权限判断也是基于它 |
| 77 | SetUtils.asSet(MenuTypeEnum.DIR.getType(), MenuTypeEnum.MENU.getType(), MenuTypeEnum.BUTTON.getType()), | 79 | SetUtils.asSet(MenuTypeEnum.DIR.getType(), MenuTypeEnum.MENU.getType(), MenuTypeEnum.BUTTON.getType()), |
| 78 | SetUtils.asSet(CommonStatusEnum.ENABLE.getStatus())); | 80 | SetUtils.asSet(CommonStatusEnum.ENABLE.getStatus())); |
| 79 | // 拼接结果返回 | 81 | // 拼接结果返回 |
| 80 | - return success(SysAuthConvert.INSTANCE.convert(user, roleList, menuList)); | 82 | + return success(AuthConvert.INSTANCE.convert(user, roleList, menuList)); |
| 81 | } | 83 | } |
| 82 | 84 | ||
| 83 | @GetMapping("list-menus") | 85 | @GetMapping("list-menus") |
| 84 | @ApiOperation("获得登录用户的菜单列表") | 86 | @ApiOperation("获得登录用户的菜单列表") |
| 85 | - public CommonResult<List<SysAuthMenuRespVO>> getMenus() { | 87 | + public CommonResult<List<AuthMenuRespVO>> getMenus() { |
| 86 | // 获得用户拥有的菜单列表 | 88 | // 获得用户拥有的菜单列表 |
| 87 | - List<SysMenuDO> menuList = permissionService.getRoleMenusFromCache( | 89 | + List<MenuDO> menuList = permissionService.getRoleMenusFromCache( |
| 88 | getLoginUserRoleIds(), // 注意,基于登录的角色,因为后续的权限判断也是基于它 | 90 | getLoginUserRoleIds(), // 注意,基于登录的角色,因为后续的权限判断也是基于它 |
| 89 | SetUtils.asSet(MenuTypeEnum.DIR.getType(), MenuTypeEnum.MENU.getType()), // 只要目录和菜单类型 | 91 | SetUtils.asSet(MenuTypeEnum.DIR.getType(), MenuTypeEnum.MENU.getType()), // 只要目录和菜单类型 |
| 90 | SetUtils.asSet(CommonStatusEnum.ENABLE.getStatus())); // 只要开启的 | 92 | SetUtils.asSet(CommonStatusEnum.ENABLE.getStatus())); // 只要开启的 |
| 91 | // 转换成 Tree 结构返回 | 93 | // 转换成 Tree 结构返回 |
| 92 | - return success(SysAuthConvert.INSTANCE.buildMenuTree(menuList)); | 94 | + return success(AuthConvert.INSTANCE.buildMenuTree(menuList)); |
| 93 | } | 95 | } |
| 94 | 96 | ||
| 95 | // ========== 社交登录相关 ========== | 97 | // ========== 社交登录相关 ========== |
| @@ -108,31 +110,31 @@ public class SysAuthController { | @@ -108,31 +110,31 @@ public class SysAuthController { | ||
| 108 | @PostMapping("/social-login") | 110 | @PostMapping("/social-login") |
| 109 | @ApiOperation("社交登录,使用 code 授权码") | 111 | @ApiOperation("社交登录,使用 code 授权码") |
| 110 | @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 | 112 | @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 |
| 111 | - public CommonResult<SysAuthLoginRespVO> socialLogin(@RequestBody @Valid SysAuthSocialLoginReqVO reqVO) { | 113 | + public CommonResult<AuthLoginRespVO> socialLogin(@RequestBody @Valid AuthSocialLoginReqVO reqVO) { |
| 112 | String token = authService.socialLogin(reqVO, getClientIP(), getUserAgent()); | 114 | String token = authService.socialLogin(reqVO, getClientIP(), getUserAgent()); |
| 113 | // 返回结果 | 115 | // 返回结果 |
| 114 | - return success(SysAuthLoginRespVO.builder().token(token).build()); | 116 | + return success(AuthLoginRespVO.builder().token(token).build()); |
| 115 | } | 117 | } |
| 116 | 118 | ||
| 117 | @PostMapping("/social-login2") | 119 | @PostMapping("/social-login2") |
| 118 | @ApiOperation("社交登录,使用 code 授权码 + 账号密码") | 120 | @ApiOperation("社交登录,使用 code 授权码 + 账号密码") |
| 119 | @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 | 121 | @OperateLog(enable = false) // 避免 Post 请求被记录操作日志 |
| 120 | - public CommonResult<SysAuthLoginRespVO> socialLogin2(@RequestBody @Valid SysAuthSocialLogin2ReqVO reqVO) { | 122 | + public CommonResult<AuthLoginRespVO> socialLogin2(@RequestBody @Valid AuthSocialLogin2ReqVO reqVO) { |
| 121 | String token = authService.socialLogin2(reqVO, getClientIP(), getUserAgent()); | 123 | String token = authService.socialLogin2(reqVO, getClientIP(), getUserAgent()); |
| 122 | // 返回结果 | 124 | // 返回结果 |
| 123 | - return success(SysAuthLoginRespVO.builder().token(token).build()); | 125 | + return success(AuthLoginRespVO.builder().token(token).build()); |
| 124 | } | 126 | } |
| 125 | 127 | ||
| 126 | @PostMapping("/social-bind") | 128 | @PostMapping("/social-bind") |
| 127 | @ApiOperation("社交绑定,使用 code 授权码") | 129 | @ApiOperation("社交绑定,使用 code 授权码") |
| 128 | - public CommonResult<Boolean> socialBind(@RequestBody @Valid SysAuthSocialBindReqVO reqVO) { | 130 | + public CommonResult<Boolean> socialBind(@RequestBody @Valid AuthSocialBindReqVO reqVO) { |
| 129 | authService.socialBind(getLoginUserId(), reqVO); | 131 | authService.socialBind(getLoginUserId(), reqVO); |
| 130 | return CommonResult.success(true); | 132 | return CommonResult.success(true); |
| 131 | } | 133 | } |
| 132 | 134 | ||
| 133 | @DeleteMapping("/social-unbind") | 135 | @DeleteMapping("/social-unbind") |
| 134 | @ApiOperation("取消社交绑定") | 136 | @ApiOperation("取消社交绑定") |
| 135 | - public CommonResult<Boolean> socialUnbind(@RequestBody SysAuthSocialUnbindReqVO reqVO) { | 137 | + public CommonResult<Boolean> socialUnbind(@RequestBody AuthSocialUnbindReqVO reqVO) { |
| 136 | socialCoreService.unbindSocialUser(getLoginUserId(), reqVO.getType(), reqVO.getUnionId(), UserTypeEnum.ADMIN); | 138 | socialCoreService.unbindSocialUser(getLoginUserId(), reqVO.getType(), reqVO.getUnionId(), UserTypeEnum.ADMIN); |
| 137 | return CommonResult.success(true); | 139 | return CommonResult.success(true); |
| 138 | } | 140 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/SysUserSessionController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/UserSessionController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.module.system.controller.auth.vo.session.SysUserSessionPageItemRespVO; | ||
| 4 | -import cn.iocoder.yudao.module.system.controller.auth.vo.session.SysUserSessionPageReqVO; | ||
| 5 | -import cn.iocoder.yudao.module.system.convert.auth.SysUserSessionConvert; | 3 | +import cn.iocoder.yudao.module.system.controller.admin.auth.vo.session.UserSessionPageItemRespVO; |
| 4 | +import cn.iocoder.yudao.module.system.controller.admin.auth.vo.session.UserSessionPageReqVO; | ||
| 5 | +import cn.iocoder.yudao.module.system.convert.auth.UserSessionConvert; | ||
| 6 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO; | 6 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO; |
| 7 | -import cn.iocoder.yudao.module.system.service.auth.SysUserSessionService; | 7 | +import cn.iocoder.yudao.module.system.service.auth.UserSessionService; |
| 8 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.auth.SysUserSessionDO; | 8 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.auth.SysUserSessionDO; |
| 9 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; | 9 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; |
| 10 | import cn.iocoder.yudao.coreservice.modules.system.service.auth.SysUserSessionCoreService; | 10 | import cn.iocoder.yudao.coreservice.modules.system.service.auth.SysUserSessionCoreService; |
| @@ -28,13 +28,13 @@ import java.util.Map; | @@ -28,13 +28,13 @@ import java.util.Map; | ||
| 28 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 28 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 29 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; | 29 | import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; |
| 30 | 30 | ||
| 31 | -@Api(tags = "用户 Session") | 31 | +@Api(tags = "管理后台 - 用户 Session") |
| 32 | @RestController | 32 | @RestController |
| 33 | @RequestMapping("/system/user-session") | 33 | @RequestMapping("/system/user-session") |
| 34 | -public class SysUserSessionController { | 34 | +public class UserSessionController { |
| 35 | 35 | ||
| 36 | @Resource | 36 | @Resource |
| 37 | - private SysUserSessionService userSessionService; | 37 | + private UserSessionService userSessionService; |
| 38 | @Resource | 38 | @Resource |
| 39 | private SysUserSessionCoreService userSessionCoreService; | 39 | private SysUserSessionCoreService userSessionCoreService; |
| 40 | @Resource | 40 | @Resource |
| @@ -46,7 +46,7 @@ public class SysUserSessionController { | @@ -46,7 +46,7 @@ public class SysUserSessionController { | ||
| 46 | @GetMapping("/page") | 46 | @GetMapping("/page") |
| 47 | @ApiOperation("获得 Session 分页列表") | 47 | @ApiOperation("获得 Session 分页列表") |
| 48 | @PreAuthorize("@ss.hasPermission('system:user-session:page')") | 48 | @PreAuthorize("@ss.hasPermission('system:user-session:page')") |
| 49 | - public CommonResult<PageResult<SysUserSessionPageItemRespVO>> getUserSessionPage(@Validated SysUserSessionPageReqVO reqVO) { | 49 | + public CommonResult<PageResult<UserSessionPageItemRespVO>> getUserSessionPage(@Validated UserSessionPageReqVO reqVO) { |
| 50 | // 获得 Session 分页 | 50 | // 获得 Session 分页 |
| 51 | PageResult<SysUserSessionDO> pageResult = userSessionService.getUserSessionPage(reqVO); | 51 | PageResult<SysUserSessionDO> pageResult = userSessionService.getUserSessionPage(reqVO); |
| 52 | 52 | ||
| @@ -56,9 +56,9 @@ public class SysUserSessionController { | @@ -56,9 +56,9 @@ public class SysUserSessionController { | ||
| 56 | Map<Long, SysDeptDO> deptMap = deptCoreService.getDeptMap( | 56 | Map<Long, SysDeptDO> deptMap = deptCoreService.getDeptMap( |
| 57 | convertList(userMap.values(), SysUserDO::getDeptId)); | 57 | convertList(userMap.values(), SysUserDO::getDeptId)); |
| 58 | // 拼接结果返回 | 58 | // 拼接结果返回 |
| 59 | - List<SysUserSessionPageItemRespVO> sessionList = new ArrayList<>(pageResult.getList().size()); | 59 | + List<UserSessionPageItemRespVO> sessionList = new ArrayList<>(pageResult.getList().size()); |
| 60 | pageResult.getList().forEach(session -> { | 60 | pageResult.getList().forEach(session -> { |
| 61 | - SysUserSessionPageItemRespVO respVO = SysUserSessionConvert.INSTANCE.convert(session); | 61 | + UserSessionPageItemRespVO respVO = UserSessionConvert.INSTANCE.convert(session); |
| 62 | sessionList.add(respVO); | 62 | sessionList.add(respVO); |
| 63 | // 设置用户账号 | 63 | // 设置用户账号 |
| 64 | MapUtils.findAndThen(userMap, session.getUserId(), user -> { | 64 | MapUtils.findAndThen(userMap, session.getUserId(), user -> { |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/vo/auth/SysAuthLoginReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthLoginReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth.vo.auth; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth.vo.auth; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -11,12 +11,12 @@ import org.hibernate.validator.constraints.Length; | @@ -11,12 +11,12 @@ import org.hibernate.validator.constraints.Length; | ||
| 11 | import javax.validation.constraints.NotEmpty; | 11 | import javax.validation.constraints.NotEmpty; |
| 12 | import javax.validation.constraints.Pattern; | 12 | import javax.validation.constraints.Pattern; |
| 13 | 13 | ||
| 14 | -@ApiModel("账号密码登录 Request VO") | 14 | +@ApiModel("管理后台 - 账号密码登录 Request VO") |
| 15 | @Data | 15 | @Data |
| 16 | @NoArgsConstructor | 16 | @NoArgsConstructor |
| 17 | @AllArgsConstructor | 17 | @AllArgsConstructor |
| 18 | @Builder | 18 | @Builder |
| 19 | -public class SysAuthLoginReqVO { | 19 | +public class AuthLoginReqVO { |
| 20 | 20 | ||
| 21 | @ApiModelProperty(value = "账号", required = true, example = "yudaoyuanma") | 21 | @ApiModelProperty(value = "账号", required = true, example = "yudaoyuanma") |
| 22 | @NotEmpty(message = "登录账号不能为空") | 22 | @NotEmpty(message = "登录账号不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/vo/auth/SysAuthLoginRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthLoginRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth.vo.auth; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth.vo.auth; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -7,12 +7,12 @@ import lombok.Builder; | @@ -7,12 +7,12 @@ import lombok.Builder; | ||
| 7 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | import lombok.NoArgsConstructor; | 8 | import lombok.NoArgsConstructor; |
| 9 | 9 | ||
| 10 | -@ApiModel("账号密码登录 Response VO") | 10 | +@ApiModel("管理后台 - 账号密码登录 Response VO") |
| 11 | @Data | 11 | @Data |
| 12 | @NoArgsConstructor | 12 | @NoArgsConstructor |
| 13 | @AllArgsConstructor | 13 | @AllArgsConstructor |
| 14 | @Builder | 14 | @Builder |
| 15 | -public class SysAuthLoginRespVO { | 15 | +public class AuthLoginRespVO { |
| 16 | 16 | ||
| 17 | @ApiModelProperty(value = "token", required = true, example = "yudaoyuanma") | 17 | @ApiModelProperty(value = "token", required = true, example = "yudaoyuanma") |
| 18 | private String token; | 18 | private String token; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/vo/auth/SysAuthMenuRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthMenuRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth.vo.auth; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth.vo.auth; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -9,12 +9,12 @@ import lombok.NoArgsConstructor; | @@ -9,12 +9,12 @@ import lombok.NoArgsConstructor; | ||
| 9 | 9 | ||
| 10 | import java.util.List; | 10 | import java.util.List; |
| 11 | 11 | ||
| 12 | -@ApiModel("登录用户的菜单信息 Response VO") | 12 | +@ApiModel("管理后台 - 登录用户的菜单信息 Response VO") |
| 13 | @Data | 13 | @Data |
| 14 | @NoArgsConstructor | 14 | @NoArgsConstructor |
| 15 | @AllArgsConstructor | 15 | @AllArgsConstructor |
| 16 | @Builder | 16 | @Builder |
| 17 | -public class SysAuthMenuRespVO { | 17 | +public class AuthMenuRespVO { |
| 18 | 18 | ||
| 19 | @ApiModelProperty(value = "菜单名称", required = true, example = "芋道") | 19 | @ApiModelProperty(value = "菜单名称", required = true, example = "芋道") |
| 20 | private Long id; | 20 | private Long id; |
| @@ -37,6 +37,6 @@ public class SysAuthMenuRespVO { | @@ -37,6 +37,6 @@ public class SysAuthMenuRespVO { | ||
| 37 | /** | 37 | /** |
| 38 | * 子路由 | 38 | * 子路由 |
| 39 | */ | 39 | */ |
| 40 | - private List<SysAuthMenuRespVO> children; | 40 | + private List<AuthMenuRespVO> children; |
| 41 | 41 | ||
| 42 | } | 42 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/vo/auth/SysAuthPermissionInfoRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthPermissionInfoRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth.vo.auth; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth.vo.auth; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -9,12 +9,12 @@ import lombok.NoArgsConstructor; | @@ -9,12 +9,12 @@ import lombok.NoArgsConstructor; | ||
| 9 | 9 | ||
| 10 | import java.util.Set; | 10 | import java.util.Set; |
| 11 | 11 | ||
| 12 | -@ApiModel(value = "登录用户的权限信息 Response VO", description = "额外包括用户信息和角色列表") | 12 | +@ApiModel(value = "管理后台 - 登录用户的权限信息 Response VO", description = "额外包括用户信息和角色列表") |
| 13 | @Data | 13 | @Data |
| 14 | @NoArgsConstructor | 14 | @NoArgsConstructor |
| 15 | @AllArgsConstructor | 15 | @AllArgsConstructor |
| 16 | @Builder | 16 | @Builder |
| 17 | -public class SysAuthPermissionInfoRespVO { | 17 | +public class AuthPermissionInfoRespVO { |
| 18 | 18 | ||
| 19 | @ApiModelProperty(value = "用户信息", required = true) | 19 | @ApiModelProperty(value = "用户信息", required = true) |
| 20 | private UserVO user; | 20 | private UserVO user; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/vo/auth/SysAuthSocialBindReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthSocialBindReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth.vo.auth; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth.vo.auth; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.coreservice.modules.system.enums.social.SysSocialTypeEnum; | 3 | import cn.iocoder.yudao.coreservice.modules.system.enums.social.SysSocialTypeEnum; |
| 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; | 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; |
| @@ -12,12 +12,12 @@ import lombok.NoArgsConstructor; | @@ -12,12 +12,12 @@ import lombok.NoArgsConstructor; | ||
| 12 | import javax.validation.constraints.NotEmpty; | 12 | import javax.validation.constraints.NotEmpty; |
| 13 | import javax.validation.constraints.NotNull; | 13 | import javax.validation.constraints.NotNull; |
| 14 | 14 | ||
| 15 | -@ApiModel("社交绑定 Request VO,使用 code 授权码") | 15 | +@ApiModel("管理后台 - 社交绑定 Request VO,使用 code 授权码") |
| 16 | @Data | 16 | @Data |
| 17 | @NoArgsConstructor | 17 | @NoArgsConstructor |
| 18 | @AllArgsConstructor | 18 | @AllArgsConstructor |
| 19 | @Builder | 19 | @Builder |
| 20 | -public class SysAuthSocialBindReqVO { | 20 | +public class AuthSocialBindReqVO { |
| 21 | 21 | ||
| 22 | @ApiModelProperty(value = "社交平台的类型", required = true, example = "10", notes = "参见 SysUserSocialTypeEnum 枚举值") | 22 | @ApiModelProperty(value = "社交平台的类型", required = true, example = "10", notes = "参见 SysUserSocialTypeEnum 枚举值") |
| 23 | @InEnum(SysSocialTypeEnum.class) | 23 | @InEnum(SysSocialTypeEnum.class) |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/vo/auth/SysAuthSocialLogin2ReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthSocialLogin2ReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth.vo.auth; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth.vo.auth; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.coreservice.modules.system.enums.social.SysSocialTypeEnum; | 3 | import cn.iocoder.yudao.coreservice.modules.system.enums.social.SysSocialTypeEnum; |
| 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; | 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; |
| @@ -14,12 +14,12 @@ import javax.validation.constraints.NotEmpty; | @@ -14,12 +14,12 @@ import javax.validation.constraints.NotEmpty; | ||
| 14 | import javax.validation.constraints.NotNull; | 14 | import javax.validation.constraints.NotNull; |
| 15 | import javax.validation.constraints.Pattern; | 15 | import javax.validation.constraints.Pattern; |
| 16 | 16 | ||
| 17 | -@ApiModel("社交登录 Request VO,使用 code 授权码 + 账号密码") | 17 | +@ApiModel("管理后台 - 社交登录 Request VO,使用 code 授权码 + 账号密码") |
| 18 | @Data | 18 | @Data |
| 19 | @NoArgsConstructor | 19 | @NoArgsConstructor |
| 20 | @AllArgsConstructor | 20 | @AllArgsConstructor |
| 21 | @Builder | 21 | @Builder |
| 22 | -public class SysAuthSocialLogin2ReqVO { | 22 | +public class AuthSocialLogin2ReqVO { |
| 23 | 23 | ||
| 24 | @ApiModelProperty(value = "社交平台的类型", required = true, example = "10", notes = "参见 SysUserSocialTypeEnum 枚举值") | 24 | @ApiModelProperty(value = "社交平台的类型", required = true, example = "10", notes = "参见 SysUserSocialTypeEnum 枚举值") |
| 25 | @InEnum(SysSocialTypeEnum.class) | 25 | @InEnum(SysSocialTypeEnum.class) |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/vo/auth/SysAuthSocialLoginReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthSocialLoginReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth.vo.auth; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth.vo.auth; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.coreservice.modules.system.enums.social.SysSocialTypeEnum; | 3 | import cn.iocoder.yudao.coreservice.modules.system.enums.social.SysSocialTypeEnum; |
| 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; | 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; |
| @@ -12,12 +12,12 @@ import lombok.NoArgsConstructor; | @@ -12,12 +12,12 @@ import lombok.NoArgsConstructor; | ||
| 12 | import javax.validation.constraints.NotEmpty; | 12 | import javax.validation.constraints.NotEmpty; |
| 13 | import javax.validation.constraints.NotNull; | 13 | import javax.validation.constraints.NotNull; |
| 14 | 14 | ||
| 15 | -@ApiModel("社交登录 Request VO,使用 code 授权码") | 15 | +@ApiModel("管理后台 - 社交登录 Request VO,使用 code 授权码") |
| 16 | @Data | 16 | @Data |
| 17 | @NoArgsConstructor | 17 | @NoArgsConstructor |
| 18 | @AllArgsConstructor | 18 | @AllArgsConstructor |
| 19 | @Builder | 19 | @Builder |
| 20 | -public class SysAuthSocialLoginReqVO { | 20 | +public class AuthSocialLoginReqVO { |
| 21 | 21 | ||
| 22 | @ApiModelProperty(value = "社交平台的类型", required = true, example = "10", notes = "参见 SysUserSocialTypeEnum 枚举值") | 22 | @ApiModelProperty(value = "社交平台的类型", required = true, example = "10", notes = "参见 SysUserSocialTypeEnum 枚举值") |
| 23 | @InEnum(SysSocialTypeEnum.class) | 23 | @InEnum(SysSocialTypeEnum.class) |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/vo/auth/SysAuthSocialUnbindReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/auth/AuthSocialUnbindReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth.vo.auth; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth.vo.auth; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.coreservice.modules.system.enums.social.SysSocialTypeEnum; | 3 | import cn.iocoder.yudao.coreservice.modules.system.enums.social.SysSocialTypeEnum; |
| 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; | 4 | import cn.iocoder.yudao.framework.common.validation.InEnum; |
| @@ -12,12 +12,12 @@ import lombok.NoArgsConstructor; | @@ -12,12 +12,12 @@ import lombok.NoArgsConstructor; | ||
| 12 | import javax.validation.constraints.NotEmpty; | 12 | import javax.validation.constraints.NotEmpty; |
| 13 | import javax.validation.constraints.NotNull; | 13 | import javax.validation.constraints.NotNull; |
| 14 | 14 | ||
| 15 | -@ApiModel("取消社交绑定 Request VO,使用 code 授权码") | 15 | +@ApiModel("管理后台 - 取消社交绑定 Request VO,使用 code 授权码") |
| 16 | @Data | 16 | @Data |
| 17 | @NoArgsConstructor | 17 | @NoArgsConstructor |
| 18 | @AllArgsConstructor | 18 | @AllArgsConstructor |
| 19 | @Builder | 19 | @Builder |
| 20 | -public class SysAuthSocialUnbindReqVO { | 20 | +public class AuthSocialUnbindReqVO { |
| 21 | 21 | ||
| 22 | @ApiModelProperty(value = "社交平台的类型", required = true, example = "10", notes = "参见 SysUserSocialTypeEnum 枚举值") | 22 | @ApiModelProperty(value = "社交平台的类型", required = true, example = "10", notes = "参见 SysUserSocialTypeEnum 枚举值") |
| 23 | @InEnum(SysSocialTypeEnum.class) | 23 | @InEnum(SysSocialTypeEnum.class) |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/vo/session/SysUserSessionPageItemRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/session/UserSessionPageItemRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth.vo.session; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth.vo.session; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 4 | import io.swagger.annotations.ApiModel; | 4 | import io.swagger.annotations.ApiModel; |
| @@ -10,12 +10,12 @@ import lombok.NoArgsConstructor; | @@ -10,12 +10,12 @@ import lombok.NoArgsConstructor; | ||
| 10 | 10 | ||
| 11 | import java.util.Date; | 11 | import java.util.Date; |
| 12 | 12 | ||
| 13 | -@ApiModel(value = "用户在线 Session Response VO", description = "相比用户基本信息来说,会多部门、用户账号等信息") | 13 | +@ApiModel(value = "管理后台 - 用户在线 Session Response VO", description = "相比用户基本信息来说,会多部门、用户账号等信息") |
| 14 | @Data | 14 | @Data |
| 15 | @NoArgsConstructor | 15 | @NoArgsConstructor |
| 16 | @AllArgsConstructor | 16 | @AllArgsConstructor |
| 17 | @EqualsAndHashCode(callSuper = true) | 17 | @EqualsAndHashCode(callSuper = true) |
| 18 | -public class SysUserSessionPageItemRespVO extends PageParam { | 18 | +public class UserSessionPageItemRespVO extends PageParam { |
| 19 | 19 | ||
| 20 | @ApiModelProperty(value = "Session 编号", required = true, example = "fe50b9f6-d177-44b1-8da9-72ea34f63db7") | 20 | @ApiModelProperty(value = "Session 编号", required = true, example = "fe50b9f6-d177-44b1-8da9-72ea34f63db7") |
| 21 | private String id; | 21 | private String id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/auth/vo/session/SysUserSessionPageReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/session/UserSessionPageReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.auth.vo.session; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.auth.vo.session; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 4 | import io.swagger.annotations.ApiModel; | 4 | import io.swagger.annotations.ApiModel; |
| @@ -6,10 +6,10 @@ import io.swagger.annotations.ApiModelProperty; | @@ -6,10 +6,10 @@ import io.swagger.annotations.ApiModelProperty; | ||
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | import lombok.EqualsAndHashCode; | 7 | import lombok.EqualsAndHashCode; |
| 8 | 8 | ||
| 9 | -@ApiModel("在线用户 Session 分页 Request VO") | 9 | +@ApiModel("管理后台 - 在线用户 Session 分页 Request VO") |
| 10 | @Data | 10 | @Data |
| 11 | @EqualsAndHashCode(callSuper = true) | 11 | @EqualsAndHashCode(callSuper = true) |
| 12 | -public class SysUserSessionPageReqVO extends PageParam { | 12 | +public class UserSessionPageReqVO extends PageParam { |
| 13 | 13 | ||
| 14 | @ApiModelProperty(value = "用户 IP", example = "127.0.0.1", notes = "模糊匹配") | 14 | @ApiModelProperty(value = "用户 IP", example = "127.0.0.1", notes = "模糊匹配") |
| 15 | private String userIp; | 15 | private String userIp; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/common/SysCaptchaController.http renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/common/CaptchaController.http
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/common/SysCaptchaController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/common/CaptchaController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.common; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.common; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | -import cn.iocoder.yudao.module.system.controller.common.vo.SysCaptchaImageRespVO; | ||
| 5 | -import cn.iocoder.yudao.module.system.service.common.SysCaptchaService; | 4 | +import cn.iocoder.yudao.module.system.controller.admin.common.vo.CaptchaImageRespVO; |
| 5 | +import cn.iocoder.yudao.module.system.service.common.CaptchaService; | ||
| 6 | import io.swagger.annotations.Api; | 6 | import io.swagger.annotations.Api; |
| 7 | import io.swagger.annotations.ApiOperation; | 7 | import io.swagger.annotations.ApiOperation; |
| 8 | import org.springframework.web.bind.annotation.GetMapping; | 8 | import org.springframework.web.bind.annotation.GetMapping; |
| @@ -13,17 +13,17 @@ import javax.annotation.Resource; | @@ -13,17 +13,17 @@ import javax.annotation.Resource; | ||
| 13 | 13 | ||
| 14 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 14 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 15 | 15 | ||
| 16 | -@Api(tags = "验证码") | 16 | +@Api(tags = "管理后台 - 验证码") |
| 17 | @RestController | 17 | @RestController |
| 18 | @RequestMapping("/system/captcha") | 18 | @RequestMapping("/system/captcha") |
| 19 | -public class SysCaptchaController { | 19 | +public class CaptchaController { |
| 20 | 20 | ||
| 21 | @Resource | 21 | @Resource |
| 22 | - private SysCaptchaService captchaService; | 22 | + private CaptchaService captchaService; |
| 23 | 23 | ||
| 24 | @GetMapping("/get-image") | 24 | @GetMapping("/get-image") |
| 25 | @ApiOperation("生成图片验证码") | 25 | @ApiOperation("生成图片验证码") |
| 26 | - public CommonResult<SysCaptchaImageRespVO> getCaptchaImage() { | 26 | + public CommonResult<CaptchaImageRespVO> getCaptchaImage() { |
| 27 | return success(captchaService.getCaptchaImage()); | 27 | return success(captchaService.getCaptchaImage()); |
| 28 | } | 28 | } |
| 29 | 29 |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/common/vo/SysCaptchaImageRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/common/vo/CaptchaImageRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.common.vo; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.common.vo; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -7,14 +7,15 @@ import lombok.Builder; | @@ -7,14 +7,15 @@ import lombok.Builder; | ||
| 7 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | import lombok.NoArgsConstructor; | 8 | import lombok.NoArgsConstructor; |
| 9 | 9 | ||
| 10 | -@ApiModel("验证码图片 Response VO") | 10 | +@ApiModel("管理后台 - 验证码图片 Response VO") |
| 11 | @Data | 11 | @Data |
| 12 | @Builder | 12 | @Builder |
| 13 | @NoArgsConstructor | 13 | @NoArgsConstructor |
| 14 | @AllArgsConstructor | 14 | @AllArgsConstructor |
| 15 | -public class SysCaptchaImageRespVO { | 15 | +public class CaptchaImageRespVO { |
| 16 | 16 | ||
| 17 | - @ApiModelProperty(value = "uuid", required = true, example = "1b3b7d00-83a8-4638-9e37-d67011855968", notes = "通过该 uuid 作为该验证码的标识") | 17 | + @ApiModelProperty(value = "uuid", required = true, example = "1b3b7d00-83a8-4638-9e37-d67011855968", |
| 18 | + notes = "通过该 uuid 作为该验证码的标识") | ||
| 18 | private String uuid; | 19 | private String uuid; |
| 19 | 20 | ||
| 20 | @ApiModelProperty(value = "图片", required = true, notes = "验证码的图片内容,使用 Base64 编码") | 21 | @ApiModelProperty(value = "图片", required = true, notes = "验证码的图片内容,使用 Base64 编码") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/SysDeptController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService; | 3 | import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService; |
| 4 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 4 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 6 | -import cn.iocoder.yudao.module.system.controller.dept.vo.dept.*; | ||
| 7 | -import cn.iocoder.yudao.module.system.convert.dept.SysDeptConvert; | 6 | +import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.*; |
| 7 | +import cn.iocoder.yudao.module.system.convert.dept.DeptConvert; | ||
| 8 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO; | 8 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO; |
| 9 | -import cn.iocoder.yudao.module.system.service.dept.SysDeptService; | 9 | +import cn.iocoder.yudao.module.system.service.dept.DeptService; |
| 10 | import io.swagger.annotations.Api; | 10 | import io.swagger.annotations.Api; |
| 11 | import io.swagger.annotations.ApiImplicitParam; | 11 | import io.swagger.annotations.ApiImplicitParam; |
| 12 | import io.swagger.annotations.ApiOperation; | 12 | import io.swagger.annotations.ApiOperation; |
| @@ -21,14 +21,14 @@ import java.util.List; | @@ -21,14 +21,14 @@ import java.util.List; | ||
| 21 | 21 | ||
| 22 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 22 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 23 | 23 | ||
| 24 | -@Api(tags = "部门") | 24 | +@Api(tags = "管理后台 - 部门") |
| 25 | @RestController | 25 | @RestController |
| 26 | @RequestMapping("/system/dept") | 26 | @RequestMapping("/system/dept") |
| 27 | @Validated | 27 | @Validated |
| 28 | -public class SysDeptController { | 28 | +public class DeptController { |
| 29 | 29 | ||
| 30 | @Resource | 30 | @Resource |
| 31 | - private SysDeptService deptService; | 31 | + private DeptService deptService; |
| 32 | 32 | ||
| 33 | @Resource | 33 | @Resource |
| 34 | private SysDeptCoreService deptCoreService; | 34 | private SysDeptCoreService deptCoreService; |
| @@ -36,7 +36,7 @@ public class SysDeptController { | @@ -36,7 +36,7 @@ public class SysDeptController { | ||
| 36 | @PostMapping("create") | 36 | @PostMapping("create") |
| 37 | @ApiOperation("创建部门") | 37 | @ApiOperation("创建部门") |
| 38 | @PreAuthorize("@ss.hasPermission('system:dept:create')") | 38 | @PreAuthorize("@ss.hasPermission('system:dept:create')") |
| 39 | - public CommonResult<Long> createDept(@Valid @RequestBody SysDeptCreateReqVO reqVO) { | 39 | + public CommonResult<Long> createDept(@Valid @RequestBody DeptCreateReqVO reqVO) { |
| 40 | Long deptId = deptService.createDept(reqVO); | 40 | Long deptId = deptService.createDept(reqVO); |
| 41 | return success(deptId); | 41 | return success(deptId); |
| 42 | } | 42 | } |
| @@ -44,7 +44,7 @@ public class SysDeptController { | @@ -44,7 +44,7 @@ public class SysDeptController { | ||
| 44 | @PutMapping("update") | 44 | @PutMapping("update") |
| 45 | @ApiOperation("更新部门") | 45 | @ApiOperation("更新部门") |
| 46 | @PreAuthorize("@ss.hasPermission('system:dept:update')") | 46 | @PreAuthorize("@ss.hasPermission('system:dept:update')") |
| 47 | - public CommonResult<Boolean> updateDept(@Valid @RequestBody SysDeptUpdateReqVO reqVO) { | 47 | + public CommonResult<Boolean> updateDept(@Valid @RequestBody DeptUpdateReqVO reqVO) { |
| 48 | deptService.updateDept(reqVO); | 48 | deptService.updateDept(reqVO); |
| 49 | return success(true); | 49 | return success(true); |
| 50 | } | 50 | } |
| @@ -61,30 +61,30 @@ public class SysDeptController { | @@ -61,30 +61,30 @@ public class SysDeptController { | ||
| 61 | @GetMapping("/list") | 61 | @GetMapping("/list") |
| 62 | @ApiOperation("获取部门列表") | 62 | @ApiOperation("获取部门列表") |
| 63 | @PreAuthorize("@ss.hasPermission('system:dept:query')") | 63 | @PreAuthorize("@ss.hasPermission('system:dept:query')") |
| 64 | - public CommonResult<List<SysDeptRespVO>> listDepts(SysDeptListReqVO reqVO) { | 64 | + public CommonResult<List<DeptRespVO>> listDepts(DeptListReqVO reqVO) { |
| 65 | List<SysDeptDO> list = deptService.getSimpleDepts(reqVO); | 65 | List<SysDeptDO> list = deptService.getSimpleDepts(reqVO); |
| 66 | list.sort(Comparator.comparing(SysDeptDO::getSort)); | 66 | list.sort(Comparator.comparing(SysDeptDO::getSort)); |
| 67 | - return success(SysDeptConvert.INSTANCE.convertList(list)); | 67 | + return success(DeptConvert.INSTANCE.convertList(list)); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | @GetMapping("/list-all-simple") | 70 | @GetMapping("/list-all-simple") |
| 71 | @ApiOperation(value = "获取部门精简信息列表", notes = "只包含被开启的部门,主要用于前端的下拉选项") | 71 | @ApiOperation(value = "获取部门精简信息列表", notes = "只包含被开启的部门,主要用于前端的下拉选项") |
| 72 | - public CommonResult<List<SysDeptSimpleRespVO>> getSimpleDepts() { | 72 | + public CommonResult<List<DeptSimpleRespVO>> getSimpleDepts() { |
| 73 | // 获得部门列表,只要开启状态的 | 73 | // 获得部门列表,只要开启状态的 |
| 74 | - SysDeptListReqVO reqVO = new SysDeptListReqVO(); | 74 | + DeptListReqVO reqVO = new DeptListReqVO(); |
| 75 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); | 75 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); |
| 76 | List<SysDeptDO> list = deptService.getSimpleDepts(reqVO); | 76 | List<SysDeptDO> list = deptService.getSimpleDepts(reqVO); |
| 77 | // 排序后,返回给前端 | 77 | // 排序后,返回给前端 |
| 78 | list.sort(Comparator.comparing(SysDeptDO::getSort)); | 78 | list.sort(Comparator.comparing(SysDeptDO::getSort)); |
| 79 | - return success(SysDeptConvert.INSTANCE.convertList02(list)); | 79 | + return success(DeptConvert.INSTANCE.convertList02(list)); |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | @GetMapping("/get") | 82 | @GetMapping("/get") |
| 83 | @ApiOperation("获得部门信息") | 83 | @ApiOperation("获得部门信息") |
| 84 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) | 84 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) |
| 85 | @PreAuthorize("@ss.hasPermission('system:dept:query')") | 85 | @PreAuthorize("@ss.hasPermission('system:dept:query')") |
| 86 | - public CommonResult<SysDeptRespVO> getDept(@RequestParam("id") Long id) { | ||
| 87 | - return success(SysDeptConvert.INSTANCE.convert(deptCoreService.getDept(id))); | 86 | + public CommonResult<DeptRespVO> getDept(@RequestParam("id") Long id) { |
| 87 | + return success(DeptConvert.INSTANCE.convert(deptCoreService.getDept(id))); | ||
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | } | 90 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/SysPostController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 3 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; | 6 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; |
| 7 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | 7 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 8 | -import cn.iocoder.yudao.module.system.controller.dept.vo.post.*; | ||
| 9 | -import cn.iocoder.yudao.module.system.convert.dept.SysPostConvert; | 8 | +import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.*; |
| 9 | +import cn.iocoder.yudao.module.system.convert.dept.PostConvert; | ||
| 10 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO; | 10 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO; |
| 11 | -import cn.iocoder.yudao.module.system.service.dept.SysPostService; | 11 | +import cn.iocoder.yudao.module.system.service.dept.PostService; |
| 12 | import io.swagger.annotations.Api; | 12 | import io.swagger.annotations.Api; |
| 13 | import io.swagger.annotations.ApiImplicitParam; | 13 | import io.swagger.annotations.ApiImplicitParam; |
| 14 | import io.swagger.annotations.ApiOperation; | 14 | import io.swagger.annotations.ApiOperation; |
| @@ -27,19 +27,19 @@ import java.util.List; | @@ -27,19 +27,19 @@ import java.util.List; | ||
| 27 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 27 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 28 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | 28 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 29 | 29 | ||
| 30 | -@Api(tags = "岗位") | 30 | +@Api(tags = "管理后台 - 岗位") |
| 31 | @RestController | 31 | @RestController |
| 32 | @RequestMapping("/system/post") | 32 | @RequestMapping("/system/post") |
| 33 | -@Valid | ||
| 34 | -public class SysPostController { | 33 | +@Validated |
| 34 | +public class PostController { | ||
| 35 | 35 | ||
| 36 | @Resource | 36 | @Resource |
| 37 | - private SysPostService postService; | 37 | + private PostService postService; |
| 38 | 38 | ||
| 39 | @PostMapping("/create") | 39 | @PostMapping("/create") |
| 40 | @ApiOperation("创建岗位") | 40 | @ApiOperation("创建岗位") |
| 41 | @PreAuthorize("@ss.hasPermission('system:post:create')") | 41 | @PreAuthorize("@ss.hasPermission('system:post:create')") |
| 42 | - public CommonResult<Long> createPost(@Valid @RequestBody SysPostCreateReqVO reqVO) { | 42 | + public CommonResult<Long> createPost(@Valid @RequestBody PostCreateReqVO reqVO) { |
| 43 | Long postId = postService.createPost(reqVO); | 43 | Long postId = postService.createPost(reqVO); |
| 44 | return success(postId); | 44 | return success(postId); |
| 45 | } | 45 | } |
| @@ -47,7 +47,7 @@ public class SysPostController { | @@ -47,7 +47,7 @@ public class SysPostController { | ||
| 47 | @PutMapping("/update") | 47 | @PutMapping("/update") |
| 48 | @ApiOperation("修改岗位") | 48 | @ApiOperation("修改岗位") |
| 49 | @PreAuthorize("@ss.hasPermission('system:post:update')") | 49 | @PreAuthorize("@ss.hasPermission('system:post:update')") |
| 50 | - public CommonResult<Boolean> updatePost(@Valid @RequestBody SysPostUpdateReqVO reqVO) { | 50 | + public CommonResult<Boolean> updatePost(@Valid @RequestBody PostUpdateReqVO reqVO) { |
| 51 | postService.updatePost(reqVO); | 51 | postService.updatePost(reqVO); |
| 52 | return success(true); | 52 | return success(true); |
| 53 | } | 53 | } |
| @@ -64,36 +64,36 @@ public class SysPostController { | @@ -64,36 +64,36 @@ public class SysPostController { | ||
| 64 | @ApiOperation("获得岗位信息") | 64 | @ApiOperation("获得岗位信息") |
| 65 | @ApiImplicitParam(name = "id", value = "岗位编号", required = true, example = "1024", dataTypeClass = Long.class) | 65 | @ApiImplicitParam(name = "id", value = "岗位编号", required = true, example = "1024", dataTypeClass = Long.class) |
| 66 | @PreAuthorize("@ss.hasPermission('system:post:query')") | 66 | @PreAuthorize("@ss.hasPermission('system:post:query')") |
| 67 | - public CommonResult<SysPostRespVO> getPost(@RequestParam("id") Long id) { | ||
| 68 | - return success(SysPostConvert.INSTANCE.convert(postService.getPost(id))); | 67 | + public CommonResult<PostRespVO> getPost(@RequestParam("id") Long id) { |
| 68 | + return success(PostConvert.INSTANCE.convert(postService.getPost(id))); | ||
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | @GetMapping("/list-all-simple") | 71 | @GetMapping("/list-all-simple") |
| 72 | @ApiOperation(value = "获取岗位精简信息列表", notes = "只包含被开启的岗位,主要用于前端的下拉选项") | 72 | @ApiOperation(value = "获取岗位精简信息列表", notes = "只包含被开启的岗位,主要用于前端的下拉选项") |
| 73 | - public CommonResult<List<SysPostSimpleRespVO>> getSimplePosts() { | 73 | + public CommonResult<List<PostSimpleRespVO>> getSimplePosts() { |
| 74 | // 获得岗位列表,只要开启状态的 | 74 | // 获得岗位列表,只要开启状态的 |
| 75 | List<SysPostDO> list = postService.getPosts(null, Collections.singleton(CommonStatusEnum.ENABLE.getStatus())); | 75 | List<SysPostDO> list = postService.getPosts(null, Collections.singleton(CommonStatusEnum.ENABLE.getStatus())); |
| 76 | // 排序后,返回给前端 | 76 | // 排序后,返回给前端 |
| 77 | list.sort(Comparator.comparing(SysPostDO::getSort)); | 77 | list.sort(Comparator.comparing(SysPostDO::getSort)); |
| 78 | - return success(SysPostConvert.INSTANCE.convertList02(list)); | 78 | + return success(PostConvert.INSTANCE.convertList02(list)); |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | @GetMapping("/page") | 81 | @GetMapping("/page") |
| 82 | @ApiOperation("获得岗位分页列表") | 82 | @ApiOperation("获得岗位分页列表") |
| 83 | @PreAuthorize("@ss.hasPermission('system:post:query')") | 83 | @PreAuthorize("@ss.hasPermission('system:post:query')") |
| 84 | - public CommonResult<PageResult<SysPostRespVO>> getPostPage(@Validated SysPostPageReqVO reqVO) { | ||
| 85 | - return success(SysPostConvert.INSTANCE.convertPage(postService.getPostPage(reqVO))); | 84 | + public CommonResult<PageResult<PostRespVO>> getPostPage(@Validated PostPageReqVO reqVO) { |
| 85 | + return success(PostConvert.INSTANCE.convertPage(postService.getPostPage(reqVO))); | ||
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | @GetMapping("/export") | 88 | @GetMapping("/export") |
| 89 | @ApiOperation("岗位管理") | 89 | @ApiOperation("岗位管理") |
| 90 | @PreAuthorize("@ss.hasPermission('system:post:export')") | 90 | @PreAuthorize("@ss.hasPermission('system:post:export')") |
| 91 | @OperateLog(type = EXPORT) | 91 | @OperateLog(type = EXPORT) |
| 92 | - public void export(HttpServletResponse response, @Validated SysPostExportReqVO reqVO) throws IOException { | 92 | + public void export(HttpServletResponse response, @Validated PostExportReqVO reqVO) throws IOException { |
| 93 | List<SysPostDO> posts = postService.getPosts(reqVO); | 93 | List<SysPostDO> posts = postService.getPosts(reqVO); |
| 94 | - List<SysPostExcelVO> data = SysPostConvert.INSTANCE.convertList03(posts); | 94 | + List<PostExcelVO> data = PostConvert.INSTANCE.convertList03(posts); |
| 95 | // 输出 | 95 | // 输出 |
| 96 | - ExcelUtils.write(response, "岗位数据.xls", "岗位列表", SysPostExcelVO.class, data); | 96 | + ExcelUtils.write(response, "岗位数据.xls", "岗位列表", PostExcelVO.class, data); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | } | 99 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/dept/SysDeptBaseVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptBaseVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.dept; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModelProperty; | 3 | import io.swagger.annotations.ApiModelProperty; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| @@ -13,7 +13,7 @@ import javax.validation.constraints.Size; | @@ -13,7 +13,7 @@ import javax.validation.constraints.Size; | ||
| 13 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | 13 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 |
| 14 | */ | 14 | */ |
| 15 | @Data | 15 | @Data |
| 16 | -public class SysDeptBaseVO { | 16 | +public class DeptBaseVO { |
| 17 | 17 | ||
| 18 | @ApiModelProperty(value = "菜单名称", required = true, example = "芋道") | 18 | @ApiModelProperty(value = "菜单名称", required = true, example = "芋道") |
| 19 | @NotBlank(message = "部门名称不能为空") | 19 | @NotBlank(message = "部门名称不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/dept/SysDeptCreateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptCreateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.dept; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | import lombok.EqualsAndHashCode; | 5 | import lombok.EqualsAndHashCode; |
| 6 | import lombok.ToString; | 6 | import lombok.ToString; |
| 7 | 7 | ||
| 8 | -@ApiModel("部门创建 Request VO") | 8 | +@ApiModel("管理后台 - 部门创建 Request VO") |
| 9 | @Data | 9 | @Data |
| 10 | @EqualsAndHashCode(callSuper = true) | 10 | @EqualsAndHashCode(callSuper = true) |
| 11 | @ToString(callSuper = true) | 11 | @ToString(callSuper = true) |
| 12 | -public class SysDeptCreateReqVO extends SysDeptBaseVO { | 12 | +public class DeptCreateReqVO extends DeptBaseVO { |
| 13 | } | 13 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/dept/SysDeptListReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.dept; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| 5 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | 6 | ||
| 7 | -@ApiModel("部门列表 Request VO") | 7 | +@ApiModel("管理后台 - 部门列表 Request VO") |
| 8 | @Data | 8 | @Data |
| 9 | -public class SysDeptListReqVO { | 9 | +public class DeptListReqVO { |
| 10 | 10 | ||
| 11 | @ApiModelProperty(value = "部门名称", example = "芋道", notes = "模糊匹配") | 11 | @ApiModelProperty(value = "部门名称", example = "芋道", notes = "模糊匹配") |
| 12 | private String name; | 12 | private String name; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/dept/SysDeptRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.dept; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | ||
| 7 | 7 | ||
| 8 | import java.util.Date; | 8 | import java.util.Date; |
| 9 | 9 | ||
| 10 | -@ApiModel("部门信息 Response VO") | 10 | +@ApiModel("管理后台 - 部门信息 Response VO") |
| 11 | @Data | 11 | @Data |
| 12 | @EqualsAndHashCode(callSuper = true) | 12 | @EqualsAndHashCode(callSuper = true) |
| 13 | -public class SysDeptRespVO extends SysDeptBaseVO { | 13 | +public class DeptRespVO extends DeptBaseVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "部门编号", required = true, example = "1024") | 15 | @ApiModelProperty(value = "部门编号", required = true, example = "1024") |
| 16 | private Long id; | 16 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/dept/SysDeptSimpleRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.dept; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -6,11 +6,11 @@ import lombok.AllArgsConstructor; | @@ -6,11 +6,11 @@ import lombok.AllArgsConstructor; | ||
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
| 8 | 8 | ||
| 9 | -@ApiModel("部门精简信息 Response VO") | 9 | +@ApiModel("管理后台 - 部门精简信息 Response VO") |
| 10 | @Data | 10 | @Data |
| 11 | @NoArgsConstructor | 11 | @NoArgsConstructor |
| 12 | @AllArgsConstructor | 12 | @AllArgsConstructor |
| 13 | -public class SysDeptSimpleRespVO { | 13 | +public class DeptSimpleRespVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "部门编号", required = true, example = "1024") | 15 | @ApiModelProperty(value = "部门编号", required = true, example = "1024") |
| 16 | private Long id; | 16 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/dept/SysDeptUpdateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptUpdateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.dept; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | ||
| 7 | 7 | ||
| 8 | import javax.validation.constraints.NotNull; | 8 | import javax.validation.constraints.NotNull; |
| 9 | 9 | ||
| 10 | -@ApiModel("部门更新 Request VO") | 10 | +@ApiModel("管理后台 - 部门更新 Request VO") |
| 11 | @Data | 11 | @Data |
| 12 | @EqualsAndHashCode(callSuper = true) | 12 | @EqualsAndHashCode(callSuper = true) |
| 13 | -public class SysDeptUpdateReqVO extends SysDeptBaseVO { | 13 | +public class DeptUpdateReqVO extends DeptBaseVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "部门编号", required = true, example = "1024") | 15 | @ApiModelProperty(value = "部门编号", required = true, example = "1024") |
| 16 | @NotNull(message = "部门编号不能为空") | 16 | @NotNull(message = "部门编号不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/post/SysPostBaseVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostBaseVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.post; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModelProperty; | 3 | import io.swagger.annotations.ApiModelProperty; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| @@ -12,7 +12,7 @@ import javax.validation.constraints.Size; | @@ -12,7 +12,7 @@ import javax.validation.constraints.Size; | ||
| 12 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | 12 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 |
| 13 | */ | 13 | */ |
| 14 | @Data | 14 | @Data |
| 15 | -public class SysPostBaseVO { | 15 | +public class PostBaseVO { |
| 16 | 16 | ||
| 17 | @ApiModelProperty(value = "岗位名称", required = true, example = "小博主") | 17 | @ApiModelProperty(value = "岗位名称", required = true, example = "小博主") |
| 18 | @NotBlank(message = "岗位名称不能为空") | 18 | @NotBlank(message = "岗位名称不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/post/SysPostCreateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostCreateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.post; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | import lombok.EqualsAndHashCode; | 5 | import lombok.EqualsAndHashCode; |
| 6 | 6 | ||
| 7 | -@ApiModel("岗位创建 Request VO") | 7 | +@ApiModel("管理后台 - 岗位创建 Request VO") |
| 8 | @Data | 8 | @Data |
| 9 | @EqualsAndHashCode(callSuper = true) | 9 | @EqualsAndHashCode(callSuper = true) |
| 10 | -public class SysPostCreateReqVO extends SysPostBaseVO { | 10 | +public class PostCreateReqVO extends PostBaseVO { |
| 11 | } | 11 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/post/SysPostExcelVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExcelVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.post; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| @@ -10,7 +10,7 @@ import lombok.Data; | @@ -10,7 +10,7 @@ import lombok.Data; | ||
| 10 | * 岗位 Excel 导出响应 VO | 10 | * 岗位 Excel 导出响应 VO |
| 11 | */ | 11 | */ |
| 12 | @Data | 12 | @Data |
| 13 | -public class SysPostExcelVO { | 13 | +public class PostExcelVO { |
| 14 | 14 | ||
| 15 | @ExcelProperty("岗位序号") | 15 | @ExcelProperty("岗位序号") |
| 16 | private Long id; | 16 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/post/SysPostExportReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostExportReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.post; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| 5 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | 6 | ||
| 7 | -@ApiModel(value = "岗位导出 Request VO", description = "参数和 SysPostExcelVO 是一致的") | 7 | +@ApiModel(value = "管理后台 - 岗位导出 Request VO", description = "参数和 SysPostExcelVO 是一致的") |
| 8 | @Data | 8 | @Data |
| 9 | -public class SysPostExportReqVO { | 9 | +public class PostExportReqVO { |
| 10 | 10 | ||
| 11 | @ApiModelProperty(value = "岗位编码", example = "yudao", notes = "模糊匹配") | 11 | @ApiModelProperty(value = "岗位编码", example = "yudao", notes = "模糊匹配") |
| 12 | private String code; | 12 | private String code; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/post/SysPostListReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostListReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.post; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| 5 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | import lombok.EqualsAndHashCode; | 6 | import lombok.EqualsAndHashCode; |
| 7 | 7 | ||
| 8 | -@ApiModel("岗位列表 Request VO") | 8 | +@ApiModel("管理后台 - 岗位列表 Request VO") |
| 9 | @Data | 9 | @Data |
| 10 | @EqualsAndHashCode(callSuper = true) | 10 | @EqualsAndHashCode(callSuper = true) |
| 11 | -public class SysPostListReqVO extends SysPostBaseVO { | 11 | +public class PostListReqVO extends PostBaseVO { |
| 12 | 12 | ||
| 13 | @ApiModelProperty(value = "岗位名称", example = "芋道", notes = "模糊匹配") | 13 | @ApiModelProperty(value = "岗位名称", example = "芋道", notes = "模糊匹配") |
| 14 | private String name; | 14 | private String name; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/post/SysPostPageReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostPageReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.post; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 4 | import io.swagger.annotations.ApiModel; | 4 | import io.swagger.annotations.ApiModel; |
| @@ -6,10 +6,10 @@ import io.swagger.annotations.ApiModelProperty; | @@ -6,10 +6,10 @@ import io.swagger.annotations.ApiModelProperty; | ||
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | import lombok.EqualsAndHashCode; | 7 | import lombok.EqualsAndHashCode; |
| 8 | 8 | ||
| 9 | -@ApiModel("岗位分页 Request VO") | 9 | +@ApiModel("管理后台 - 岗位分页 Request VO") |
| 10 | @Data | 10 | @Data |
| 11 | @EqualsAndHashCode(callSuper = true) | 11 | @EqualsAndHashCode(callSuper = true) |
| 12 | -public class SysPostPageReqVO extends PageParam { | 12 | +public class PostPageReqVO extends PageParam { |
| 13 | 13 | ||
| 14 | @ApiModelProperty(value = "岗位编码", example = "yudao", notes = "模糊匹配") | 14 | @ApiModelProperty(value = "岗位编码", example = "yudao", notes = "模糊匹配") |
| 15 | private String code; | 15 | private String code; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/post/SysPostRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.post; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | ||
| 7 | 7 | ||
| 8 | import java.util.Date; | 8 | import java.util.Date; |
| 9 | 9 | ||
| 10 | -@ApiModel("岗位信息 Response VO") | 10 | +@ApiModel("管理后台 - 岗位信息 Response VO") |
| 11 | @Data | 11 | @Data |
| 12 | @EqualsAndHashCode(callSuper = true) | 12 | @EqualsAndHashCode(callSuper = true) |
| 13 | -public class SysPostRespVO extends SysPostBaseVO { | 13 | +public class PostRespVO extends PostBaseVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "岗位序号", required = true, example = "1024") | 15 | @ApiModelProperty(value = "岗位序号", required = true, example = "1024") |
| 16 | private Long id; | 16 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/post/SysPostSimpleRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSimpleRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.post; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -6,11 +6,11 @@ import lombok.AllArgsConstructor; | @@ -6,11 +6,11 @@ import lombok.AllArgsConstructor; | ||
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
| 8 | 8 | ||
| 9 | -@ApiModel("岗位精简信息 Response VO") | 9 | +@ApiModel("管理后台 - 岗位精简信息 Response VO") |
| 10 | @Data | 10 | @Data |
| 11 | @NoArgsConstructor | 11 | @NoArgsConstructor |
| 12 | @AllArgsConstructor | 12 | @AllArgsConstructor |
| 13 | -public class SysPostSimpleRespVO { | 13 | +public class PostSimpleRespVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "岗位编号", required = true, example = "1024") | 15 | @ApiModelProperty(value = "岗位编号", required = true, example = "1024") |
| 16 | private Long id; | 16 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dept/vo/post/SysPostUpdateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostUpdateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dept.vo.post; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dept.vo.post; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | ||
| 7 | 7 | ||
| 8 | import javax.validation.constraints.NotNull; | 8 | import javax.validation.constraints.NotNull; |
| 9 | 9 | ||
| 10 | -@ApiModel("岗位更新 Request VO") | 10 | +@ApiModel("管理后台 - 岗位更新 Request VO") |
| 11 | @Data | 11 | @Data |
| 12 | @EqualsAndHashCode(callSuper = true) | 12 | @EqualsAndHashCode(callSuper = true) |
| 13 | -public class SysPostUpdateReqVO extends SysPostBaseVO { | 13 | +public class PostUpdateReqVO extends PostBaseVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "岗位编号", required = true, example = "1024") | 15 | @ApiModelProperty(value = "岗位编号", required = true, example = "1024") |
| 16 | @NotNull(message = "岗位编号不能为空") | 16 | @NotNull(message = "岗位编号不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.http
0 → 100644
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/SysDictDataController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dict.SysDictDataDO; | 3 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dict.SysDictDataDO; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; | 6 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; |
| 7 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | 7 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 8 | -import cn.iocoder.yudao.module.system.controller.dict.vo.data.*; | ||
| 9 | -import cn.iocoder.yudao.module.system.convert.dict.SysDictDataConvert; | ||
| 10 | -import cn.iocoder.yudao.module.system.service.dict.SysDictDataService; | 8 | +import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.*; |
| 9 | +import cn.iocoder.yudao.module.system.convert.dict.DictDataConvert; | ||
| 10 | +import cn.iocoder.yudao.module.system.service.dict.DictDataService; | ||
| 11 | import io.swagger.annotations.Api; | 11 | import io.swagger.annotations.Api; |
| 12 | import io.swagger.annotations.ApiImplicitParam; | 12 | import io.swagger.annotations.ApiImplicitParam; |
| 13 | import io.swagger.annotations.ApiOperation; | 13 | import io.swagger.annotations.ApiOperation; |
| @@ -24,19 +24,19 @@ import java.util.List; | @@ -24,19 +24,19 @@ import java.util.List; | ||
| 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 25 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | 25 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | ||
| 27 | -@Api(tags = "字典数据") | 27 | +@Api(tags = "管理后台 - 字典数据") |
| 28 | @RestController | 28 | @RestController |
| 29 | @RequestMapping("/system/dict-data") | 29 | @RequestMapping("/system/dict-data") |
| 30 | @Validated | 30 | @Validated |
| 31 | -public class SysDictDataController { | 31 | +public class DictDataController { |
| 32 | 32 | ||
| 33 | @Resource | 33 | @Resource |
| 34 | - private SysDictDataService dictDataService; | 34 | + private DictDataService dictDataService; |
| 35 | 35 | ||
| 36 | @PostMapping("/create") | 36 | @PostMapping("/create") |
| 37 | @ApiOperation("新增字典数据") | 37 | @ApiOperation("新增字典数据") |
| 38 | @PreAuthorize("@ss.hasPermission('system:dict:create')") | 38 | @PreAuthorize("@ss.hasPermission('system:dict:create')") |
| 39 | - public CommonResult<Long> createDictData(@Valid @RequestBody SysDictDataCreateReqVO reqVO) { | 39 | + public CommonResult<Long> createDictData(@Valid @RequestBody DictDataCreateReqVO reqVO) { |
| 40 | Long dictDataId = dictDataService.createDictData(reqVO); | 40 | Long dictDataId = dictDataService.createDictData(reqVO); |
| 41 | return success(dictDataId); | 41 | return success(dictDataId); |
| 42 | } | 42 | } |
| @@ -44,7 +44,7 @@ public class SysDictDataController { | @@ -44,7 +44,7 @@ public class SysDictDataController { | ||
| 44 | @PutMapping("update") | 44 | @PutMapping("update") |
| 45 | @ApiOperation("修改字典数据") | 45 | @ApiOperation("修改字典数据") |
| 46 | @PreAuthorize("@ss.hasPermission('system:dict:update')") | 46 | @PreAuthorize("@ss.hasPermission('system:dict:update')") |
| 47 | - public CommonResult<Boolean> updateDictData(@Valid @RequestBody SysDictDataUpdateReqVO reqVO) { | 47 | + public CommonResult<Boolean> updateDictData(@Valid @RequestBody DictDataUpdateReqVO reqVO) { |
| 48 | dictDataService.updateDictData(reqVO); | 48 | dictDataService.updateDictData(reqVO); |
| 49 | return success(true); | 49 | return success(true); |
| 50 | } | 50 | } |
| @@ -61,35 +61,35 @@ public class SysDictDataController { | @@ -61,35 +61,35 @@ public class SysDictDataController { | ||
| 61 | @GetMapping("/list-all-simple") | 61 | @GetMapping("/list-all-simple") |
| 62 | @ApiOperation(value = "获得全部字典数据列表", notes = "一般用于管理后台缓存字典数据在本地") | 62 | @ApiOperation(value = "获得全部字典数据列表", notes = "一般用于管理后台缓存字典数据在本地") |
| 63 | // 无需添加权限认证,因为前端全局都需要 | 63 | // 无需添加权限认证,因为前端全局都需要 |
| 64 | - public CommonResult<List<SysDictDataSimpleRespVO>> getSimpleDictDatas() { | 64 | + public CommonResult<List<DictDataSimpleRespVO>> getSimpleDictDatas() { |
| 65 | List<SysDictDataDO> list = dictDataService.getDictDatas(); | 65 | List<SysDictDataDO> list = dictDataService.getDictDatas(); |
| 66 | - return success(SysDictDataConvert.INSTANCE.convertList(list)); | 66 | + return success(DictDataConvert.INSTANCE.convertList(list)); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | @GetMapping("/page") | 69 | @GetMapping("/page") |
| 70 | @ApiOperation("/获得字典类型的分页列表") | 70 | @ApiOperation("/获得字典类型的分页列表") |
| 71 | @PreAuthorize("@ss.hasPermission('system:dict:query')") | 71 | @PreAuthorize("@ss.hasPermission('system:dict:query')") |
| 72 | - public CommonResult<PageResult<SysDictDataRespVO>> getDictTypePage(@Valid SysDictDataPageReqVO reqVO) { | ||
| 73 | - return success(SysDictDataConvert.INSTANCE.convertPage(dictDataService.getDictDataPage(reqVO))); | 72 | + public CommonResult<PageResult<DictDataRespVO>> getDictTypePage(@Valid DictDataPageReqVO reqVO) { |
| 73 | + return success(DictDataConvert.INSTANCE.convertPage(dictDataService.getDictDataPage(reqVO))); | ||
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | @GetMapping(value = "/get") | 76 | @GetMapping(value = "/get") |
| 77 | @ApiOperation("/查询字典数据详细") | 77 | @ApiOperation("/查询字典数据详细") |
| 78 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) | 78 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) |
| 79 | @PreAuthorize("@ss.hasPermission('system:dict:query')") | 79 | @PreAuthorize("@ss.hasPermission('system:dict:query')") |
| 80 | - public CommonResult<SysDictDataRespVO> getDictData(@RequestParam("id") Long id) { | ||
| 81 | - return success(SysDictDataConvert.INSTANCE.convert(dictDataService.getDictData(id))); | 80 | + public CommonResult<DictDataRespVO> getDictData(@RequestParam("id") Long id) { |
| 81 | + return success(DictDataConvert.INSTANCE.convert(dictDataService.getDictData(id))); | ||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | @GetMapping("/export") | 84 | @GetMapping("/export") |
| 85 | @ApiOperation("导出字典数据") | 85 | @ApiOperation("导出字典数据") |
| 86 | @PreAuthorize("@ss.hasPermission('system:dict:export')") | 86 | @PreAuthorize("@ss.hasPermission('system:dict:export')") |
| 87 | @OperateLog(type = EXPORT) | 87 | @OperateLog(type = EXPORT) |
| 88 | - public void export(HttpServletResponse response, @Valid SysDictDataExportReqVO reqVO) throws IOException { | 88 | + public void export(HttpServletResponse response, @Valid DictDataExportReqVO reqVO) throws IOException { |
| 89 | List<SysDictDataDO> list = dictDataService.getDictDatas(reqVO); | 89 | List<SysDictDataDO> list = dictDataService.getDictDatas(reqVO); |
| 90 | - List<SysDictDataExcelVO> data = SysDictDataConvert.INSTANCE.convertList02(list); | 90 | + List<DictDataExcelVO> data = DictDataConvert.INSTANCE.convertList02(list); |
| 91 | // 输出 | 91 | // 输出 |
| 92 | - ExcelUtils.write(response, "字典数据.xls", "数据列表", SysDictDataExcelVO.class, data); | 92 | + ExcelUtils.write(response, "字典数据.xls", "数据列表", DictDataExcelVO.class, data); |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | } | 95 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/SysDictTypeController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; |
| 6 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | 6 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | -import cn.iocoder.yudao.module.system.controller.dict.vo.type.*; | ||
| 8 | -import cn.iocoder.yudao.module.system.convert.dict.SysDictTypeConvert; | ||
| 9 | -import cn.iocoder.yudao.module.system.dal.dataobject.dict.SysDictTypeDO; | ||
| 10 | -import cn.iocoder.yudao.module.system.service.dict.SysDictTypeService; | 7 | +import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.*; |
| 8 | +import cn.iocoder.yudao.module.system.convert.dict.DictTypeConvert; | ||
| 9 | +import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; | ||
| 10 | +import cn.iocoder.yudao.module.system.service.dict.DictTypeService; | ||
| 11 | import io.swagger.annotations.Api; | 11 | import io.swagger.annotations.Api; |
| 12 | import io.swagger.annotations.ApiImplicitParam; | 12 | import io.swagger.annotations.ApiImplicitParam; |
| 13 | import io.swagger.annotations.ApiOperation; | 13 | import io.swagger.annotations.ApiOperation; |
| @@ -24,19 +24,19 @@ import java.util.List; | @@ -24,19 +24,19 @@ import java.util.List; | ||
| 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 25 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | 25 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | ||
| 27 | -@Api(tags = "字典类型") | 27 | +@Api(tags = "管理后台 - 字典类型") |
| 28 | @RestController | 28 | @RestController |
| 29 | @RequestMapping("/system/dict-type") | 29 | @RequestMapping("/system/dict-type") |
| 30 | @Validated | 30 | @Validated |
| 31 | -public class SysDictTypeController { | 31 | +public class DictTypeController { |
| 32 | 32 | ||
| 33 | @Resource | 33 | @Resource |
| 34 | - private SysDictTypeService dictTypeService; | 34 | + private DictTypeService dictTypeService; |
| 35 | 35 | ||
| 36 | @PostMapping("/create") | 36 | @PostMapping("/create") |
| 37 | @ApiOperation("创建字典类型") | 37 | @ApiOperation("创建字典类型") |
| 38 | @PreAuthorize("@ss.hasPermission('system:dict:create')") | 38 | @PreAuthorize("@ss.hasPermission('system:dict:create')") |
| 39 | - public CommonResult<Long> createDictType(@Valid @RequestBody SysDictTypeCreateReqVO reqVO) { | 39 | + public CommonResult<Long> createDictType(@Valid @RequestBody DictTypeCreateReqVO reqVO) { |
| 40 | Long dictTypeId = dictTypeService.createDictType(reqVO); | 40 | Long dictTypeId = dictTypeService.createDictType(reqVO); |
| 41 | return success(dictTypeId); | 41 | return success(dictTypeId); |
| 42 | } | 42 | } |
| @@ -44,7 +44,7 @@ public class SysDictTypeController { | @@ -44,7 +44,7 @@ public class SysDictTypeController { | ||
| 44 | @PutMapping("/update") | 44 | @PutMapping("/update") |
| 45 | @ApiOperation("修改字典类型") | 45 | @ApiOperation("修改字典类型") |
| 46 | @PreAuthorize("@ss.hasPermission('system:dict:update')") | 46 | @PreAuthorize("@ss.hasPermission('system:dict:update')") |
| 47 | - public CommonResult<Boolean> updateDictType(@Valid @RequestBody SysDictTypeUpdateReqVO reqVO) { | 47 | + public CommonResult<Boolean> updateDictType(@Valid @RequestBody DictTypeUpdateReqVO reqVO) { |
| 48 | dictTypeService.updateDictType(reqVO); | 48 | dictTypeService.updateDictType(reqVO); |
| 49 | return success(true); | 49 | return success(true); |
| 50 | } | 50 | } |
| @@ -61,35 +61,35 @@ public class SysDictTypeController { | @@ -61,35 +61,35 @@ public class SysDictTypeController { | ||
| 61 | @ApiOperation("/获得字典类型的分页列表") | 61 | @ApiOperation("/获得字典类型的分页列表") |
| 62 | @GetMapping("/page") | 62 | @GetMapping("/page") |
| 63 | @PreAuthorize("@ss.hasPermission('system:dict:query')") | 63 | @PreAuthorize("@ss.hasPermission('system:dict:query')") |
| 64 | - public CommonResult<PageResult<SysDictTypeRespVO>> pageDictTypes(@Valid SysDictTypePageReqVO reqVO) { | ||
| 65 | - return success(SysDictTypeConvert.INSTANCE.convertPage(dictTypeService.getDictTypePage(reqVO))); | 64 | + public CommonResult<PageResult<DictTypeRespVO>> pageDictTypes(@Valid DictTypePageReqVO reqVO) { |
| 65 | + return success(DictTypeConvert.INSTANCE.convertPage(dictTypeService.getDictTypePage(reqVO))); | ||
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | @ApiOperation("/查询字典类型详细") | 68 | @ApiOperation("/查询字典类型详细") |
| 69 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) | 69 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) |
| 70 | @GetMapping(value = "/get") | 70 | @GetMapping(value = "/get") |
| 71 | @PreAuthorize("@ss.hasPermission('system:dict:query')") | 71 | @PreAuthorize("@ss.hasPermission('system:dict:query')") |
| 72 | - public CommonResult<SysDictTypeRespVO> getDictType(@RequestParam("id") Long id) { | ||
| 73 | - return success(SysDictTypeConvert.INSTANCE.convert(dictTypeService.getDictType(id))); | 72 | + public CommonResult<DictTypeRespVO> getDictType(@RequestParam("id") Long id) { |
| 73 | + return success(DictTypeConvert.INSTANCE.convert(dictTypeService.getDictType(id))); | ||
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | @GetMapping("/list-all-simple") | 76 | @GetMapping("/list-all-simple") |
| 77 | @ApiOperation(value = "获得全部字典类型列表", notes = "包括开启 + 禁用的字典类型,主要用于前端的下拉选项") | 77 | @ApiOperation(value = "获得全部字典类型列表", notes = "包括开启 + 禁用的字典类型,主要用于前端的下拉选项") |
| 78 | // 无需添加权限认证,因为前端全局都需要 | 78 | // 无需添加权限认证,因为前端全局都需要 |
| 79 | - public CommonResult<List<SysDictTypeSimpleRespVO>> listSimpleDictTypes() { | ||
| 80 | - List<SysDictTypeDO> list = dictTypeService.getDictTypeList(); | ||
| 81 | - return success(SysDictTypeConvert.INSTANCE.convertList(list)); | 79 | + public CommonResult<List<DictTypeSimpleRespVO>> listSimpleDictTypes() { |
| 80 | + List<DictTypeDO> list = dictTypeService.getDictTypeList(); | ||
| 81 | + return success(DictTypeConvert.INSTANCE.convertList(list)); | ||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | @ApiOperation("导出数据类型") | 84 | @ApiOperation("导出数据类型") |
| 85 | @GetMapping("/export") | 85 | @GetMapping("/export") |
| 86 | @PreAuthorize("@ss.hasPermission('system:dict:query')") | 86 | @PreAuthorize("@ss.hasPermission('system:dict:query')") |
| 87 | @OperateLog(type = EXPORT) | 87 | @OperateLog(type = EXPORT) |
| 88 | - public void export(HttpServletResponse response, @Valid SysDictTypeExportReqVO reqVO) throws IOException { | ||
| 89 | - List<SysDictTypeDO> list = dictTypeService.getDictTypeList(reqVO); | ||
| 90 | - List<SysDictTypeExcelVO> data = SysDictTypeConvert.INSTANCE.convertList02(list); | 88 | + public void export(HttpServletResponse response, @Valid DictTypeExportReqVO reqVO) throws IOException { |
| 89 | + List<DictTypeDO> list = dictTypeService.getDictTypeList(reqVO); | ||
| 90 | + List<DictTypeExcelVO> data = DictTypeConvert.INSTANCE.convertList02(list); | ||
| 91 | // 输出 | 91 | // 输出 |
| 92 | - ExcelUtils.write(response, "字典类型.xls", "类型列表", SysDictTypeExcelVO.class, data); | 92 | + ExcelUtils.write(response, "字典类型.xls", "类型列表", DictTypeExcelVO.class, data); |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | } | 95 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/data/SysDictDataBaseVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataBaseVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.data; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModelProperty; | 3 | import io.swagger.annotations.ApiModelProperty; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| @@ -12,7 +12,7 @@ import javax.validation.constraints.Size; | @@ -12,7 +12,7 @@ import javax.validation.constraints.Size; | ||
| 12 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | 12 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 |
| 13 | */ | 13 | */ |
| 14 | @Data | 14 | @Data |
| 15 | -public class SysDictDataBaseVO { | 15 | +public class DictDataBaseVO { |
| 16 | 16 | ||
| 17 | @ApiModelProperty(value = "显示顺序不能为空", required = true, example = "1024") | 17 | @ApiModelProperty(value = "显示顺序不能为空", required = true, example = "1024") |
| 18 | @NotNull(message = "显示顺序不能为空") | 18 | @NotNull(message = "显示顺序不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/data/SysDictDataCreateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataCreateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.data; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | import lombok.EqualsAndHashCode; | 5 | import lombok.EqualsAndHashCode; |
| 6 | 6 | ||
| 7 | -@ApiModel("字典数据创建 Request VO") | 7 | +@ApiModel("管理后台 - 字典数据创建 Request VO") |
| 8 | @Data | 8 | @Data |
| 9 | @EqualsAndHashCode(callSuper = true) | 9 | @EqualsAndHashCode(callSuper = true) |
| 10 | -public class SysDictDataCreateReqVO extends SysDictDataBaseVO { | 10 | +public class DictDataCreateReqVO extends DictDataBaseVO { |
| 11 | 11 | ||
| 12 | } | 12 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/data/SysDictDataExcelVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataExcelVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.data; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| @@ -10,7 +10,7 @@ import lombok.Data; | @@ -10,7 +10,7 @@ import lombok.Data; | ||
| 10 | * 字典数据 Excel 导出响应 VO | 10 | * 字典数据 Excel 导出响应 VO |
| 11 | */ | 11 | */ |
| 12 | @Data | 12 | @Data |
| 13 | -public class SysDictDataExcelVO { | 13 | +public class DictDataExcelVO { |
| 14 | 14 | ||
| 15 | @ExcelProperty("字典编码") | 15 | @ExcelProperty("字典编码") |
| 16 | private Long id; | 16 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/data/SysDictDataExportReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataExportReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.data; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -6,9 +6,9 @@ import lombok.Data; | @@ -6,9 +6,9 @@ import lombok.Data; | ||
| 6 | 6 | ||
| 7 | import javax.validation.constraints.Size; | 7 | import javax.validation.constraints.Size; |
| 8 | 8 | ||
| 9 | -@ApiModel("字典类型导出 Request VO") | 9 | +@ApiModel("管理后台 - 字典类型导出 Request VO") |
| 10 | @Data | 10 | @Data |
| 11 | -public class SysDictDataExportReqVO { | 11 | +public class DictDataExportReqVO { |
| 12 | 12 | ||
| 13 | @ApiModelProperty(value = "字典标签", example = "芋道") | 13 | @ApiModelProperty(value = "字典标签", example = "芋道") |
| 14 | @Size(max = 100, message = "字典标签长度不能超过100个字符") | 14 | @Size(max = 100, message = "字典标签长度不能超过100个字符") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/data/SysDictDataPageReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.data; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 4 | import io.swagger.annotations.ApiModel; | 4 | import io.swagger.annotations.ApiModel; |
| @@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode; | @@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode; | ||
| 8 | 8 | ||
| 9 | import javax.validation.constraints.Size; | 9 | import javax.validation.constraints.Size; |
| 10 | 10 | ||
| 11 | -@ApiModel("字典类型分页列表 Request VO") | 11 | +@ApiModel("管理后台 - 字典类型分页列表 Request VO") |
| 12 | @Data | 12 | @Data |
| 13 | @EqualsAndHashCode(callSuper = true) | 13 | @EqualsAndHashCode(callSuper = true) |
| 14 | -public class SysDictDataPageReqVO extends PageParam { | 14 | +public class DictDataPageReqVO extends PageParam { |
| 15 | 15 | ||
| 16 | @ApiModelProperty(value = "字典标签", example = "芋道") | 16 | @ApiModelProperty(value = "字典标签", example = "芋道") |
| 17 | @Size(max = 100, message = "字典标签长度不能超过100个字符") | 17 | @Size(max = 100, message = "字典标签长度不能超过100个字符") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/data/SysDictDataRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.data; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -9,12 +9,12 @@ import lombok.NoArgsConstructor; | @@ -9,12 +9,12 @@ import lombok.NoArgsConstructor; | ||
| 9 | 9 | ||
| 10 | import java.util.Date; | 10 | import java.util.Date; |
| 11 | 11 | ||
| 12 | -@ApiModel("字典数据信息 Response VO") | 12 | +@ApiModel("管理后台 - 字典数据信息 Response VO") |
| 13 | @Data | 13 | @Data |
| 14 | @NoArgsConstructor | 14 | @NoArgsConstructor |
| 15 | @AllArgsConstructor | 15 | @AllArgsConstructor |
| 16 | @EqualsAndHashCode(callSuper = true) | 16 | @EqualsAndHashCode(callSuper = true) |
| 17 | -public class SysDictDataRespVO extends SysDictDataBaseVO { | 17 | +public class DictDataRespVO extends DictDataBaseVO { |
| 18 | 18 | ||
| 19 | @ApiModelProperty(value = "字典数据编号", required = true, example = "1024") | 19 | @ApiModelProperty(value = "字典数据编号", required = true, example = "1024") |
| 20 | private Long id; | 20 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/data/SysDictDataSimpleRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSimpleRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.data; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| 5 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | 6 | ||
| 7 | -@ApiModel("数据字典精简 Response VO") | 7 | +@ApiModel("管理后台 - 数据字典精简 Response VO") |
| 8 | @Data | 8 | @Data |
| 9 | -public class SysDictDataSimpleRespVO { | 9 | +public class DictDataSimpleRespVO { |
| 10 | 10 | ||
| 11 | @ApiModelProperty(value = "字典类型", required = true, example = "gender") | 11 | @ApiModelProperty(value = "字典类型", required = true, example = "gender") |
| 12 | private String dictType; | 12 | private String dictType; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/data/SysDictDataUpdateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataUpdateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.data; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.data; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | ||
| 7 | 7 | ||
| 8 | import javax.validation.constraints.NotNull; | 8 | import javax.validation.constraints.NotNull; |
| 9 | 9 | ||
| 10 | -@ApiModel("字典数据更新 Request VO") | 10 | +@ApiModel("管理后台 - 字典数据更新 Request VO") |
| 11 | @Data | 11 | @Data |
| 12 | @EqualsAndHashCode(callSuper = true) | 12 | @EqualsAndHashCode(callSuper = true) |
| 13 | -public class SysDictDataUpdateReqVO extends SysDictDataBaseVO { | 13 | +public class DictDataUpdateReqVO extends DictDataBaseVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "字典数据编号", required = true, example = "1024") | 15 | @ApiModelProperty(value = "字典数据编号", required = true, example = "1024") |
| 16 | @NotNull(message = "字典数据编号不能为空") | 16 | @NotNull(message = "字典数据编号不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/type/SysDictTypeBaseVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeBaseVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.type; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModelProperty; | 3 | import io.swagger.annotations.ApiModelProperty; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| @@ -12,7 +12,7 @@ import javax.validation.constraints.Size; | @@ -12,7 +12,7 @@ import javax.validation.constraints.Size; | ||
| 12 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | 12 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 |
| 13 | */ | 13 | */ |
| 14 | @Data | 14 | @Data |
| 15 | -public class SysDictTypeBaseVO { | 15 | +public class DictTypeBaseVO { |
| 16 | 16 | ||
| 17 | @ApiModelProperty(value = "字典名称", required = true, example = "性别") | 17 | @ApiModelProperty(value = "字典名称", required = true, example = "性别") |
| 18 | @NotBlank(message = "字典名称不能为空") | 18 | @NotBlank(message = "字典名称不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/type/SysDictTypeCreateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeCreateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.type; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode; | @@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode; | ||
| 8 | import javax.validation.constraints.NotNull; | 8 | import javax.validation.constraints.NotNull; |
| 9 | import javax.validation.constraints.Size; | 9 | import javax.validation.constraints.Size; |
| 10 | 10 | ||
| 11 | -@ApiModel("字典类型创建 Request VO") | 11 | +@ApiModel("管理后台 - 字典类型创建 Request VO") |
| 12 | @Data | 12 | @Data |
| 13 | @EqualsAndHashCode(callSuper = true) | 13 | @EqualsAndHashCode(callSuper = true) |
| 14 | -public class SysDictTypeCreateReqVO extends SysDictTypeBaseVO { | 14 | +public class DictTypeCreateReqVO extends DictTypeBaseVO { |
| 15 | 15 | ||
| 16 | @ApiModelProperty(value = "字典类型", required = true, example = "sys_common_sex") | 16 | @ApiModelProperty(value = "字典类型", required = true, example = "sys_common_sex") |
| 17 | @NotNull(message = "字典类型不能为空") | 17 | @NotNull(message = "字典类型不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/type/SysDictTypeExcelVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeExcelVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.type; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| @@ -10,7 +10,7 @@ import lombok.Data; | @@ -10,7 +10,7 @@ import lombok.Data; | ||
| 10 | * 字典类型 Excel 导出响应 VO | 10 | * 字典类型 Excel 导出响应 VO |
| 11 | */ | 11 | */ |
| 12 | @Data | 12 | @Data |
| 13 | -public class SysDictTypeExcelVO { | 13 | +public class DictTypeExcelVO { |
| 14 | 14 | ||
| 15 | @ExcelProperty("字典主键") | 15 | @ExcelProperty("字典主键") |
| 16 | private Long id; | 16 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/type/SysDictTypeExportReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeExportReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.type; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -9,9 +9,9 @@ import java.util.Date; | @@ -9,9 +9,9 @@ import java.util.Date; | ||
| 9 | 9 | ||
| 10 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | 10 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| 11 | 11 | ||
| 12 | -@ApiModel("字典类型分页列表 Request VO") | 12 | +@ApiModel("管理后台 - 字典类型分页列表 Request VO") |
| 13 | @Data | 13 | @Data |
| 14 | -public class SysDictTypeExportReqVO { | 14 | +public class DictTypeExportReqVO { |
| 15 | 15 | ||
| 16 | @ApiModelProperty(value = "字典类型名称", example = "芋道", notes = "模糊匹配") | 16 | @ApiModelProperty(value = "字典类型名称", example = "芋道", notes = "模糊匹配") |
| 17 | private String name; | 17 | private String name; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/type/SysDictTypePageReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.type; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 4 | import io.swagger.annotations.ApiModel; | 4 | import io.swagger.annotations.ApiModel; |
| @@ -12,10 +12,10 @@ import java.util.Date; | @@ -12,10 +12,10 @@ import java.util.Date; | ||
| 12 | 12 | ||
| 13 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | 13 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| 14 | 14 | ||
| 15 | -@ApiModel("字典类型分页列表 Request VO") | 15 | +@ApiModel("管理后台 - 字典类型分页列表 Request VO") |
| 16 | @Data | 16 | @Data |
| 17 | @EqualsAndHashCode(callSuper = true) | 17 | @EqualsAndHashCode(callSuper = true) |
| 18 | -public class SysDictTypePageReqVO extends PageParam { | 18 | +public class DictTypePageReqVO extends PageParam { |
| 19 | 19 | ||
| 20 | @ApiModelProperty(value = "字典类型名称", example = "芋道", notes = "模糊匹配") | 20 | @ApiModelProperty(value = "字典类型名称", example = "芋道", notes = "模糊匹配") |
| 21 | private String name; | 21 | private String name; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/type/SysDictTypeRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.type; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -9,12 +9,12 @@ import lombok.NoArgsConstructor; | @@ -9,12 +9,12 @@ import lombok.NoArgsConstructor; | ||
| 9 | 9 | ||
| 10 | import java.util.Date; | 10 | import java.util.Date; |
| 11 | 11 | ||
| 12 | -@ApiModel("字典类型信息 Response VO") | 12 | +@ApiModel("管理后台 - 字典类型信息 Response VO") |
| 13 | @Data | 13 | @Data |
| 14 | @NoArgsConstructor | 14 | @NoArgsConstructor |
| 15 | @AllArgsConstructor | 15 | @AllArgsConstructor |
| 16 | @EqualsAndHashCode(callSuper = true) | 16 | @EqualsAndHashCode(callSuper = true) |
| 17 | -public class SysDictTypeRespVO extends SysDictTypeBaseVO { | 17 | +public class DictTypeRespVO extends DictTypeBaseVO { |
| 18 | 18 | ||
| 19 | @ApiModelProperty(value = "字典类型编号", required = true, example = "1024") | 19 | @ApiModelProperty(value = "字典类型编号", required = true, example = "1024") |
| 20 | private Long id; | 20 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/type/SysDictTypeSimpleRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.type; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -6,11 +6,11 @@ import lombok.AllArgsConstructor; | @@ -6,11 +6,11 @@ import lombok.AllArgsConstructor; | ||
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | import lombok.NoArgsConstructor; | 7 | import lombok.NoArgsConstructor; |
| 8 | 8 | ||
| 9 | -@ApiModel("字典类型精简信息 Response VO") | 9 | +@ApiModel("管理后台 - 字典类型精简信息 Response VO") |
| 10 | @Data | 10 | @Data |
| 11 | @NoArgsConstructor | 11 | @NoArgsConstructor |
| 12 | @AllArgsConstructor | 12 | @AllArgsConstructor |
| 13 | -public class SysDictTypeSimpleRespVO { | 13 | +public class DictTypeSimpleRespVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "字典类型编号", required = true, example = "1024") | 15 | @ApiModelProperty(value = "字典类型编号", required = true, example = "1024") |
| 16 | private Long id; | 16 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/dict/vo/type/SysDictTypeUpdateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeUpdateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.dict.vo.type; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.dict.vo.type; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | @@ -7,10 +7,10 @@ import lombok.EqualsAndHashCode; | ||
| 7 | 7 | ||
| 8 | import javax.validation.constraints.NotNull; | 8 | import javax.validation.constraints.NotNull; |
| 9 | 9 | ||
| 10 | -@ApiModel("字典类型更新 Request VO") | 10 | +@ApiModel("管理后台 - 字典类型更新 Request VO") |
| 11 | @Data | 11 | @Data |
| 12 | @EqualsAndHashCode(callSuper = true) | 12 | @EqualsAndHashCode(callSuper = true) |
| 13 | -public class SysDictTypeUpdateReqVO extends SysDictTypeBaseVO { | 13 | +public class DictTypeUpdateReqVO extends DictTypeBaseVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "字典类型编号", required = true, example = "1024") | 15 | @ApiModelProperty(value = "字典类型编号", required = true, example = "1024") |
| 16 | @NotNull(message = "字典类型编号不能为空") | 16 | @NotNull(message = "字典类型编号不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/errorcode/SysErrorCodeController.http renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.http
| 1 | -### | 1 | +### 创建错误码 |
| 2 | POST {{baseUrl}}/inra/error-code/create | 2 | POST {{baseUrl}}/inra/error-code/create |
| 3 | Authorization: Bearer {{token}} | 3 | Authorization: Bearer {{token}} |
| 4 | -Content-Type:application/json | 4 | +Content-Type: application/json |
| 5 | +tenant-id: {{adminTenentId}} | ||
| 5 | 6 | ||
| 6 | { | 7 | { |
| 7 | "code": 200, | 8 | "code": 200, |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/errorcode/SysErrorCodeController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.errorcode; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.errorcode; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; | 5 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; |
| 6 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | 6 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 7 | -import cn.iocoder.yudao.module.system.convert.errorcode.SysErrorCodeConvert; | ||
| 8 | -import cn.iocoder.yudao.module.system.controller.errorcode.vo.*; | ||
| 9 | -import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.SysErrorCodeDO; | ||
| 10 | -import cn.iocoder.yudao.module.system.service.errorcode.SysErrorCodeService; | 7 | +import cn.iocoder.yudao.module.system.convert.errorcode.ErrorCodeConvert; |
| 8 | +import cn.iocoder.yudao.module.system.controller.admin.errorcode.vo.*; | ||
| 9 | +import cn.iocoder.yudao.module.system.dal.dataobject.errorcode.ErrorCodeDO; | ||
| 10 | +import cn.iocoder.yudao.module.system.service.errorcode.ErrorCodeService; | ||
| 11 | import io.swagger.annotations.Api; | 11 | import io.swagger.annotations.Api; |
| 12 | import io.swagger.annotations.ApiImplicitParam; | 12 | import io.swagger.annotations.ApiImplicitParam; |
| 13 | import io.swagger.annotations.ApiOperation; | 13 | import io.swagger.annotations.ApiOperation; |
| @@ -24,26 +24,26 @@ import java.util.List; | @@ -24,26 +24,26 @@ import java.util.List; | ||
| 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 24 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 25 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | 25 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 26 | 26 | ||
| 27 | -@Api(tags = "错误码") | 27 | +@Api(tags = "管理后台 - 错误码") |
| 28 | @RestController | 28 | @RestController |
| 29 | @RequestMapping("/system/error-code") | 29 | @RequestMapping("/system/error-code") |
| 30 | @Validated | 30 | @Validated |
| 31 | -public class SysErrorCodeController { | 31 | +public class ErrorCodeController { |
| 32 | 32 | ||
| 33 | @Resource | 33 | @Resource |
| 34 | - private SysErrorCodeService errorCodeService; | 34 | + private ErrorCodeService errorCodeService; |
| 35 | 35 | ||
| 36 | @PostMapping("/create") | 36 | @PostMapping("/create") |
| 37 | @ApiOperation("创建错误码") | 37 | @ApiOperation("创建错误码") |
| 38 | @PreAuthorize("@ss.hasPermission('system:error-code:create')") | 38 | @PreAuthorize("@ss.hasPermission('system:error-code:create')") |
| 39 | - public CommonResult<Long> createErrorCode(@Valid @RequestBody SysErrorCodeCreateReqVO createReqVO) { | 39 | + public CommonResult<Long> createErrorCode(@Valid @RequestBody ErrorCodeCreateReqVO createReqVO) { |
| 40 | return success(errorCodeService.createErrorCode(createReqVO)); | 40 | return success(errorCodeService.createErrorCode(createReqVO)); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | @PutMapping("/update") | 43 | @PutMapping("/update") |
| 44 | @ApiOperation("更新错误码") | 44 | @ApiOperation("更新错误码") |
| 45 | @PreAuthorize("@ss.hasPermission('system:error-code:update')") | 45 | @PreAuthorize("@ss.hasPermission('system:error-code:update')") |
| 46 | - public CommonResult<Boolean> updateErrorCode(@Valid @RequestBody SysErrorCodeUpdateReqVO updateReqVO) { | 46 | + public CommonResult<Boolean> updateErrorCode(@Valid @RequestBody ErrorCodeUpdateReqVO updateReqVO) { |
| 47 | errorCodeService.updateErrorCode(updateReqVO); | 47 | errorCodeService.updateErrorCode(updateReqVO); |
| 48 | return success(true); | 48 | return success(true); |
| 49 | } | 49 | } |
| @@ -61,29 +61,29 @@ public class SysErrorCodeController { | @@ -61,29 +61,29 @@ public class SysErrorCodeController { | ||
| 61 | @ApiOperation("获得错误码") | 61 | @ApiOperation("获得错误码") |
| 62 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) | 62 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) |
| 63 | @PreAuthorize("@ss.hasPermission('system:error-code:query')") | 63 | @PreAuthorize("@ss.hasPermission('system:error-code:query')") |
| 64 | - public CommonResult<SysErrorCodeRespVO> getErrorCode(@RequestParam("id") Long id) { | ||
| 65 | - SysErrorCodeDO errorCode = errorCodeService.getErrorCode(id); | ||
| 66 | - return success(SysErrorCodeConvert.INSTANCE.convert(errorCode)); | 64 | + public CommonResult<ErrorCodeRespVO> getErrorCode(@RequestParam("id") Long id) { |
| 65 | + ErrorCodeDO errorCode = errorCodeService.getErrorCode(id); | ||
| 66 | + return success(ErrorCodeConvert.INSTANCE.convert(errorCode)); | ||
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | @GetMapping("/page") | 69 | @GetMapping("/page") |
| 70 | @ApiOperation("获得错误码分页") | 70 | @ApiOperation("获得错误码分页") |
| 71 | @PreAuthorize("@ss.hasPermission('system:error-code:query')") | 71 | @PreAuthorize("@ss.hasPermission('system:error-code:query')") |
| 72 | - public CommonResult<PageResult<SysErrorCodeRespVO>> getErrorCodePage(@Valid SysErrorCodePageReqVO pageVO) { | ||
| 73 | - PageResult<SysErrorCodeDO> pageResult = errorCodeService.getErrorCodePage(pageVO); | ||
| 74 | - return success(SysErrorCodeConvert.INSTANCE.convertPage(pageResult)); | 72 | + public CommonResult<PageResult<ErrorCodeRespVO>> getErrorCodePage(@Valid ErrorCodePageReqVO pageVO) { |
| 73 | + PageResult<ErrorCodeDO> pageResult = errorCodeService.getErrorCodePage(pageVO); | ||
| 74 | + return success(ErrorCodeConvert.INSTANCE.convertPage(pageResult)); | ||
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | @GetMapping("/export-excel") | 77 | @GetMapping("/export-excel") |
| 78 | @ApiOperation("导出错误码 Excel") | 78 | @ApiOperation("导出错误码 Excel") |
| 79 | @PreAuthorize("@ss.hasPermission('system:error-code:export')") | 79 | @PreAuthorize("@ss.hasPermission('system:error-code:export')") |
| 80 | @OperateLog(type = EXPORT) | 80 | @OperateLog(type = EXPORT) |
| 81 | - public void exportErrorCodeExcel(@Valid SysErrorCodeExportReqVO exportReqVO, | 81 | + public void exportErrorCodeExcel(@Valid ErrorCodeExportReqVO exportReqVO, |
| 82 | HttpServletResponse response) throws IOException { | 82 | HttpServletResponse response) throws IOException { |
| 83 | - List<SysErrorCodeDO> list = errorCodeService.getErrorCodeList(exportReqVO); | 83 | + List<ErrorCodeDO> list = errorCodeService.getErrorCodeList(exportReqVO); |
| 84 | // 导出 Excel | 84 | // 导出 Excel |
| 85 | - List<SysErrorCodeExcelVO> datas = SysErrorCodeConvert.INSTANCE.convertList02(list); | ||
| 86 | - ExcelUtils.write(response, "错误码.xls", "数据", SysErrorCodeExcelVO.class, datas); | 85 | + List<ErrorCodeExcelVO> datas = ErrorCodeConvert.INSTANCE.convertList02(list); |
| 86 | + ExcelUtils.write(response, "错误码.xls", "数据", ErrorCodeExcelVO.class, datas); | ||
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | } | 89 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/errorcode/vo/SysErrorCodeBaseVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeBaseVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.errorcode.vo; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModelProperty; | 3 | import io.swagger.annotations.ApiModelProperty; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; | @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; | ||
| 10 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | 10 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 |
| 11 | */ | 11 | */ |
| 12 | @Data | 12 | @Data |
| 13 | -public class SysErrorCodeBaseVO { | 13 | +public class ErrorCodeBaseVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "应用名", required = true, example = "dashboard") | 15 | @ApiModelProperty(value = "应用名", required = true, example = "dashboard") |
| 16 | @NotNull(message = "应用名不能为空") | 16 | @NotNull(message = "应用名不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/errorcode/vo/SysErrorCodeCreateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeCreateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.errorcode.vo; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | import lombok.EqualsAndHashCode; | 5 | import lombok.EqualsAndHashCode; |
| 6 | import lombok.ToString; | 6 | import lombok.ToString; |
| 7 | 7 | ||
| 8 | -@ApiModel("错误码创建 Request VO") | 8 | +@ApiModel("管理后台 - 错误码创建 Request VO") |
| 9 | @Data | 9 | @Data |
| 10 | @EqualsAndHashCode(callSuper = true) | 10 | @EqualsAndHashCode(callSuper = true) |
| 11 | @ToString(callSuper = true) | 11 | @ToString(callSuper = true) |
| 12 | -public class SysErrorCodeCreateReqVO extends SysErrorCodeBaseVO { | 12 | +public class ErrorCodeCreateReqVO extends ErrorCodeBaseVO { |
| 13 | 13 | ||
| 14 | } | 14 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/errorcode/vo/SysErrorCodeExcelVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeExcelVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.errorcode.vo; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| @@ -14,7 +14,7 @@ import java.util.Date; | @@ -14,7 +14,7 @@ import java.util.Date; | ||
| 14 | * @author 芋道源码 | 14 | * @author 芋道源码 |
| 15 | */ | 15 | */ |
| 16 | @Data | 16 | @Data |
| 17 | -public class SysErrorCodeExcelVO { | 17 | +public class ErrorCodeExcelVO { |
| 18 | 18 | ||
| 19 | @ExcelProperty("错误码编号") | 19 | @ExcelProperty("错误码编号") |
| 20 | private Long id; | 20 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/errorcode/vo/SysErrorCodeExportReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeExportReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.errorcode.vo; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -9,9 +9,9 @@ import java.util.Date; | @@ -9,9 +9,9 @@ import java.util.Date; | ||
| 9 | 9 | ||
| 10 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | 10 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| 11 | 11 | ||
| 12 | -@ApiModel(value = "错误码 Excel 导出 Request VO", description = "参数和 InfErrorCodePageReqVO 是一致的") | 12 | +@ApiModel(value = "管理后台 - 错误码 Excel 导出 Request VO", description = "参数和 InfErrorCodePageReqVO 是一致的") |
| 13 | @Data | 13 | @Data |
| 14 | -public class SysErrorCodeExportReqVO { | 14 | +public class ErrorCodeExportReqVO { |
| 15 | 15 | ||
| 16 | @ApiModelProperty(value = "错误码类型", example = "1") | 16 | @ApiModelProperty(value = "错误码类型", example = "1") |
| 17 | private Integer type; | 17 | private Integer type; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/errorcode/vo/SysErrorCodePageReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodePageReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.errorcode.vo; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 4 | import io.swagger.annotations.ApiModel; | 4 | import io.swagger.annotations.ApiModel; |
| @@ -12,11 +12,11 @@ import java.util.Date; | @@ -12,11 +12,11 @@ import java.util.Date; | ||
| 12 | 12 | ||
| 13 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | 13 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| 14 | 14 | ||
| 15 | -@ApiModel("错误码分页 Request VO") | 15 | +@ApiModel("管理后台 - 错误码分页 Request VO") |
| 16 | @Data | 16 | @Data |
| 17 | @EqualsAndHashCode(callSuper = true) | 17 | @EqualsAndHashCode(callSuper = true) |
| 18 | @ToString(callSuper = true) | 18 | @ToString(callSuper = true) |
| 19 | -public class SysErrorCodePageReqVO extends PageParam { | 19 | +public class ErrorCodePageReqVO extends PageParam { |
| 20 | 20 | ||
| 21 | @ApiModelProperty(value = "错误码类型", example = "1", notes = "参见 SysErrorCodeTypeEnum 枚举类") | 21 | @ApiModelProperty(value = "错误码类型", example = "1", notes = "参见 SysErrorCodeTypeEnum 枚举类") |
| 22 | private Integer type; | 22 | private Integer type; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/errorcode/vo/SysErrorCodeRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.errorcode.vo; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -8,11 +8,11 @@ import lombok.ToString; | @@ -8,11 +8,11 @@ import lombok.ToString; | ||
| 8 | 8 | ||
| 9 | import java.util.Date; | 9 | import java.util.Date; |
| 10 | 10 | ||
| 11 | -@ApiModel("错误码 Response VO") | 11 | +@ApiModel("管理后台 - 错误码 Response VO") |
| 12 | @Data | 12 | @Data |
| 13 | @EqualsAndHashCode(callSuper = true) | 13 | @EqualsAndHashCode(callSuper = true) |
| 14 | @ToString(callSuper = true) | 14 | @ToString(callSuper = true) |
| 15 | -public class SysErrorCodeRespVO extends SysErrorCodeBaseVO { | 15 | +public class ErrorCodeRespVO extends ErrorCodeBaseVO { |
| 16 | 16 | ||
| 17 | @ApiModelProperty(value = "错误码编号", required = true, example = "1024") | 17 | @ApiModelProperty(value = "错误码编号", required = true, example = "1024") |
| 18 | private Long id; | 18 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/errorcode/vo/SysErrorCodeUpdateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeUpdateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.errorcode.vo; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.errorcode.vo; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -8,11 +8,11 @@ import lombok.ToString; | @@ -8,11 +8,11 @@ import lombok.ToString; | ||
| 8 | 8 | ||
| 9 | import javax.validation.constraints.NotNull; | 9 | import javax.validation.constraints.NotNull; |
| 10 | 10 | ||
| 11 | -@ApiModel("错误码更新 Request VO") | 11 | +@ApiModel("管理后台 - 错误码更新 Request VO") |
| 12 | @Data | 12 | @Data |
| 13 | @EqualsAndHashCode(callSuper = true) | 13 | @EqualsAndHashCode(callSuper = true) |
| 14 | @ToString(callSuper = true) | 14 | @ToString(callSuper = true) |
| 15 | -public class SysErrorCodeUpdateReqVO extends SysErrorCodeBaseVO { | 15 | +public class ErrorCodeUpdateReqVO extends ErrorCodeBaseVO { |
| 16 | 16 | ||
| 17 | @ApiModelProperty(value = "错误码编号", required = true, example = "1024") | 17 | @ApiModelProperty(value = "错误码编号", required = true, example = "1024") |
| 18 | @NotNull(message = "错误码编号不能为空") | 18 | @NotNull(message = "错误码编号不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/SysLoginLogController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.logger.SysLoginLogDO; | 3 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.logger.SysLoginLogDO; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; | 6 | import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; |
| 7 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; | 7 | import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; |
| 8 | -import cn.iocoder.yudao.module.system.controller.logger.vo.loginlog.SysLoginLogExcelVO; | ||
| 9 | -import cn.iocoder.yudao.module.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO; | ||
| 10 | -import cn.iocoder.yudao.module.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO; | ||
| 11 | -import cn.iocoder.yudao.module.system.controller.logger.vo.loginlog.SysLoginLogRespVO; | ||
| 12 | -import cn.iocoder.yudao.module.system.convert.logger.SysLoginLogConvert; | ||
| 13 | -import cn.iocoder.yudao.module.system.service.logger.SysLoginLogService; | 8 | +import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExcelVO; |
| 9 | +import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogExportReqVO; | ||
| 10 | +import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO; | ||
| 11 | +import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogRespVO; | ||
| 12 | +import cn.iocoder.yudao.module.system.convert.logger.LoginLogConvert; | ||
| 13 | +import cn.iocoder.yudao.module.system.service.logger.LoginLogService; | ||
| 14 | import io.swagger.annotations.Api; | 14 | import io.swagger.annotations.Api; |
| 15 | import io.swagger.annotations.ApiOperation; | 15 | import io.swagger.annotations.ApiOperation; |
| 16 | import org.springframework.security.access.prepost.PreAuthorize; | 16 | import org.springframework.security.access.prepost.PreAuthorize; |
| @@ -27,33 +27,33 @@ import java.util.List; | @@ -27,33 +27,33 @@ import java.util.List; | ||
| 27 | 27 | ||
| 28 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | 28 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 29 | 29 | ||
| 30 | -@Api(tags = "登录日志") | 30 | +@Api(tags = "管理后台 - 登录日志") |
| 31 | @RestController | 31 | @RestController |
| 32 | @RequestMapping("/system/login-log") | 32 | @RequestMapping("/system/login-log") |
| 33 | @Validated | 33 | @Validated |
| 34 | -public class SysLoginLogController { | 34 | +public class LoginLogController { |
| 35 | 35 | ||
| 36 | @Resource | 36 | @Resource |
| 37 | - private SysLoginLogService loginLogService; | 37 | + private LoginLogService loginLogService; |
| 38 | 38 | ||
| 39 | @GetMapping("/page") | 39 | @GetMapping("/page") |
| 40 | @ApiOperation("获得登录日志分页列表") | 40 | @ApiOperation("获得登录日志分页列表") |
| 41 | @PreAuthorize("@ss.hasPermission('system:login-log:query')") | 41 | @PreAuthorize("@ss.hasPermission('system:login-log:query')") |
| 42 | - public CommonResult<PageResult<SysLoginLogRespVO>> getLoginLogPage(@Valid SysLoginLogPageReqVO reqVO) { | 42 | + public CommonResult<PageResult<LoginLogRespVO>> getLoginLogPage(@Valid LoginLogPageReqVO reqVO) { |
| 43 | PageResult<SysLoginLogDO> page = loginLogService.getLoginLogPage(reqVO); | 43 | PageResult<SysLoginLogDO> page = loginLogService.getLoginLogPage(reqVO); |
| 44 | - return CommonResult.success(SysLoginLogConvert.INSTANCE.convertPage(page)); | 44 | + return CommonResult.success(LoginLogConvert.INSTANCE.convertPage(page)); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | @GetMapping("/export") | 47 | @GetMapping("/export") |
| 48 | @ApiOperation("导出登录日志 Excel") | 48 | @ApiOperation("导出登录日志 Excel") |
| 49 | @PreAuthorize("@ss.hasPermission('system:login-log:export')") | 49 | @PreAuthorize("@ss.hasPermission('system:login-log:export')") |
| 50 | @OperateLog(type = EXPORT) | 50 | @OperateLog(type = EXPORT) |
| 51 | - public void exportLoginLog(HttpServletResponse response, @Valid SysLoginLogExportReqVO reqVO) throws IOException { | 51 | + public void exportLoginLog(HttpServletResponse response, @Valid LoginLogExportReqVO reqVO) throws IOException { |
| 52 | List<SysLoginLogDO> list = loginLogService.getLoginLogList(reqVO); | 52 | List<SysLoginLogDO> list = loginLogService.getLoginLogList(reqVO); |
| 53 | // 拼接数据 | 53 | // 拼接数据 |
| 54 | - List<SysLoginLogExcelVO> data = SysLoginLogConvert.INSTANCE.convertList(list); | 54 | + List<LoginLogExcelVO> data = LoginLogConvert.INSTANCE.convertList(list); |
| 55 | // 输出 | 55 | // 输出 |
| 56 | - ExcelUtils.write(response, "登录日志.xls", "数据列表", SysLoginLogExcelVO.class, data); | 56 | + ExcelUtils.write(response, "登录日志.xls", "数据列表", LoginLogExcelVO.class, data); |
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | } | 59 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.http
0 → 100644
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/SysOperateLogController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.module.system.controller.logger.vo.operatelog.SysOperateLogExcelVO; | ||
| 4 | -import cn.iocoder.yudao.module.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO; | ||
| 5 | -import cn.iocoder.yudao.module.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO; | ||
| 6 | -import cn.iocoder.yudao.module.system.controller.logger.vo.operatelog.SysOperateLogRespVO; | ||
| 7 | -import cn.iocoder.yudao.module.system.convert.logger.SysOperateLogConvert; | ||
| 8 | -import cn.iocoder.yudao.module.system.dal.dataobject.logger.SysOperateLogDO; | ||
| 9 | -import cn.iocoder.yudao.module.system.service.logger.SysOperateLogService; | 3 | +import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExcelVO; |
| 4 | +import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogExportReqVO; | ||
| 5 | +import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO; | ||
| 6 | +import cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog.OperateLogRespVO; | ||
| 7 | +import cn.iocoder.yudao.module.system.convert.logger.OperateLogConvert; | ||
| 8 | +import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogDO; | ||
| 9 | +import cn.iocoder.yudao.module.system.service.logger.OperateLogService; | ||
| 10 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; | 10 | import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; |
| 11 | import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService; | 11 | import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService; |
| 12 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 12 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| @@ -35,30 +35,30 @@ import java.util.Map; | @@ -35,30 +35,30 @@ import java.util.Map; | ||
| 35 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 35 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 36 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; | 36 | import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; |
| 37 | 37 | ||
| 38 | -@Api(tags = "操作日志") | 38 | +@Api(tags = "管理后台 - 操作日志") |
| 39 | @RestController | 39 | @RestController |
| 40 | @RequestMapping("/system/operate-log") | 40 | @RequestMapping("/system/operate-log") |
| 41 | @Validated | 41 | @Validated |
| 42 | -public class SysOperateLogController { | 42 | +public class OperateLogController { |
| 43 | 43 | ||
| 44 | @Resource | 44 | @Resource |
| 45 | - private SysOperateLogService operateLogService; | 45 | + private OperateLogService operateLogService; |
| 46 | @Resource | 46 | @Resource |
| 47 | private SysUserCoreService userCoreService; | 47 | private SysUserCoreService userCoreService; |
| 48 | 48 | ||
| 49 | @GetMapping("/page") | 49 | @GetMapping("/page") |
| 50 | @ApiOperation("查看操作日志分页列表") | 50 | @ApiOperation("查看操作日志分页列表") |
| 51 | @PreAuthorize("@ss.hasPermission('system:operate-log:query')") | 51 | @PreAuthorize("@ss.hasPermission('system:operate-log:query')") |
| 52 | - public CommonResult<PageResult<SysOperateLogRespVO>> pageOperateLog(@Valid SysOperateLogPageReqVO reqVO) { | ||
| 53 | - PageResult<SysOperateLogDO> pageResult = operateLogService.getOperateLogPage(reqVO); | 52 | + public CommonResult<PageResult<OperateLogRespVO>> pageOperateLog(@Valid OperateLogPageReqVO reqVO) { |
| 53 | + PageResult<OperateLogDO> pageResult = operateLogService.getOperateLogPage(reqVO); | ||
| 54 | 54 | ||
| 55 | // 获得拼接需要的数据 | 55 | // 获得拼接需要的数据 |
| 56 | - Collection<Long> userIds = CollectionUtils.convertList(pageResult.getList(), SysOperateLogDO::getUserId); | 56 | + Collection<Long> userIds = CollectionUtils.convertList(pageResult.getList(), OperateLogDO::getUserId); |
| 57 | Map<Long, SysUserDO> userMap = userCoreService.getUserMap(userIds); | 57 | Map<Long, SysUserDO> userMap = userCoreService.getUserMap(userIds); |
| 58 | // 拼接数据 | 58 | // 拼接数据 |
| 59 | - List<SysOperateLogRespVO> list = new ArrayList<>(pageResult.getList().size()); | 59 | + List<OperateLogRespVO> list = new ArrayList<>(pageResult.getList().size()); |
| 60 | pageResult.getList().forEach(operateLog -> { | 60 | pageResult.getList().forEach(operateLog -> { |
| 61 | - SysOperateLogRespVO respVO = SysOperateLogConvert.INSTANCE.convert(operateLog); | 61 | + OperateLogRespVO respVO = OperateLogConvert.INSTANCE.convert(operateLog); |
| 62 | list.add(respVO); | 62 | list.add(respVO); |
| 63 | // 拼接用户信息 | 63 | // 拼接用户信息 |
| 64 | MapUtils.findAndThen(userMap, operateLog.getUserId(), user -> respVO.setUserNickname(user.getNickname())); | 64 | MapUtils.findAndThen(userMap, operateLog.getUserId(), user -> respVO.setUserNickname(user.getNickname())); |
| @@ -70,16 +70,16 @@ public class SysOperateLogController { | @@ -70,16 +70,16 @@ public class SysOperateLogController { | ||
| 70 | @GetMapping("/export") | 70 | @GetMapping("/export") |
| 71 | @PreAuthorize("@ss.hasPermission('system:operate-log:export')") | 71 | @PreAuthorize("@ss.hasPermission('system:operate-log:export')") |
| 72 | @OperateLog(type = EXPORT) | 72 | @OperateLog(type = EXPORT) |
| 73 | - public void exportOperateLog(HttpServletResponse response, @Valid SysOperateLogExportReqVO reqVO) throws IOException { | ||
| 74 | - List<SysOperateLogDO> list = operateLogService.getOperateLogs(reqVO); | 73 | + public void exportOperateLog(HttpServletResponse response, @Valid OperateLogExportReqVO reqVO) throws IOException { |
| 74 | + List<OperateLogDO> list = operateLogService.getOperateLogs(reqVO); | ||
| 75 | 75 | ||
| 76 | // 获得拼接需要的数据 | 76 | // 获得拼接需要的数据 |
| 77 | - Collection<Long> userIds = CollectionUtils.convertList(list, SysOperateLogDO::getUserId); | 77 | + Collection<Long> userIds = CollectionUtils.convertList(list, OperateLogDO::getUserId); |
| 78 | Map<Long, SysUserDO> userMap = userCoreService.getUserMap(userIds); | 78 | Map<Long, SysUserDO> userMap = userCoreService.getUserMap(userIds); |
| 79 | // 拼接数据 | 79 | // 拼接数据 |
| 80 | - List<SysOperateLogExcelVO> excelDataList = SysOperateLogConvert.INSTANCE.convertList(list, userMap); | 80 | + List<OperateLogExcelVO> excelDataList = OperateLogConvert.INSTANCE.convertList(list, userMap); |
| 81 | // 输出 | 81 | // 输出 |
| 82 | - ExcelUtils.write(response, "操作日志.xls", "数据列表", SysOperateLogExcelVO.class, excelDataList); | 82 | + ExcelUtils.write(response, "操作日志.xls", "数据列表", OperateLogExcelVO.class, excelDataList); |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | } | 85 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/vo/loginlog/SysLoginLogBaseVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogBaseVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger.vo.loginlog; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModelProperty; | 3 | import io.swagger.annotations.ApiModelProperty; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| @@ -13,7 +13,7 @@ import javax.validation.constraints.Size; | @@ -13,7 +13,7 @@ import javax.validation.constraints.Size; | ||
| 13 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | 13 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 |
| 14 | */ | 14 | */ |
| 15 | @Data | 15 | @Data |
| 16 | -public class SysLoginLogBaseVO { | 16 | +public class LoginLogBaseVO { |
| 17 | 17 | ||
| 18 | @ApiModelProperty(value = "日志类型", required = true, example = "1", notes = "参见 SysLoginLogTypeEnum 枚举类") | 18 | @ApiModelProperty(value = "日志类型", required = true, example = "1", notes = "参见 SysLoginLogTypeEnum 枚举类") |
| 19 | @NotNull(message = "日志类型不能为空") | 19 | @NotNull(message = "日志类型不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogExcelVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger.vo.loginlog; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| @@ -12,7 +12,7 @@ import java.util.Date; | @@ -12,7 +12,7 @@ import java.util.Date; | ||
| 12 | * 登录日志 Excel 导出响应 VO | 12 | * 登录日志 Excel 导出响应 VO |
| 13 | */ | 13 | */ |
| 14 | @Data | 14 | @Data |
| 15 | -public class SysLoginLogExcelVO { | 15 | +public class LoginLogExcelVO { |
| 16 | 16 | ||
| 17 | @ExcelProperty("日志主键") | 17 | @ExcelProperty("日志主键") |
| 18 | private Long id; | 18 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/vo/loginlog/SysLoginLogExportReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogExportReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger.vo.loginlog; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -9,9 +9,9 @@ import java.util.Date; | @@ -9,9 +9,9 @@ import java.util.Date; | ||
| 9 | 9 | ||
| 10 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | 10 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| 11 | 11 | ||
| 12 | -@ApiModel("登录日志分页列表 Request VO") | 12 | +@ApiModel("管理后台 - 登录日志分页列表 Request VO") |
| 13 | @Data | 13 | @Data |
| 14 | -public class SysLoginLogExportReqVO { | 14 | +public class LoginLogExportReqVO { |
| 15 | 15 | ||
| 16 | @ApiModelProperty(value = "用户 IP", example = "127.0.0.1", notes = "模拟匹配") | 16 | @ApiModelProperty(value = "用户 IP", example = "127.0.0.1", notes = "模拟匹配") |
| 17 | private String userIp; | 17 | private String userIp; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/vo/loginlog/SysLoginLogPageReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger.vo.loginlog; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 4 | import io.swagger.annotations.ApiModel; | 4 | import io.swagger.annotations.ApiModel; |
| @@ -11,10 +11,10 @@ import java.util.Date; | @@ -11,10 +11,10 @@ import java.util.Date; | ||
| 11 | 11 | ||
| 12 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | 12 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| 13 | 13 | ||
| 14 | -@ApiModel("登录日志分页列表 Request VO") | 14 | +@ApiModel("管理后台 - 登录日志分页列表 Request VO") |
| 15 | @Data | 15 | @Data |
| 16 | @EqualsAndHashCode(callSuper = true) | 16 | @EqualsAndHashCode(callSuper = true) |
| 17 | -public class SysLoginLogPageReqVO extends PageParam { | 17 | +public class LoginLogPageReqVO extends PageParam { |
| 18 | 18 | ||
| 19 | @ApiModelProperty(value = "用户 IP", example = "127.0.0.1", notes = "模拟匹配") | 19 | @ApiModelProperty(value = "用户 IP", example = "127.0.0.1", notes = "模拟匹配") |
| 20 | private String userIp; | 20 | private String userIp; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/vo/loginlog/SysLoginLogRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger.vo.loginlog; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -9,11 +9,11 @@ import lombok.ToString; | @@ -9,11 +9,11 @@ import lombok.ToString; | ||
| 9 | import javax.validation.constraints.NotNull; | 9 | import javax.validation.constraints.NotNull; |
| 10 | import java.util.Date; | 10 | import java.util.Date; |
| 11 | 11 | ||
| 12 | -@ApiModel("登录日志 Response VO") | 12 | +@ApiModel("管理后台 - 登录日志 Response VO") |
| 13 | @Data | 13 | @Data |
| 14 | @EqualsAndHashCode(callSuper = true) | 14 | @EqualsAndHashCode(callSuper = true) |
| 15 | @ToString(callSuper = true) | 15 | @ToString(callSuper = true) |
| 16 | -public class SysLoginLogRespVO extends SysLoginLogBaseVO { | 16 | +public class LoginLogRespVO extends LoginLogBaseVO { |
| 17 | 17 | ||
| 18 | @ApiModelProperty(value = "日志编号", required = true, example = "1024") | 18 | @ApiModelProperty(value = "日志编号", required = true, example = "1024") |
| 19 | private Long id; | 19 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/vo/operatelog/SysOperateLogBaseVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogBaseVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger.vo.operatelog; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModelProperty; | 3 | import io.swagger.annotations.ApiModelProperty; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| @@ -13,7 +13,7 @@ import java.util.Map; | @@ -13,7 +13,7 @@ import java.util.Map; | ||
| 13 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | 13 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 |
| 14 | */ | 14 | */ |
| 15 | @Data | 15 | @Data |
| 16 | -public class SysOperateLogBaseVO { | 16 | +public class OperateLogBaseVO { |
| 17 | 17 | ||
| 18 | @ApiModelProperty(value = "链路追踪编号", required = true, example = "89aca178-a370-411c-ae02-3f0d672be4ab") | 18 | @ApiModelProperty(value = "链路追踪编号", required = true, example = "89aca178-a370-411c-ae02-3f0d672be4ab") |
| 19 | @NotEmpty(message = "链路追踪编号不能为空") | 19 | @NotEmpty(message = "链路追踪编号不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogExcelVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger.vo.operatelog; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; | 3 | import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; |
| 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; | 4 | import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; |
| @@ -12,7 +12,7 @@ import java.util.Date; | @@ -12,7 +12,7 @@ import java.util.Date; | ||
| 12 | * 操作日志 Excel 导出响应 VO | 12 | * 操作日志 Excel 导出响应 VO |
| 13 | */ | 13 | */ |
| 14 | @Data | 14 | @Data |
| 15 | -public class SysOperateLogExcelVO { | 15 | +public class OperateLogExcelVO { |
| 16 | 16 | ||
| 17 | @ExcelProperty("日志编号") | 17 | @ExcelProperty("日志编号") |
| 18 | private Long id; | 18 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/vo/operatelog/SysOperateLogExportReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogExportReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger.vo.operatelog; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -9,9 +9,9 @@ import java.util.Date; | @@ -9,9 +9,9 @@ import java.util.Date; | ||
| 9 | 9 | ||
| 10 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | 10 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| 11 | 11 | ||
| 12 | -@ApiModel("操作日志分页列表 Request VO") | 12 | +@ApiModel("管理后台 - 操作日志分页列表 Request VO") |
| 13 | @Data | 13 | @Data |
| 14 | -public class SysOperateLogExportReqVO { | 14 | +public class OperateLogExportReqVO { |
| 15 | 15 | ||
| 16 | @ApiModelProperty(value = "操作模块", example = "订单", notes = "模拟匹配") | 16 | @ApiModelProperty(value = "操作模块", example = "订单", notes = "模拟匹配") |
| 17 | private String module; | 17 | private String module; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/vo/operatelog/SysOperateLogPageReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger.vo.operatelog; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageParam; |
| 4 | import io.swagger.annotations.ApiModel; | 4 | import io.swagger.annotations.ApiModel; |
| @@ -10,9 +10,9 @@ import java.util.Date; | @@ -10,9 +10,9 @@ import java.util.Date; | ||
| 10 | 10 | ||
| 11 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | 11 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
| 12 | 12 | ||
| 13 | -@ApiModel("操作日志分页列表 Request VO") | 13 | +@ApiModel("管理后台 - 操作日志分页列表 Request VO") |
| 14 | @Data | 14 | @Data |
| 15 | -public class SysOperateLogPageReqVO extends PageParam { | 15 | +public class OperateLogPageReqVO extends PageParam { |
| 16 | 16 | ||
| 17 | @ApiModelProperty(value = "操作模块", example = "订单", notes = "模拟匹配") | 17 | @ApiModelProperty(value = "操作模块", example = "订单", notes = "模拟匹配") |
| 18 | private String module; | 18 | private String module; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/logger/vo/operatelog/SysOperateLogRespVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.logger.vo.operatelog; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.logger.vo.operatelog; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
| @@ -6,11 +6,11 @@ import lombok.Data; | @@ -6,11 +6,11 @@ import lombok.Data; | ||
| 6 | import lombok.EqualsAndHashCode; | 6 | import lombok.EqualsAndHashCode; |
| 7 | import lombok.ToString; | 7 | import lombok.ToString; |
| 8 | 8 | ||
| 9 | -@ApiModel("操作日志 Response VO") | 9 | +@ApiModel("管理后台 - 操作日志 Response VO") |
| 10 | @Data | 10 | @Data |
| 11 | @EqualsAndHashCode(callSuper = true) | 11 | @EqualsAndHashCode(callSuper = true) |
| 12 | @ToString(callSuper = true) | 12 | @ToString(callSuper = true) |
| 13 | -public class SysOperateLogRespVO extends SysOperateLogBaseVO { | 13 | +public class OperateLogRespVO extends OperateLogBaseVO { |
| 14 | 14 | ||
| 15 | @ApiModelProperty(value = "日志编号", required = true, example = "1024") | 15 | @ApiModelProperty(value = "日志编号", required = true, example = "1024") |
| 16 | private Long id; | 16 | private Long id; |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/notice/SysNoticeController.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
| 1 | -package cn.iocoder.yudao.module.system.controller.notice; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.notice; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | -import cn.iocoder.yudao.module.system.controller.notice.vo.SysNoticeCreateReqVO; | ||
| 6 | -import cn.iocoder.yudao.module.system.controller.notice.vo.SysNoticePageReqVO; | ||
| 7 | -import cn.iocoder.yudao.module.system.controller.notice.vo.SysNoticeRespVO; | ||
| 8 | -import cn.iocoder.yudao.module.system.controller.notice.vo.SysNoticeUpdateReqVO; | ||
| 9 | -import cn.iocoder.yudao.module.system.convert.notice.SysNoticeConvert; | ||
| 10 | -import cn.iocoder.yudao.module.system.service.notice.SysNoticeService; | 5 | +import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeCreateReqVO; |
| 6 | +import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticePageReqVO; | ||
| 7 | +import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeRespVO; | ||
| 8 | +import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeUpdateReqVO; | ||
| 9 | +import cn.iocoder.yudao.module.system.convert.notice.NoticeConvert; | ||
| 10 | +import cn.iocoder.yudao.module.system.service.notice.NoticeService; | ||
| 11 | import io.swagger.annotations.Api; | 11 | import io.swagger.annotations.Api; |
| 12 | import io.swagger.annotations.ApiImplicitParam; | 12 | import io.swagger.annotations.ApiImplicitParam; |
| 13 | import io.swagger.annotations.ApiOperation; | 13 | import io.swagger.annotations.ApiOperation; |
| @@ -20,19 +20,19 @@ import javax.validation.Valid; | @@ -20,19 +20,19 @@ import javax.validation.Valid; | ||
| 20 | 20 | ||
| 21 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | 21 | import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; |
| 22 | 22 | ||
| 23 | -@Api(tags = "通知公告") | 23 | +@Api(tags = "管理后台 - 通知公告") |
| 24 | @RestController | 24 | @RestController |
| 25 | @RequestMapping("/system/notice") | 25 | @RequestMapping("/system/notice") |
| 26 | @Validated | 26 | @Validated |
| 27 | -public class SysNoticeController { | 27 | +public class NoticeController { |
| 28 | 28 | ||
| 29 | @Resource | 29 | @Resource |
| 30 | - private SysNoticeService noticeService; | 30 | + private NoticeService noticeService; |
| 31 | 31 | ||
| 32 | @PostMapping("/create") | 32 | @PostMapping("/create") |
| 33 | @ApiOperation("创建通知公告") | 33 | @ApiOperation("创建通知公告") |
| 34 | @PreAuthorize("@ss.hasPermission('system:notice:create')") | 34 | @PreAuthorize("@ss.hasPermission('system:notice:create')") |
| 35 | - public CommonResult<Long> createNotice(@Valid @RequestBody SysNoticeCreateReqVO reqVO) { | 35 | + public CommonResult<Long> createNotice(@Valid @RequestBody NoticeCreateReqVO reqVO) { |
| 36 | Long noticeId = noticeService.createNotice(reqVO); | 36 | Long noticeId = noticeService.createNotice(reqVO); |
| 37 | return success(noticeId); | 37 | return success(noticeId); |
| 38 | } | 38 | } |
| @@ -40,7 +40,7 @@ public class SysNoticeController { | @@ -40,7 +40,7 @@ public class SysNoticeController { | ||
| 40 | @PutMapping("/update") | 40 | @PutMapping("/update") |
| 41 | @ApiOperation("修改通知公告") | 41 | @ApiOperation("修改通知公告") |
| 42 | @PreAuthorize("@ss.hasPermission('system:notice:update')") | 42 | @PreAuthorize("@ss.hasPermission('system:notice:update')") |
| 43 | - public CommonResult<Boolean> updateNotice(@Valid @RequestBody SysNoticeUpdateReqVO reqVO) { | 43 | + public CommonResult<Boolean> updateNotice(@Valid @RequestBody NoticeUpdateReqVO reqVO) { |
| 44 | noticeService.updateNotice(reqVO); | 44 | noticeService.updateNotice(reqVO); |
| 45 | return success(true); | 45 | return success(true); |
| 46 | } | 46 | } |
| @@ -57,16 +57,16 @@ public class SysNoticeController { | @@ -57,16 +57,16 @@ public class SysNoticeController { | ||
| 57 | @GetMapping("/page") | 57 | @GetMapping("/page") |
| 58 | @ApiOperation("获取通知公告列表") | 58 | @ApiOperation("获取通知公告列表") |
| 59 | @PreAuthorize("@ss.hasPermission('system:notice:query')") | 59 | @PreAuthorize("@ss.hasPermission('system:notice:query')") |
| 60 | - public CommonResult<PageResult<SysNoticeRespVO>> pageNotices(@Validated SysNoticePageReqVO reqVO) { | ||
| 61 | - return success(SysNoticeConvert.INSTANCE.convertPage(noticeService.pageNotices(reqVO))); | 60 | + public CommonResult<PageResult<NoticeRespVO>> pageNotices(@Validated NoticePageReqVO reqVO) { |
| 61 | + return success(NoticeConvert.INSTANCE.convertPage(noticeService.pageNotices(reqVO))); | ||
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | @GetMapping("/get") | 64 | @GetMapping("/get") |
| 65 | @ApiOperation("获得通知公告") | 65 | @ApiOperation("获得通知公告") |
| 66 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) | 66 | @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) |
| 67 | @PreAuthorize("@ss.hasPermission('system:notice:query')") | 67 | @PreAuthorize("@ss.hasPermission('system:notice:query')") |
| 68 | - public CommonResult<SysNoticeRespVO> getNotice(@RequestParam("id") Long id) { | ||
| 69 | - return success(SysNoticeConvert.INSTANCE.convert(noticeService.getNotice(id))); | 68 | + public CommonResult<NoticeRespVO> getNotice(@RequestParam("id") Long id) { |
| 69 | + return success(NoticeConvert.INSTANCE.convert(noticeService.getNotice(id))); | ||
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | } | 72 | } |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/notice/vo/SysNoticeBaseVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeBaseVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.notice.vo; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.notice.vo; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModelProperty; | 3 | import io.swagger.annotations.ApiModelProperty; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| @@ -12,7 +12,7 @@ import javax.validation.constraints.Size; | @@ -12,7 +12,7 @@ import javax.validation.constraints.Size; | ||
| 12 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | 12 | * 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 |
| 13 | */ | 13 | */ |
| 14 | @Data | 14 | @Data |
| 15 | -public class SysNoticeBaseVO { | 15 | +public class NoticeBaseVO { |
| 16 | 16 | ||
| 17 | @ApiModelProperty(value = "公告标题", required = true, example = "小博主") | 17 | @ApiModelProperty(value = "公告标题", required = true, example = "小博主") |
| 18 | @NotBlank(message = "公告标题不能为空") | 18 | @NotBlank(message = "公告标题不能为空") |
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/notice/vo/SysNoticeCreateReqVO.java renamed to yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeCreateReqVO.java
| 1 | -package cn.iocoder.yudao.module.system.controller.notice.vo; | 1 | +package cn.iocoder.yudao.module.system.controller.admin.notice.vo; |
| 2 | 2 | ||
| 3 | import io.swagger.annotations.ApiModel; | 3 | import io.swagger.annotations.ApiModel; |
| 4 | import lombok.Data; | 4 | import lombok.Data; |
| 5 | import lombok.EqualsAndHashCode; | 5 | import lombok.EqualsAndHashCode; |
| 6 | 6 | ||
| 7 | -@ApiModel("通知公告创建 Request VO") | 7 | +@ApiModel("管理后台 - 通知公告创建 Request VO") |
| 8 | @Data | 8 | @Data |
| 9 | @EqualsAndHashCode(callSuper = true) | 9 | @EqualsAndHashCode(callSuper = true) |
| 10 | -public class SysNoticeCreateReqVO extends SysNoticeBaseVO { | 10 | +public class NoticeCreateReqVO extends NoticeBaseVO { |
| 11 | } | 11 | } |