diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerator.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerator.java index 7dc6e565..c0b864bf 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerator.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerator.java @@ -14,14 +14,10 @@ import com.orion.ops.framework.mybatis.core.domain.BaseDO; import com.orion.ops.framework.mybatis.core.mapper.IMapper; import org.apache.ibatis.annotations.Mapper; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.io.File; import java.sql.Types; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** @@ -34,18 +30,20 @@ import java.util.stream.Collectors; public class CodeGenerator { public static void main(String[] args) { - @NotNull + // 输出路径 String outputDir = "D:/MP/"; - @NotNull + // 作者 String author = Const.ORION_AUTHOR; - @NotEmpty - String[] tables = {"system_user", "system_role", "system_user_role", "system_menu", "system_role_menu"}; - // 表业务注释 需要和表一一对应 null则为表注释 - @NotEmpty - String[] comment = {"用户", "角色", "用户角色关联", "菜单", "角色菜单关联"}; // 模块 - @NotNull String module = "infra"; + // 生成的表 表 - 业务注释 - request文件的包前缀 + GenTable[] tables = { + new GenTable("system_user", "用户", "user"), + new GenTable("system_role", "角色", "role"), + new GenTable("system_user_role", "用户角色关联", "role"), + new GenTable("system_menu", "菜单", "menu"), + new GenTable("system_role_menu", "角色菜单关联", "menu") + }; // jdbc 配置 - 使用配置文件 File yamlFile = new File("orion-ops-launch/src/main/resources/application-dev.yaml"); YmlExt yaml = YmlExt.load(yamlFile); @@ -56,7 +54,7 @@ public class CodeGenerator { // 执行 runGenerator(outputDir, author, url, username, password, - tables, comment, module); + tables, module); } /** @@ -67,11 +65,10 @@ public class CodeGenerator { String url, String username, String password, - String[] tables, - String[] comment, + GenTable[] tables, String module) { // 创建引擎 - VelocityTemplateEngine engine = getEngine(tables, comment); + VelocityTemplateEngine engine = getEngine(tables); // 获取全局配置 GlobalConfig globalConfig = getGlobalConfig(outputDir, author); @@ -111,20 +108,11 @@ public class CodeGenerator { /** * 获取渲染引擎 * - * @param tables 表 - * @param comment 表注释 - * @return + * @param tables 表 + * @return 渲染引擎 */ - private static VelocityTemplateEngine getEngine(String[] tables, String[] comment) { - if (tables.length != comment.length) { - throw new IllegalArgumentException("表称与业务注释长度不匹配"); - } - // 业务注释 - Map tableComment = new HashMap<>(); - for (int i = 0; i < tables.length; i++) { - tableComment.put(tables[i], comment[i]); - } - return new VelocityTemplateEngine(tableComment); + private static VelocityTemplateEngine getEngine(GenTable[] tables) { + return new VelocityTemplateEngine(tables); } /** @@ -185,10 +173,13 @@ public class CodeGenerator { * @param tables 生成的表名 * @return 策略配置 */ - private static StrategyConfig getStrategyConfig(String[] tables) { + private static StrategyConfig getStrategyConfig(GenTable[] tables) { + String[] tableNames = Arrays.stream(tables) + .map(GenTable::getTableName) + .toArray(String[]::new); StrategyConfig stConfig = new StrategyConfig.Builder() // 生成的表 - .addInclude(tables) + .addInclude(tableNames) // 全局大写命名 .enableCapitalMode() // 实体配置 @@ -308,11 +299,11 @@ public class CodeGenerator { // dto 文件 new String[]{"/templates/orion-entity-dto.java.vm", "%sDTO.java", "entity.dto"}, // create request 文件 - new String[]{"/templates/orion-entity-request-create.java.vm", "%sCreateRequest.java", "entity.request"}, + new String[]{"/templates/orion-entity-request-create.java.vm", "%sCreateRequest.java", "entity.request.%s"}, // update request 文件 - new String[]{"/templates/orion-entity-request-update.java.vm", "%sUpdateRequest.java", "entity.request"}, + new String[]{"/templates/orion-entity-request-update.java.vm", "%sUpdateRequest.java", "entity.request.%s"}, // query request 文件 - new String[]{"/templates/orion-entity-request-query.java.vm", "%sQueryRequest.java", "entity.request"}, + new String[]{"/templates/orion-entity-request-query.java.vm", "%sQueryRequest.java", "entity.request.%s"}, // convert 文件 new String[]{"/templates/orion-convert.java.vm", "%sConvert.java", "convert"}, // convert provider 文件 diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/GenTable.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/GenTable.java new file mode 100644 index 00000000..cb0dc725 --- /dev/null +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/GenTable.java @@ -0,0 +1,34 @@ +package com.orion.ops.framework.mybatis.core.generator; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/7/17 10:44 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class GenTable { + + /** + * 表名称 + */ + private String tableName; + + /** + * 注释 + */ + private String comment; + + /** + * 请求实体包名 + */ + private String requestPackage; + +} diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/VelocityTemplateEngine.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/VelocityTemplateEngine.java index bc50786a..44a9f4b1 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/VelocityTemplateEngine.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/VelocityTemplateEngine.java @@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.generator.config.builder.CustomFile; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import com.baomidou.mybatisplus.generator.engine.AbstractTemplateEngine; import com.orion.lang.utils.Strings; +import com.orion.lang.utils.reflect.Fields; import com.orion.ops.framework.common.constant.Const; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; @@ -35,10 +36,9 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStreamWriter; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import java.util.*; +import java.util.function.BiConsumer; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -50,12 +50,15 @@ import java.util.stream.Collectors; */ public class VelocityTemplateEngine extends AbstractTemplateEngine { - private final Map tableComment; + private static final String REQUEST_PACKAGE_REPLACER = "request.%s"; + + private final Map tables; private VelocityEngine velocityEngine; - public VelocityTemplateEngine(Map tableComment) { - this.tableComment = tableComment; + public VelocityTemplateEngine(GenTable[] tables) { + this.tables = Arrays.stream(tables) + .collect(Collectors.toMap(GenTable::getTableName, Function.identity())); } { @@ -99,13 +102,84 @@ public class VelocityTemplateEngine extends AbstractTemplateEngine { return filePath.endsWith(dotVm) ? filePath : filePath + dotVm; } + /** + * 创建自定义文件副本对象 + * + * @param originCustomerFile originCustomerFile + * @return backup + */ + private List createCustomFilesBackup(@NotNull List originCustomerFile) { + // 生成文件副本 + List customFiles = originCustomerFile.stream().map(s -> { + return new CustomFile.Builder() + .enableFileOverride() + .templatePath(s.getTemplatePath()) + .filePath(s.getFilePath()) + .fileName(s.getFileName()) + .packageName(s.getPackageName()) + .build(); + }).collect(Collectors.toList()); + return customFiles; + } + + /** + * 替换自定义文件包 + * + * @param customFiles 自定义文件 + * @param tableInfo tableInfo + * @param objectMap objectMap + */ + private void replacePackageName(@NotNull List customFiles, @NotNull TableInfo tableInfo, @NotNull Map objectMap) { + // 替换包名 + customFiles.forEach(s -> { + // 反射调用 setter 方法 + BiConsumer callSetter = (field, value) -> Fields.setFieldValue(s, field, value); + String packageName = s.getPackageName(); + // 替换 Request.java 文件包名 + if (packageName.contains(REQUEST_PACKAGE_REPLACER)) { + String replacePackage = String.format(packageName, tables.get(tableInfo.getName()).getRequestPackage()); + callSetter.accept("packageName", replacePackage); + } + }); + // 自定义文件的包 (导入用) + List customFilePackages = customFiles.stream() + .filter(s -> s.getTemplatePath().contains(".java.vm")) + .map(CustomFile::getPackageName) + .map(s -> getConfigBuilder().getPackageConfig().getParent() + "." + s) + .distinct() + .collect(Collectors.toList()); + objectMap.put("customFilePackages", customFilePackages); + } + + /** + * 插入表元数据 + * + * @param tableInfo tableInfo + * @param objectMap objectMap + */ + private void addTableMeta(@NotNull TableInfo tableInfo, @NotNull Map objectMap) { + // http 注释标识 + objectMap.put("httpComment", "###"); + // 版本 + objectMap.put("since", Const.VERSION); + // 替换业务注释 + tableInfo.setComment(tables.get(tableInfo.getName()).getComment()); + // 实体名称 + String domainName = tableInfo.getEntityName(); + String mappingHyphen = objectMap.get("controllerMappingHyphen").toString(); + String entityName = domainName.substring(0, domainName.length() - 2); + objectMap.put("type", entityName); + objectMap.put("typeLower", Strings.firstLower(entityName)); + objectMap.put("typeHyphen", mappingHyphen.substring(0, mappingHyphen.length() - 3)); + } + /** * 插入 api 注释 * * @param tableInfo tableInfo * @param objectMap objectMap */ - private void putApiComment(TableInfo tableInfo, Map objectMap) { + private void addApiCommentMeta(@NotNull TableInfo tableInfo, @NotNull Map objectMap) { Map map = new HashMap<>(); objectMap.put("apiComment", map); String comment = tableInfo.getComment(); @@ -118,46 +192,16 @@ public class VelocityTemplateEngine extends AbstractTemplateEngine { map.put("batchDelete", "通过 id 批量删除" + comment); } - /** - * 输出自定义模板文件 - * - * @param customFiles 自定义模板文件列表 - * @param tableInfo 表信息 - * @param objectMap 渲染数据 - * @since 3.5.3 - */ @Override protected void outputCustomFile(@NotNull List customFiles, @NotNull TableInfo tableInfo, @NotNull Map objectMap) { - // 替换业务注释 - String comment = tableComment.get(tableInfo.getName()); - if (comment != null) { - tableInfo.setComment(comment); - } - - // http 注释标识 - objectMap.put("httpComment", "###"); - // 版本 - objectMap.put("since", Const.VERSION); - - // 实体名称 - String domainName = tableInfo.getEntityName(); - String mappingHyphen = objectMap.get("controllerMappingHyphen").toString(); - String entityName = domainName.substring(0, domainName.length() - 2); - objectMap.put("type", entityName); - objectMap.put("typeLower", Strings.firstLower(entityName)); - objectMap.put("typeHyphen", mappingHyphen.substring(0, mappingHyphen.length() - 3)); - // 注释 - this.putApiComment(tableInfo, objectMap); - - // 自定义文件的包 - List customFilePackages = customFiles.stream() - .filter(s -> s.getTemplatePath().contains(".java.vm")) - .map(CustomFile::getPackageName) - .map(s -> getConfigBuilder().getPackageConfig().getParent() + "." + s) - .distinct() - .collect(Collectors.toList()); - // 设置导入的包 - objectMap.put("customFilePackages", customFilePackages); + // 创建自定义文件副本文件 + customFiles = this.createCustomFilesBackup(customFiles); + // 替换自定义包名 + this.replacePackageName(customFiles, tableInfo, objectMap); + // 添加表元数据 + this.addTableMeta(tableInfo, objectMap); + // 添加注释元数据 + this.addApiCommentMeta(tableInfo, objectMap); // 生成文件 String parentPath = getPathInfo(OutputFile.parent); @@ -173,7 +217,7 @@ public class VelocityTemplateEngine extends AbstractTemplateEngine { filePath = filePath + File.separator + file.getPackageName(); filePath = filePath.replaceAll("\\.", StringPool.BACK_SLASH + File.separator); } - String fileName = filePath + File.separator + String.format(file.getFileName(), entityName); + String fileName = filePath + File.separator + String.format(file.getFileName(), objectMap.get("type")); outputFile(new File(fileName), objectMap, file.getTemplatePath(), file.isFileOverride()); }); } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java index f7819f51..0e58d56f 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/AuthenticationController.java @@ -3,13 +3,12 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.HttpWrapper; import com.orion.ops.framework.common.annotation.IgnoreLog; import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.module.infra.entity.request.UserLoginRequest; +import com.orion.ops.module.infra.entity.request.auth.UserLoginRequest; import com.orion.ops.module.infra.entity.vo.UserLoginVO; import com.orion.ops.module.infra.service.AuthenticationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -54,18 +53,16 @@ public class AuthenticationController { return HttpWrapper.ok(); } - @Operation(summary = "测试1") - @GetMapping("/test1") - @PreAuthorize("@ss.hasPermission('a')") - public String test1() { - return "123"; + @Operation(summary = "登陆") + @PutMapping("/reset-password") + public UserLoginVO resetPassword(@Validated @RequestBody UserLoginRequest request, + HttpServletRequest servletRequest) { + String token = authenticationService.login(request, servletRequest); + return UserLoginVO.builder().token(token).build(); } - @Operation(summary = "测试2") - @GetMapping("/test2") - @PreAuthorize("@ss.hasRole('update')") - public String test2() { - return "123"; - } +// 修改密码 +// 重置密码 + } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java index e4a71870..d0c9e64d 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/PermissionController.java @@ -35,7 +35,7 @@ public class PermissionController { @GetMapping("/init-cache") @Operation(summary = "初始化缓存") - @PreAuthorize("@ss.hasPermission('infra:system-role:init')") + @PreAuthorize("@ss.hasRole('admin')") public HttpWrapper initCache() { permissionService.initPermissionCache(); return HttpWrapper.ok(); diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java index 030adcb5..3d1d75d7 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemMenuController.java @@ -2,11 +2,11 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.module.infra.service.*; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuCreateRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuQueryRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemMenuVO; +import com.orion.ops.module.infra.service.SystemMenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -23,7 +23,7 @@ import java.util.List; * * @author Jiahang Li * @version 1.0.0 - * @since 2023-7-16 01:19 + * @since 2023-7-17 11:39 */ @Tag(name = "infra - 菜单服务") @Slf4j diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.http b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.http index e70aca55..055455af 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.http +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.http @@ -23,6 +23,17 @@ Authorization: {{token}} } +### 通过 id 更新状态 +PUT {{baseUrl}}/infra/system-role/update-status +Content-Type: application/json +Authorization: {{token}} + +{ + "id": "", + "status": "" +} + + ### 通过 id 查询角色 GET {{baseUrl}}/infra/system-role/get?id=1 Authorization: {{token}} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java index 4c833081..7190d4e2 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleController.java @@ -2,10 +2,10 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.module.infra.entity.request.SystemRoleCreateRequest; -import com.orion.ops.module.infra.entity.request.SystemRoleQueryRequest; -import com.orion.ops.module.infra.entity.request.SystemRoleStatusRequest; -import com.orion.ops.module.infra.entity.request.SystemRoleUpdateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleCreateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleQueryRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleStatusRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleUpdateRequest; import com.orion.ops.module.infra.entity.vo.SystemRoleVO; import com.orion.ops.module.infra.service.SystemRoleService; import io.swagger.v3.oas.annotations.Operation; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleMenuController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleMenuController.java index 886c683b..285d06e2 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleMenuController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemRoleMenuController.java @@ -2,11 +2,11 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.module.infra.service.*; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuCreateRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuQueryRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemRoleMenuVO; +import com.orion.ops.module.infra.service.SystemRoleMenuService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java index aae1a989..58e536cb 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserController.java @@ -2,9 +2,9 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.module.infra.entity.request.SystemUserCreateRequest; -import com.orion.ops.module.infra.entity.request.SystemUserQueryRequest; -import com.orion.ops.module.infra.entity.request.SystemUserUpdateRequest; +import com.orion.ops.module.infra.entity.request.user.SystemUserCreateRequest; +import com.orion.ops.module.infra.entity.request.user.SystemUserQueryRequest; +import com.orion.ops.module.infra.entity.request.user.SystemUserUpdateRequest; import com.orion.ops.module.infra.entity.vo.SystemUserVO; import com.orion.ops.module.infra.service.SystemUserService; import io.swagger.v3.oas.annotations.Operation; @@ -90,5 +90,8 @@ public class SystemUserController { return systemUserService.batchDeleteSystemUser(idList); } + // 修改状态 + // 设置角色 + } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserRoleController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserRoleController.java index 59329132..2dc0c11a 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserRoleController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/SystemUserRoleController.java @@ -2,11 +2,11 @@ package com.orion.ops.module.infra.controller; import com.orion.lang.define.wrapper.DataGrid; import com.orion.ops.framework.common.annotation.RestWrapper; -import com.orion.ops.module.infra.service.*; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleCreateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleQueryRequest; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemUserRoleVO; +import com.orion.ops.module.infra.service.SystemUserRoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemMenuConvert.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemMenuConvert.java index a3981b9f..30cc6c36 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemMenuConvert.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemMenuConvert.java @@ -2,9 +2,9 @@ package com.orion.ops.module.infra.convert; import com.orion.ops.module.infra.entity.domain.SystemMenuDO; import com.orion.ops.module.infra.entity.dto.SystemMenuCacheDTO; -import com.orion.ops.module.infra.entity.request.SystemMenuCreateRequest; -import com.orion.ops.module.infra.entity.request.SystemMenuQueryRequest; -import com.orion.ops.module.infra.entity.request.SystemMenuUpdateRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuCreateRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuQueryRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuUpdateRequest; import com.orion.ops.module.infra.entity.vo.SystemMenuVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -16,7 +16,7 @@ import java.util.List; * * @author Jiahang Li * @version 1.0.0 - * @since 2023-7-16 01:19 + * @since 2023-7-17 11:39 */ @Mapper public interface SystemMenuConvert { diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemMenuProviderConvert.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemMenuProviderConvert.java index b0e34a78..7ed3ff4b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemMenuProviderConvert.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemMenuProviderConvert.java @@ -1,12 +1,10 @@ package com.orion.ops.module.infra.convert; +import com.orion.ops.module.infra.entity.domain.SystemMenuDO; +import com.orion.ops.module.infra.entity.dto.SystemMenuDTO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.orion.ops.module.infra.entity.domain.*; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; + import java.util.List; /** @@ -14,7 +12,7 @@ import java.util.List; * * @author Jiahang Li * @version 1.0.0 - * @since 2023-7-16 01:19 + * @since 2023-7-17 11:39 */ @Mapper public interface SystemMenuProviderConvert { diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemRoleConvert.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemRoleConvert.java index 4b20a2e4..962e11e3 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemRoleConvert.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemRoleConvert.java @@ -1,12 +1,14 @@ package com.orion.ops.module.infra.convert; +import com.orion.ops.module.infra.entity.domain.SystemRoleDO; +import com.orion.ops.module.infra.entity.request.role.SystemRoleCreateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleQueryRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleStatusRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemRoleVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.orion.ops.module.infra.entity.domain.*; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; + import java.util.List; /** @@ -18,7 +20,7 @@ import java.util.List; */ @Mapper public interface SystemRoleConvert { - + SystemRoleConvert MAPPER = Mappers.getMapper(SystemRoleConvert.class); SystemRoleDO to(SystemRoleCreateRequest request); diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemRoleMenuConvert.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemRoleMenuConvert.java index 347aed14..5c254c56 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemRoleMenuConvert.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemRoleMenuConvert.java @@ -1,12 +1,13 @@ package com.orion.ops.module.infra.convert; +import com.orion.ops.module.infra.entity.domain.SystemRoleMenuDO; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuCreateRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuQueryRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemRoleMenuVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.orion.ops.module.infra.entity.domain.*; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; + import java.util.List; /** @@ -18,7 +19,7 @@ import java.util.List; */ @Mapper public interface SystemRoleMenuConvert { - + SystemRoleMenuConvert MAPPER = Mappers.getMapper(SystemRoleMenuConvert.class); SystemRoleMenuDO to(SystemRoleMenuCreateRequest request); diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemUserConvert.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemUserConvert.java index 61cb2492..7d754d07 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemUserConvert.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemUserConvert.java @@ -2,9 +2,9 @@ package com.orion.ops.module.infra.convert; import com.orion.ops.framework.common.security.LoginUser; import com.orion.ops.module.infra.entity.domain.SystemUserDO; -import com.orion.ops.module.infra.entity.request.SystemUserCreateRequest; -import com.orion.ops.module.infra.entity.request.SystemUserQueryRequest; -import com.orion.ops.module.infra.entity.request.SystemUserUpdateRequest; +import com.orion.ops.module.infra.entity.request.user.SystemUserCreateRequest; +import com.orion.ops.module.infra.entity.request.user.SystemUserQueryRequest; +import com.orion.ops.module.infra.entity.request.user.SystemUserUpdateRequest; import com.orion.ops.module.infra.entity.vo.SystemUserVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemUserRoleConvert.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemUserRoleConvert.java index b1d4ef48..4cc51ac1 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemUserRoleConvert.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/SystemUserRoleConvert.java @@ -1,12 +1,13 @@ package com.orion.ops.module.infra.convert; +import com.orion.ops.module.infra.entity.domain.SystemUserRoleDO; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleCreateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleQueryRequest; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemUserRoleVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.orion.ops.module.infra.entity.domain.*; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; + import java.util.List; /** @@ -18,7 +19,7 @@ import java.util.List; */ @Mapper public interface SystemUserRoleConvert { - + SystemUserRoleConvert MAPPER = Mappers.getMapper(SystemUserRoleConvert.class); SystemUserRoleDO to(SystemUserRoleCreateRequest request); diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/UserLoginRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/auth/UserLoginRequest.java similarity index 88% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/UserLoginRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/auth/UserLoginRequest.java index b088e8f9..afb91696 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/UserLoginRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/auth/UserLoginRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java similarity index 94% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuCreateRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java index b44ce539..b171b9dc 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuCreateRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -10,14 +10,13 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.io.Serializable; -import java.util.*; /** * 菜单 创建请求对象 * * @author Jiahang Li * @version 1.0.0 - * @since 2023-7-16 01:19 + * @since 2023-7-17 11:39 */ @Data @Builder diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuQueryRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuQueryRequest.java similarity index 94% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuQueryRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuQueryRequest.java index e04dfbe3..cf772da5 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuQueryRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuQueryRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.menu; import com.orion.ops.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; @@ -11,7 +11,7 @@ import javax.validation.constraints.Size; * * @author Jiahang Li * @version 1.0.0 - * @since 2023-7-16 01:19 + * @since 2023-7-17 11:39 */ @Data @Builder diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java similarity index 94% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuUpdateRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java index 149639e9..c8c5d82d 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemMenuUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemMenuUpdateRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -10,14 +10,13 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.io.Serializable; -import java.util.*; /** * 菜单 更新请求对象 * * @author Jiahang Li * @version 1.0.0 - * @since 2023-7-16 01:19 + * @since 2023-7-17 11:39 */ @Data @Builder diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleMenuCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemRoleMenuCreateRequest.java similarity index 82% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleMenuCreateRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemRoleMenuCreateRequest.java index 1a36682b..0887c0b4 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleMenuCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemRoleMenuCreateRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -6,11 +6,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.io.Serializable; -import java.util.*; /** * 角色菜单关联 创建请求对象 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleMenuQueryRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemRoleMenuQueryRequest.java similarity index 85% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleMenuQueryRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemRoleMenuQueryRequest.java index 3131f245..c86bba42 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleMenuQueryRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemRoleMenuQueryRequest.java @@ -1,12 +1,9 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.menu; import com.orion.ops.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.Size; -import java.util.*; - /** * 角色菜单关联 查询请求对象 * diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleMenuUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemRoleMenuUpdateRequest.java similarity index 83% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleMenuUpdateRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemRoleMenuUpdateRequest.java index c5b34dec..a2585944 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleMenuUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/menu/SystemRoleMenuUpdateRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.menu; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -6,11 +6,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.io.Serializable; -import java.util.*; /** * 角色菜单关联 更新请求对象 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleCreateRequest.java similarity index 93% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleCreateRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleCreateRequest.java index 7feae12f..98021f14 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleCreateRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleQueryRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleQueryRequest.java similarity index 92% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleQueryRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleQueryRequest.java index 56f38d92..85cb6d5e 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleQueryRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleQueryRequest.java @@ -1,11 +1,10 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.role; import com.orion.ops.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import javax.validation.constraints.Size; -import java.util.*; /** * 角色 查询请求对象 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleStatusRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleStatusRequest.java similarity index 92% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleStatusRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleStatusRequest.java index 416baee0..ff76e166 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleStatusRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleStatusRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleUpdateRequest.java similarity index 93% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleUpdateRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleUpdateRequest.java index 168287bb..c2851550 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemRoleUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemRoleUpdateRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserRoleCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemUserRoleCreateRequest.java similarity index 82% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserRoleCreateRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemUserRoleCreateRequest.java index d775ffbd..d06bfbce 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserRoleCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemUserRoleCreateRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -6,11 +6,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.io.Serializable; -import java.util.*; /** * 用户角色关联 创建请求对象 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserRoleQueryRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemUserRoleQueryRequest.java similarity index 85% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserRoleQueryRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemUserRoleQueryRequest.java index e868e1ab..b21e3a9b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserRoleQueryRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemUserRoleQueryRequest.java @@ -1,12 +1,9 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.role; import com.orion.ops.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import javax.validation.constraints.Size; -import java.util.*; - /** * 用户角色关联 查询请求对象 * diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserRoleUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemUserRoleUpdateRequest.java similarity index 83% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserRoleUpdateRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemUserRoleUpdateRequest.java index 5f3b372c..3b129128 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserRoleUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/role/SystemUserRoleUpdateRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.role; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -6,11 +6,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.io.Serializable; -import java.util.*; /** * 用户角色关联 更新请求对象 diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserCreateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserCreateRequest.java similarity index 96% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserCreateRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserCreateRequest.java index 248c4b74..9b598555 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserCreateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserCreateRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserQueryRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserQueryRequest.java similarity index 95% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserQueryRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserQueryRequest.java index 4944e70a..c2edaebf 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserQueryRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserQueryRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.user; import com.orion.ops.framework.common.entity.PageRequest; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserUpdateRequest.java similarity index 96% rename from orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserUpdateRequest.java rename to orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserUpdateRequest.java index b38eb4c3..80533744 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/SystemUserUpdateRequest.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/user/SystemUserUpdateRequest.java @@ -1,4 +1,4 @@ -package com.orion.ops.module.infra.entity.request; +package com.orion.ops.module.infra.entity.request.user; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/AuthenticationService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/AuthenticationService.java index 9d9e5d22..146f60c0 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/AuthenticationService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/AuthenticationService.java @@ -2,7 +2,7 @@ package com.orion.ops.module.infra.service; import com.orion.ops.framework.common.security.LoginUser; import com.orion.ops.module.infra.entity.dto.LoginTokenDTO; -import com.orion.ops.module.infra.entity.request.UserLoginRequest; +import com.orion.ops.module.infra.entity.request.auth.UserLoginRequest; import javax.servlet.http.HttpServletRequest; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemMenuService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemMenuService.java index 652a02cb..313b897b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemMenuService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemMenuService.java @@ -1,10 +1,10 @@ package com.orion.ops.module.infra.service; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuCreateRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuQueryRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemMenuVO; import java.util.List; @@ -13,7 +13,7 @@ import java.util.List; * * @author Jiahang Li * @version 1.0.0 - * @since 2023-7-16 01:19 + * @since 2023-7-17 11:39 */ public interface SystemMenuService { diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleMenuService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleMenuService.java index df918174..7fc24f59 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleMenuService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleMenuService.java @@ -1,10 +1,10 @@ package com.orion.ops.module.infra.service; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuCreateRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuQueryRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemRoleMenuVO; import java.util.List; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleService.java index 2f841107..b076ef0e 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemRoleService.java @@ -1,10 +1,10 @@ package com.orion.ops.module.infra.service; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.module.infra.entity.request.SystemRoleCreateRequest; -import com.orion.ops.module.infra.entity.request.SystemRoleQueryRequest; -import com.orion.ops.module.infra.entity.request.SystemRoleStatusRequest; -import com.orion.ops.module.infra.entity.request.SystemRoleUpdateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleCreateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleQueryRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleStatusRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleUpdateRequest; import com.orion.ops.module.infra.entity.vo.SystemRoleVO; import java.util.List; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserRoleService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserRoleService.java index 2b583c65..cbdb3c4f 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserRoleService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserRoleService.java @@ -1,10 +1,10 @@ package com.orion.ops.module.infra.service; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleCreateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleQueryRequest; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemUserRoleVO; import java.util.List; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserService.java index c0ef8f46..1fc9acb5 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/SystemUserService.java @@ -1,10 +1,10 @@ package com.orion.ops.module.infra.service; import com.orion.lang.define.wrapper.DataGrid; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; +import com.orion.ops.module.infra.entity.request.user.SystemUserCreateRequest; +import com.orion.ops.module.infra.entity.request.user.SystemUserQueryRequest; +import com.orion.ops.module.infra.entity.request.user.SystemUserUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemUserVO; import java.util.List; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/AuthenticationServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/AuthenticationServiceImpl.java index a7ecff9d..87bb44de 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/AuthenticationServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/AuthenticationServiceImpl.java @@ -23,7 +23,7 @@ import com.orion.ops.module.infra.define.UserCacheKeyDefine; import com.orion.ops.module.infra.entity.domain.SystemRoleDO; import com.orion.ops.module.infra.entity.domain.SystemUserDO; import com.orion.ops.module.infra.entity.dto.LoginTokenDTO; -import com.orion.ops.module.infra.entity.request.UserLoginRequest; +import com.orion.ops.module.infra.entity.request.auth.UserLoginRequest; import com.orion.ops.module.infra.enums.LoginTokenStatusEnum; import com.orion.ops.module.infra.enums.UserStatusEnum; import com.orion.ops.module.infra.service.AuthenticationService; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemMenuServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemMenuServiceImpl.java index f4636226..5542beb1 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemMenuServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemMenuServiceImpl.java @@ -6,12 +6,13 @@ import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Valid; import com.orion.lang.utils.collect.Lists; import com.orion.ops.framework.common.constant.ErrorMessage; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; -import com.orion.ops.module.infra.entity.domain.SystemMenuDO; +import com.orion.ops.module.infra.convert.SystemMenuConvert; import com.orion.ops.module.infra.dao.SystemMenuDAO; +import com.orion.ops.module.infra.entity.domain.SystemMenuDO; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuCreateRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuQueryRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemMenuUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemMenuVO; import com.orion.ops.module.infra.service.SystemMenuService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -24,7 +25,7 @@ import java.util.List; * * @author Jiahang Li * @version 1.0.0 - * @since 2023-7-16 22:46 + * @since 2023-7-17 11:39 */ @Slf4j @Service diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleMenuServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleMenuServiceImpl.java index a4307735..b2a771ed 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleMenuServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleMenuServiceImpl.java @@ -6,12 +6,13 @@ import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Valid; import com.orion.lang.utils.collect.Lists; import com.orion.ops.framework.common.constant.ErrorMessage; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; -import com.orion.ops.module.infra.entity.domain.SystemRoleMenuDO; +import com.orion.ops.module.infra.convert.SystemRoleMenuConvert; import com.orion.ops.module.infra.dao.SystemRoleMenuDAO; +import com.orion.ops.module.infra.entity.domain.SystemRoleMenuDO; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuCreateRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuQueryRequest; +import com.orion.ops.module.infra.entity.request.menu.SystemRoleMenuUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemRoleMenuVO; import com.orion.ops.module.infra.service.SystemRoleMenuService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleServiceImpl.java index fc9d9aaa..80519f5d 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemRoleServiceImpl.java @@ -9,10 +9,10 @@ import com.orion.ops.framework.common.constant.ErrorMessage; import com.orion.ops.module.infra.convert.SystemRoleConvert; import com.orion.ops.module.infra.dao.SystemRoleDAO; import com.orion.ops.module.infra.entity.domain.SystemRoleDO; -import com.orion.ops.module.infra.entity.request.SystemRoleCreateRequest; -import com.orion.ops.module.infra.entity.request.SystemRoleQueryRequest; -import com.orion.ops.module.infra.entity.request.SystemRoleStatusRequest; -import com.orion.ops.module.infra.entity.request.SystemRoleUpdateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleCreateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleQueryRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleStatusRequest; +import com.orion.ops.module.infra.entity.request.role.SystemRoleUpdateRequest; import com.orion.ops.module.infra.entity.vo.SystemRoleVO; import com.orion.ops.module.infra.enums.RoleStatusEnum; import com.orion.ops.module.infra.service.PermissionService; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserRoleServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserRoleServiceImpl.java index 7ef5d89b..d8ffa6d4 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserRoleServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserRoleServiceImpl.java @@ -6,12 +6,13 @@ import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Valid; import com.orion.lang.utils.collect.Lists; import com.orion.ops.framework.common.constant.ErrorMessage; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; -import com.orion.ops.module.infra.entity.domain.SystemUserRoleDO; +import com.orion.ops.module.infra.convert.SystemUserRoleConvert; import com.orion.ops.module.infra.dao.SystemUserRoleDAO; +import com.orion.ops.module.infra.entity.domain.SystemUserRoleDO; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleCreateRequest; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleQueryRequest; +import com.orion.ops.module.infra.entity.request.role.SystemUserRoleUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemUserRoleVO; import com.orion.ops.module.infra.service.SystemUserRoleService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java index 572dd051..ab389327 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/SystemUserServiceImpl.java @@ -6,12 +6,13 @@ import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Valid; import com.orion.lang.utils.collect.Lists; import com.orion.ops.framework.common.constant.ErrorMessage; -import com.orion.ops.module.infra.entity.vo.*; -import com.orion.ops.module.infra.entity.dto.*; -import com.orion.ops.module.infra.entity.request.*; -import com.orion.ops.module.infra.convert.*; -import com.orion.ops.module.infra.entity.domain.SystemUserDO; +import com.orion.ops.module.infra.convert.SystemUserConvert; import com.orion.ops.module.infra.dao.SystemUserDAO; +import com.orion.ops.module.infra.entity.domain.SystemUserDO; +import com.orion.ops.module.infra.entity.request.user.SystemUserCreateRequest; +import com.orion.ops.module.infra.entity.request.user.SystemUserQueryRequest; +import com.orion.ops.module.infra.entity.request.user.SystemUserUpdateRequest; +import com.orion.ops.module.infra.entity.vo.SystemUserVO; import com.orion.ops.module.infra.service.SystemUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service;