From 5b40beb3123aa44f658c01d5e85b14798d3664ee Mon Sep 17 00:00:00 2001 From: lijiahang Date: Tue, 19 Dec 2023 19:27:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E6=8B=93=E5=B1=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9C=8D=E5=8A=A1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ops/framework/common/utils/Refs.java | 42 ++++++ .../log/core/aspect/OperatorLogAspect.java | 4 +- .../core/generator/CodeGenerators.java | 4 +- .../asset/controller/HostController.java | 4 +- .../impl/AssetAuthorizedDataServiceImpl.java | 2 +- .../asset/service/impl/HostServiceImpl.java | 4 +- .../ops/module/infra/api/DataAliasApi.java | 12 +- .../ops/module/infra/api/DataExtraApi.java | 73 ++++++++++ .../entity/dto/data/DataExtraQueryDTO.java | 43 ++++++ .../entity/dto/data/DataExtraUpdateDTO.java | 47 ++++++ ...asTypeEnum.java => DataExtraTypeEnum.java} | 8 +- .../preference/model/PreferenceModel.java | 5 +- .../infra/api/impl/DataAliasApiImpl.java | 12 +- .../infra/api/impl/DataExtraApiImpl.java | 87 +++++++++++ .../convert/DataExtraProviderConvert.java | 26 ++++ .../ops/module/infra/dao/DataExtraDAO.java | 44 ++++++ .../infra/entity/domain/DataExtraDO.java | 53 +++++++ .../request/data/DataExtraQueryRequest.java | 46 ++++++ .../request/data/DataExtraUpdateRequest.java | 52 +++++++ .../infra/service/DataExtraService.java | 75 ++++++++++ .../service/impl/DataExtraServiceImpl.java | 136 ++++++++++++++++++ .../service/impl/PreferenceServiceImpl.java | 22 +-- .../service/impl/SystemUserServiceImpl.java | 6 +- .../main/resources/mapper/DataExtraMapper.xml | 25 ++++ 24 files changed, 784 insertions(+), 48 deletions(-) create mode 100644 orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/utils/Refs.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/DataExtraApi.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/data/DataExtraQueryDTO.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/data/DataExtraUpdateDTO.java rename orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/enums/{DataAliasTypeEnum.java => DataExtraTypeEnum.java} (69%) create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/DataExtraApiImpl.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/DataExtraProviderConvert.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/DataExtraDAO.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/DataExtraDO.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/data/DataExtraQueryRequest.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/data/DataExtraUpdateRequest.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DataExtraService.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DataExtraServiceImpl.java create mode 100644 orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/utils/Refs.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/utils/Refs.java new file mode 100644 index 00000000..52173ec1 --- /dev/null +++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/utils/Refs.java @@ -0,0 +1,42 @@ +package com.orion.ops.framework.common.utils; + +import com.alibaba.fastjson.JSON; +import com.orion.lang.define.wrapper.Ref; + +/** + * ref 工具类 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/12/19 18:07 + */ +public class Refs { + + private Refs() { + } + + /** + * 转为 ref json + * + * @param o o + * @return json + */ + public static String toJson(Object o) { + return JSON.toJSONString(Ref.of(o)); + } + + /** + * ref json 转为 ref value + * + * @param json json + * @return value + */ + public static Object parseObject(String json) { + Ref ref = JSON.parseObject(json, Ref.class); + if (ref == null) { + return null; + } + return ref.getValue(); + } + +} diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/aspect/OperatorLogAspect.java b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/aspect/OperatorLogAspect.java index 2b18d190..37f754cc 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/aspect/OperatorLogAspect.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-biz-operator-log/src/main/java/com/orion/ops/framework/biz/operator/log/core/aspect/OperatorLogAspect.java @@ -3,7 +3,6 @@ package com.orion.ops.framework.biz.operator.log.core.aspect; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializeFilter; import com.orion.lang.define.thread.ExecutorBuilder; -import com.orion.lang.define.wrapper.Ref; import com.orion.lang.utils.Arrays1; import com.orion.lang.utils.Strings; import com.orion.lang.utils.json.matcher.ReplacementFormatters; @@ -20,6 +19,7 @@ import com.orion.ops.framework.common.enums.BooleanBit; import com.orion.ops.framework.common.meta.TraceIdHolder; import com.orion.ops.framework.common.security.LoginUser; import com.orion.ops.framework.common.security.SecurityHolder; +import com.orion.ops.framework.common.utils.Refs; import com.orion.ops.framework.common.utils.Requests; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; @@ -270,7 +270,7 @@ public class OperatorLogAspect { // 脱敏 model.setReturnValue(JSON.toJSONString(ret, serializeFilters)); } else if (ReturnType.TO_STRING.equals(retType)) { - model.setReturnValue(JSON.toJSONString(Ref.of(Objects.toString(ret)))); + model.setReturnValue(Refs.toJson(Objects.toString(ret))); } } } else { diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java index 59679996..f7eb15a2 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java @@ -45,11 +45,9 @@ public class CodeGenerators { // .color("blue", "gray", "red", "green", "white") // .valueUseFields() // .build(), - Template.create("data_alias", "数据别名", "data") + Template.create("data_extra", "数据拓展信息", "data") .disableUnitTest() .enableProviderApi() - .cache("data:alias:{}:{}", "数据别名 ${userId} ${type}") - .expire(1, TimeUnit.DAYS) .build(), }; // jdbc 配置 - 使用配置文件 diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostController.java index a5c99de5..a630aa6e 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostController.java @@ -15,7 +15,7 @@ import com.orion.ops.module.asset.service.HostConfigService; import com.orion.ops.module.asset.service.HostService; import com.orion.ops.module.infra.api.DataAliasApi; import com.orion.ops.module.infra.entity.dto.data.DataAliasUpdateDTO; -import com.orion.ops.module.infra.enums.DataAliasTypeEnum; +import com.orion.ops.module.infra.enums.DataExtraTypeEnum; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -110,7 +110,7 @@ public class HostController { .relId(request.getId()) .alias(request.getName()) .build(); - return dataAliasApi.updateDataAlias(update, DataAliasTypeEnum.HOST); + return dataAliasApi.updateDataAlias(update, DataExtraTypeEnum.HOST); } @IgnoreLog(IgnoreLogMode.RET) diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java index 591f139a..80e46093 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/AssetAuthorizedDataServiceImpl.java @@ -159,7 +159,7 @@ public class AssetAuthorizedDataServiceImpl implements AssetAuthorizedDataServic // 查询我的收藏 Future> favoriteResult = favoriteApi.getFavoriteRelIdListAsync(FavoriteTypeEnum.HOST, userId); // 查询数据别名 - Future> dataAliasResult = dataAliasApi.getDataAliasAsync(userId, DataAliasTypeEnum.HOST); + Future> dataAliasResult = dataAliasApi.getDataAliasAsync(userId, DataExtraTypeEnum.HOST); // 查询分组 List dataGroup = dataGroupApi.getDataGroupList(DataGroupTypeEnum.HOST); // 查询分组引用 diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java index b875a1f3..fcf40a07 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostServiceImpl.java @@ -29,7 +29,7 @@ import com.orion.ops.module.infra.api.FavoriteApi; import com.orion.ops.module.infra.api.TagRelApi; import com.orion.ops.module.infra.entity.dto.data.DataGroupRelCreateDTO; import com.orion.ops.module.infra.entity.dto.tag.TagDTO; -import com.orion.ops.module.infra.enums.DataAliasTypeEnum; +import com.orion.ops.module.infra.enums.DataExtraTypeEnum; import com.orion.ops.module.infra.enums.DataGroupTypeEnum; import com.orion.ops.module.infra.enums.FavoriteTypeEnum; import com.orion.ops.module.infra.enums.TagTypeEnum; @@ -219,7 +219,7 @@ public class HostServiceImpl implements HostService { // 删除收藏引用 favoriteApi.deleteByRelId(FavoriteTypeEnum.HOST, id); // 删除主机别名 - dataAliasApi.deleteByRelId(DataAliasTypeEnum.HOST, id); + dataAliasApi.deleteByRelId(DataExtraTypeEnum.HOST, id); } /** diff --git a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/DataAliasApi.java b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/DataAliasApi.java index bbd3868c..0332cbe5 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/DataAliasApi.java +++ b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/DataAliasApi.java @@ -1,7 +1,7 @@ package com.orion.ops.module.infra.api; import com.orion.ops.module.infra.entity.dto.data.DataAliasUpdateDTO; -import com.orion.ops.module.infra.enums.DataAliasTypeEnum; +import com.orion.ops.module.infra.enums.DataExtraTypeEnum; import java.util.Map; import java.util.concurrent.Future; @@ -22,7 +22,7 @@ public interface DataAliasApi { * @param type type * @return effect */ - Integer updateDataAlias(DataAliasUpdateDTO dto, DataAliasTypeEnum type); + Integer updateDataAlias(DataAliasUpdateDTO dto, DataExtraTypeEnum type); /** * 查询数据别名 @@ -32,7 +32,7 @@ public interface DataAliasApi { * @param relId relId * @return aliasName */ - String getDataAlias(Long userId, DataAliasTypeEnum type, Long relId); + String getDataAlias(Long userId, DataExtraTypeEnum type, Long relId); /** * 查询数据别名 @@ -41,7 +41,7 @@ public interface DataAliasApi { * @param type type * @return relId:aliasName */ - Map getDataAlias(Long userId, DataAliasTypeEnum type); + Map getDataAlias(Long userId, DataExtraTypeEnum type); /** * 异步查询数据别名 @@ -50,7 +50,7 @@ public interface DataAliasApi { * @param type type * @return relId:aliasName */ - Future> getDataAliasAsync(Long userId, DataAliasTypeEnum type); + Future> getDataAliasAsync(Long userId, DataExtraTypeEnum type); /** * 删除数据别名 @@ -59,6 +59,6 @@ public interface DataAliasApi { * @param relId relId * @return effect */ - Integer deleteByRelId(DataAliasTypeEnum type, Long relId); + Integer deleteByRelId(DataExtraTypeEnum type, Long relId); } diff --git a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/DataExtraApi.java b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/DataExtraApi.java new file mode 100644 index 00000000..6d6af5dc --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/DataExtraApi.java @@ -0,0 +1,73 @@ +package com.orion.ops.module.infra.api; + +import com.orion.lang.define.collect.MultiHashMap; +import com.orion.ops.module.infra.entity.dto.data.DataExtraQueryDTO; +import com.orion.ops.module.infra.entity.dto.data.DataExtraUpdateDTO; +import com.orion.ops.module.infra.enums.DataExtraTypeEnum; + +import java.util.Map; + +/** + * 数据拓展信息 对外服务类 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +public interface DataExtraApi { + + /** + * 更新数据拓展信息 + * + * @param type type + * @param dto dto + * @return effect + */ + Integer updateExtraItem(DataExtraUpdateDTO dto, DataExtraTypeEnum type); + + /** + * 查询额外配置项 + * + * @param type type + * @param dto dto + * @return items + */ + Map getExtraItems(DataExtraQueryDTO dto, DataExtraTypeEnum type); + + /** + * 查询额外配置项 + * + * @param dto dto + * @param type type + * @return items + */ + MultiHashMap getExtraItemsList(DataExtraQueryDTO dto, DataExtraTypeEnum type); + + /** + * 查询额外配置项 + * + * @param type type + * @param dto dto + * @return item + */ + String getExtraItem(DataExtraQueryDTO dto, DataExtraTypeEnum type); + + /** + * 查询额外配置项 + * + * @param dto dto + * @param type type + * @return item + */ + Map getExtraItemList(DataExtraQueryDTO dto, DataExtraTypeEnum type); + + /** + * 通过 relId 删除 + * + * @param type type + * @param relId relId + * @return effect + */ + Integer deleteByRelId(DataExtraTypeEnum type, Long relId); + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/data/DataExtraQueryDTO.java b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/data/DataExtraQueryDTO.java new file mode 100644 index 00000000..4ff2b1bc --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/data/DataExtraQueryDTO.java @@ -0,0 +1,43 @@ +package com.orion.ops.module.infra.entity.dto.data; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.util.List; + +/** + * 数据拓展信息 查询请求业务对象 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "DataExtraQueryDTO", description = "数据拓展信息 查询请求业务对象") +public class DataExtraQueryDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @NonNull + @Schema(description = "用户id") + private Long userId; + + @Schema(description = "数据id") + private Long relId; + + @Schema(description = "数据id") + private List relIdList; + + @Size(max = 32) + @Schema(description = "拓展项") + private String item; + + @Schema(description = "拓展项") + private List items; + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/data/DataExtraUpdateDTO.java b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/data/DataExtraUpdateDTO.java new file mode 100644 index 00000000..a57c18ab --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/entity/dto/data/DataExtraUpdateDTO.java @@ -0,0 +1,47 @@ +package com.orion.ops.module.infra.entity.dto.data; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +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; + +/** + * 数据拓展信息 更新请求业务对象 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "DataExtraUpdateDTO", description = "数据拓展信息 更新请求业务对象") +public class DataExtraUpdateDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull + @Schema(description = "用户id") + private Long userId; + + @NotNull + @Schema(description = "数据id") + private Long relId; + + @NotBlank + @Size(max = 32) + @Schema(description = "拓展项") + private String item; + + @NotBlank + @Schema(description = "拓展值") + private String value; + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/enums/DataAliasTypeEnum.java b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/enums/DataExtraTypeEnum.java similarity index 69% rename from orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/enums/DataAliasTypeEnum.java rename to orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/enums/DataExtraTypeEnum.java index aac86ec5..0935edc0 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/enums/DataAliasTypeEnum.java +++ b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/enums/DataExtraTypeEnum.java @@ -1,13 +1,13 @@ package com.orion.ops.module.infra.enums; /** - * 数据别名类型 + * 数据拓展类型 * * @author Jiahang Li * @version 1.0.0 * @since 2023/12/18 21:51 */ -public enum DataAliasTypeEnum { +public enum DataExtraTypeEnum { /** * 主机 @@ -16,11 +16,11 @@ public enum DataAliasTypeEnum { ; - public static DataAliasTypeEnum of(String type) { + public static DataExtraTypeEnum of(String type) { if (type == null) { return null; } - for (DataAliasTypeEnum value : values()) { + for (DataExtraTypeEnum value : values()) { if (value.name().equals(type)) { return value; } diff --git a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/handler/preference/model/PreferenceModel.java b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/handler/preference/model/PreferenceModel.java index e459a2eb..8c2d5ede 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/handler/preference/model/PreferenceModel.java +++ b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/handler/preference/model/PreferenceModel.java @@ -2,10 +2,9 @@ package com.orion.ops.module.infra.handler.preference.model; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.orion.lang.define.wrapper.Ref; import com.orion.lang.utils.collect.Maps; +import com.orion.ops.framework.common.utils.Refs; -import java.util.HashMap; import java.util.Map; import java.util.function.Function; @@ -25,7 +24,7 @@ public interface PreferenceModel { */ default Map toMap() { JSONObject map = JSON.parseObject(JSON.toJSONString(this)); - return Maps.map(map, Function.identity(), v -> JSON.toJSONString(Ref.of(v))); + return Maps.map(map, Function.identity(), Refs::toJson); } } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/DataAliasApiImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/DataAliasApiImpl.java index 83345073..9b9ea184 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/DataAliasApiImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/DataAliasApiImpl.java @@ -4,7 +4,7 @@ import com.orion.ops.framework.common.utils.Valid; import com.orion.ops.module.infra.api.DataAliasApi; import com.orion.ops.module.infra.entity.dto.data.DataAliasUpdateDTO; import com.orion.ops.module.infra.entity.request.data.DataAliasUpdateRequest; -import com.orion.ops.module.infra.enums.DataAliasTypeEnum; +import com.orion.ops.module.infra.enums.DataExtraTypeEnum; import com.orion.ops.module.infra.service.DataAliasService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ public class DataAliasApiImpl implements DataAliasApi { private DataAliasService dataAliasService; @Override - public Integer updateDataAlias(DataAliasUpdateDTO dto, DataAliasTypeEnum type) { + public Integer updateDataAlias(DataAliasUpdateDTO dto, DataExtraTypeEnum type) { Valid.valid(dto); DataAliasUpdateRequest update = DataAliasUpdateRequest.builder() .userId(dto.getUserId()) @@ -41,25 +41,25 @@ public class DataAliasApiImpl implements DataAliasApi { } @Override - public String getDataAlias(Long userId, DataAliasTypeEnum type, Long relId) { + public String getDataAlias(Long userId, DataExtraTypeEnum type, Long relId) { Valid.allNotNull(userId, relId); return dataAliasService.getDataAlias(userId, type.name(), relId); } @Override - public Map getDataAlias(Long userId, DataAliasTypeEnum type) { + public Map getDataAlias(Long userId, DataExtraTypeEnum type) { Valid.notNull(userId); return dataAliasService.getDataAlias(userId, type.name()); } @Override - public Future> getDataAliasAsync(Long userId, DataAliasTypeEnum type) { + public Future> getDataAliasAsync(Long userId, DataExtraTypeEnum type) { Valid.notNull(userId); return CompletableFuture.completedFuture(dataAliasService.getDataAlias(userId, type.name())); } @Override - public Integer deleteByRelId(DataAliasTypeEnum type, Long relId) { + public Integer deleteByRelId(DataExtraTypeEnum type, Long relId) { Valid.notNull(relId); return dataAliasService.deleteByRelId(type.name(), relId); } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/DataExtraApiImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/DataExtraApiImpl.java new file mode 100644 index 00000000..b058d409 --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/DataExtraApiImpl.java @@ -0,0 +1,87 @@ +package com.orion.ops.module.infra.api.impl; + +import com.orion.lang.define.collect.MultiHashMap; +import com.orion.ops.framework.common.utils.Valid; +import com.orion.ops.module.infra.api.DataExtraApi; +import com.orion.ops.module.infra.convert.DataExtraProviderConvert; +import com.orion.ops.module.infra.entity.dto.data.DataExtraQueryDTO; +import com.orion.ops.module.infra.entity.dto.data.DataExtraUpdateDTO; +import com.orion.ops.module.infra.entity.request.data.DataExtraQueryRequest; +import com.orion.ops.module.infra.entity.request.data.DataExtraUpdateRequest; +import com.orion.ops.module.infra.enums.DataExtraTypeEnum; +import com.orion.ops.module.infra.service.DataExtraService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Map; + +/** + * 数据拓展信息 对外服务实现类 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +@Slf4j +@Service +public class DataExtraApiImpl implements DataExtraApi { + + @Resource + private DataExtraService dataExtraService; + + @Override + public Integer updateExtraItem(DataExtraUpdateDTO dto, DataExtraTypeEnum type) { + Valid.valid(dto); + // 更新 + DataExtraUpdateRequest request = DataExtraProviderConvert.MAPPER.to(dto); + request.setType(type.name()); + return dataExtraService.updateExtraItem(request); + } + + @Override + public Map getExtraItems(DataExtraQueryDTO dto, DataExtraTypeEnum type) { + Valid.valid(dto); + Valid.notNull(dto.getRelId()); + // 查询 + DataExtraQueryRequest request = DataExtraProviderConvert.MAPPER.to(dto); + request.setType(type.name()); + return dataExtraService.getExtraItems(request); + } + + @Override + public MultiHashMap getExtraItemsList(DataExtraQueryDTO dto, DataExtraTypeEnum type) { + Valid.valid(dto); + Valid.notNull(dto.getRelIdList()); + // 查询 + DataExtraQueryRequest request = DataExtraProviderConvert.MAPPER.to(dto); + request.setType(type.name()); + return dataExtraService.getExtraItemsList(request); + } + + @Override + public String getExtraItem(DataExtraQueryDTO dto, DataExtraTypeEnum type) { + Valid.valid(dto); + Valid.allNotNull(dto.getRelId(), dto.getItem()); + // 查询 + DataExtraQueryRequest request = DataExtraProviderConvert.MAPPER.to(dto); + request.setType(type.name()); + return dataExtraService.getExtraItem(request); + } + + @Override + public Map getExtraItemList(DataExtraQueryDTO dto, DataExtraTypeEnum type) { + Valid.valid(dto); + Valid.allNotNull(dto.getRelIdList(), dto.getItem()); + // 查询 + DataExtraQueryRequest request = DataExtraProviderConvert.MAPPER.to(dto); + request.setType(type.name()); + return dataExtraService.getExtraItemList(request); + } + + @Override + public Integer deleteByRelId(DataExtraTypeEnum type, Long relId) { + return dataExtraService.deleteByRelId(type.name(), relId); + } + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/DataExtraProviderConvert.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/DataExtraProviderConvert.java new file mode 100644 index 00000000..36c4756c --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/convert/DataExtraProviderConvert.java @@ -0,0 +1,26 @@ +package com.orion.ops.module.infra.convert; + +import com.orion.ops.module.infra.entity.dto.data.DataExtraQueryDTO; +import com.orion.ops.module.infra.entity.dto.data.DataExtraUpdateDTO; +import com.orion.ops.module.infra.entity.request.data.DataExtraQueryRequest; +import com.orion.ops.module.infra.entity.request.data.DataExtraUpdateRequest; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * 数据拓展信息 对外服务对象转换器 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +@Mapper +public interface DataExtraProviderConvert { + + DataExtraProviderConvert MAPPER = Mappers.getMapper(DataExtraProviderConvert.class); + + DataExtraQueryRequest to(DataExtraQueryDTO query); + + DataExtraUpdateRequest to(DataExtraUpdateDTO update); + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/DataExtraDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/DataExtraDAO.java new file mode 100644 index 00000000..a7786e08 --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/DataExtraDAO.java @@ -0,0 +1,44 @@ +package com.orion.ops.module.infra.dao; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.orion.ops.framework.mybatis.core.mapper.IMapper; +import com.orion.ops.module.infra.entity.domain.DataExtraDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 数据拓展信息 Mapper 接口 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +@Mapper +public interface DataExtraDAO extends IMapper { + + /** + * 通过 userId 删除 + * + * @param userId userId + * @return effect + */ + default int deleteByUserId(Long userId) { + LambdaQueryWrapper wrapper = this.lambda() + .eq(DataExtraDO::getUserId, userId); + return this.delete(wrapper); + } + + /** + * 通过 relId 删除 + * + * @param type type + * @param relId relId + * @return effect + */ + default int deleteByRelId(String type, Long relId) { + LambdaQueryWrapper wrapper = this.lambda() + .eq(DataExtraDO::getType, type) + .eq(DataExtraDO::getRelId, relId); + return this.delete(wrapper); + } + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/DataExtraDO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/DataExtraDO.java new file mode 100644 index 00000000..b8235b82 --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/domain/DataExtraDO.java @@ -0,0 +1,53 @@ +package com.orion.ops.module.infra.entity.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.orion.ops.framework.mybatis.core.domain.BaseDO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.util.*; +import java.math.*; + +/** + * 数据拓展信息 实体对象 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@TableName(value = "data_extra", autoResultMap = true) +@Schema(name = "DataExtraDO", description = "数据拓展信息 实体对象") +public class DataExtraDO extends BaseDO { + + private static final long serialVersionUID = 1L; + + @Schema(description = "id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @Schema(description = "用户id") + @TableField("user_id") + private Long userId; + + @Schema(description = "数据id") + @TableField("rel_id") + private Long relId; + + @Schema(description = "数据类型") + @TableField("type") + private String type; + + @Schema(description = "拓展项") + @TableField("item") + private String item; + + @Schema(description = "拓展值") + @TableField("value") + private String value; + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/data/DataExtraQueryRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/data/DataExtraQueryRequest.java new file mode 100644 index 00000000..5f408afb --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/data/DataExtraQueryRequest.java @@ -0,0 +1,46 @@ +package com.orion.ops.module.infra.entity.request.data; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.List; + +/** + * 数据拓展信息 查询请求对象 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "DataExtraQueryRequest", description = "数据拓展信息 查询请求对象") +public class DataExtraQueryRequest { + + @NonNull + @Schema(description = "用户id") + private Long userId; + + @Schema(description = "数据id") + private Long relId; + + @Schema(description = "数据id") + private List relIdList; + + @NotBlank + @Size(max = 32) + @Schema(description = "数据类型") + private String type; + + @Size(max = 32) + @Schema(description = "拓展项") + private String item; + + @Schema(description = "拓展项") + private List items; + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/data/DataExtraUpdateRequest.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/data/DataExtraUpdateRequest.java new file mode 100644 index 00000000..ed46e420 --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/entity/request/data/DataExtraUpdateRequest.java @@ -0,0 +1,52 @@ +package com.orion.ops.module.infra.entity.request.data; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +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; + +/** + * 数据拓展信息 更新请求对象 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "DataExtraUpdateRequest", description = "数据拓展信息 更新请求对象") +public class DataExtraUpdateRequest implements Serializable { + + private static final long serialVersionUID = 1L; + + @NotNull + @Schema(description = "用户id") + private Long userId; + + @NotNull + @Schema(description = "数据id") + private Long relId; + + @NotBlank + @Size(max = 32) + @Schema(description = "数据类型") + private String type; + + @NotBlank + @Size(max = 32) + @Schema(description = "拓展项") + private String item; + + @NotBlank + @Schema(description = "拓展值") + private Object value; + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DataExtraService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DataExtraService.java new file mode 100644 index 00000000..a553d4f9 --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/DataExtraService.java @@ -0,0 +1,75 @@ +package com.orion.ops.module.infra.service; + +import com.orion.lang.define.collect.MultiHashMap; +import com.orion.ops.module.infra.entity.request.data.DataExtraQueryRequest; +import com.orion.ops.module.infra.entity.request.data.DataExtraUpdateRequest; + +import java.util.Map; + +/** + * 数据拓展信息 服务类 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +public interface DataExtraService { + + /** + * 更新数据拓展信息 + * + * @param request request + * @return effect + */ + Integer updateExtraItem(DataExtraUpdateRequest request); + + /** + * 查询额外配置项 + * + * @param request request + * @return items + */ + Map getExtraItems(DataExtraQueryRequest request); + + /** + * 查询额外配置项 + * + * @param request request + * @return items + */ + MultiHashMap getExtraItemsList(DataExtraQueryRequest request); + + /** + * 查询额外配置项 + * + * @param request request + * @return item + */ + String getExtraItem(DataExtraQueryRequest request); + + /** + * 查询额外配置项 + * + * @param request request + * @return item + */ + Map getExtraItemList(DataExtraQueryRequest request); + + /** + * 通过 userId 删除 + * + * @param userId userId + * @return effect + */ + Integer deleteByUserId(Long userId); + + /** + * 通过 relId 删除 + * + * @param type type + * @param relId relId + * @return effect + */ + Integer deleteByRelId(String type, Long relId); + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DataExtraServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DataExtraServiceImpl.java new file mode 100644 index 00000000..c7861547 --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/DataExtraServiceImpl.java @@ -0,0 +1,136 @@ +package com.orion.ops.module.infra.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.orion.lang.define.collect.MultiHashMap; +import com.orion.lang.function.Functions; +import com.orion.ops.framework.common.utils.Refs; +import com.orion.ops.module.infra.dao.DataExtraDAO; +import com.orion.ops.module.infra.entity.domain.DataExtraDO; +import com.orion.ops.module.infra.entity.request.data.DataExtraQueryRequest; +import com.orion.ops.module.infra.entity.request.data.DataExtraUpdateRequest; +import com.orion.ops.module.infra.service.DataExtraService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 数据拓展信息 服务实现类 + * + * @author Jiahang Li + * @version 1.0.0 + * @since 2023-12-19 18:05 + */ +@Slf4j +@Service +public class DataExtraServiceImpl implements DataExtraService { + + @Resource + private DataExtraDAO dataExtraDAO; + + @Override + public Integer updateExtraItem(DataExtraUpdateRequest request) { + Long userId = request.getUserId(); + Long relId = request.getRelId(); + String type = request.getType(); + String item = request.getItem(); + Object value = request.getValue(); + // 查询配置是否存在 + DataExtraDO extraItem = dataExtraDAO.of() + .createWrapper() + .eq(DataExtraDO::getUserId, userId) + .eq(DataExtraDO::getRelId, relId) + .eq(DataExtraDO::getType, type) + .eq(DataExtraDO::getItem, item) + .then() + .getOne(); + if (extraItem == null) { + // 插入 + DataExtraDO insert = new DataExtraDO(); + insert.setUserId(userId); + insert.setRelId(relId); + insert.setType(type); + insert.setItem(item); + insert.setValue(Refs.toJson(value)); + return dataExtraDAO.insert(insert); + } else { + // 修改 + DataExtraDO update = new DataExtraDO(); + update.setId(extraItem.getId()); + update.setValue(Refs.toJson(value)); + return dataExtraDAO.updateById(update); + } + } + + // FIXME updateBatch + + @Override + public Map getExtraItems(DataExtraQueryRequest request) { + return dataExtraDAO.of() + .wrapper(this.buildWrapper(request)) + .stream() + .collect(Collectors.toMap(DataExtraDO::getItem, + DataExtraDO::getValue, + Functions.right()) + ); + } + + @Override + public MultiHashMap getExtraItemsList(DataExtraQueryRequest request) { + MultiHashMap result = MultiHashMap.create(); + dataExtraDAO.of() + .wrapper(this.buildWrapper(request)) + .list() + .forEach(s -> result.put(s.getRelId(), s.getItem(), s.getValue())); + return result; + } + + @Override + public String getExtraItem(DataExtraQueryRequest request) { + return dataExtraDAO.of() + .wrapper(this.buildWrapper(request)) + .optionalOne() + .map(DataExtraDO::getValue) + .orElse(null); + } + + @Override + public Map getExtraItemList(DataExtraQueryRequest request) { + return dataExtraDAO.of() + .wrapper(this.buildWrapper(request)) + .stream() + .collect(Collectors.toMap(DataExtraDO::getRelId, + DataExtraDO::getValue, + Functions.right()) + ); + } + + @Override + public Integer deleteByUserId(Long userId) { + return dataExtraDAO.deleteByUserId(userId); + } + + @Override + public Integer deleteByRelId(String type, Long relId) { + return dataExtraDAO.deleteByRelId(type, relId); + } + + /** + * 获取查询条件 + * + * @param entity entity + * @return 查询条件 + */ + private LambdaQueryWrapper buildWrapper(DataExtraQueryRequest entity) { + return dataExtraDAO.wrapper() + .eq(DataExtraDO::getUserId, entity.getUserId()) + .eq(DataExtraDO::getRelId, entity.getRelId()) + .in(DataExtraDO::getRelId, entity.getRelIdList()) + .eq(DataExtraDO::getType, entity.getType()) + .eq(DataExtraDO::getItem, entity.getItem()) + .in(DataExtraDO::getItem, entity.getItems()); + } + +} diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/PreferenceServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/PreferenceServiceImpl.java index b6aa4adb..22120151 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/PreferenceServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/PreferenceServiceImpl.java @@ -1,10 +1,9 @@ package com.orion.ops.module.infra.service.impl; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.orion.lang.define.wrapper.Ref; import com.orion.lang.function.Functions; import com.orion.lang.utils.collect.Maps; +import com.orion.ops.framework.common.utils.Refs; import com.orion.ops.framework.common.utils.Valid; import com.orion.ops.framework.redis.core.utils.RedisMaps; import com.orion.ops.framework.security.core.utils.SecurityUtils; @@ -63,13 +62,13 @@ public class PreferenceServiceImpl implements PreferenceService { insertRecord.setUserId(userId); insertRecord.setType(type); insertRecord.setItem(item); - insertRecord.setValue(this.toJsonValue(request.getValue())); + insertRecord.setValue(Refs.toJson(request.getValue())); effect = preferenceDAO.insert(insertRecord); } else { // 更新 PreferenceDO updateRecord = new PreferenceDO(); updateRecord.setId(preference.getId()); - updateRecord.setValue(this.toJsonValue(request.getValue())); + updateRecord.setValue(Refs.toJson(request.getValue())); effect = preferenceDAO.updateById(updateRecord); } // 删除缓存 @@ -77,6 +76,7 @@ public class PreferenceServiceImpl implements PreferenceService { return effect; } + // FIXME updateBatch @Override public void updatePreferencePartial(PreferenceUpdatePartialRequest request) { Long userId = SecurityUtils.getLoginUserId(); @@ -97,7 +97,7 @@ public class PreferenceServiceImpl implements PreferenceService { insertRecord.setUserId(userId); insertRecord.setType(type); insertRecord.setItem(s.getKey()); - insertRecord.setValue(this.toJsonValue(s.getValue())); + insertRecord.setValue(Refs.toJson(s.getValue())); return insertRecord; }).collect(Collectors.toList()); preferenceDAO.insertBatch(records); @@ -183,17 +183,7 @@ public class PreferenceServiceImpl implements PreferenceService { RedisMaps.putAll(key, PreferenceCacheKeyDefine.PREFERENCE, config); } // unref - return Maps.map(config, Function.identity(), v -> JSON.parseObject(v, Ref.class).getValue()); - } - - /** - * 转为 json 对象 - * - * @param o o - * @return value - */ - private String toJsonValue(Object o) { - return JSON.toJSONString(Ref.of(o)); + return Maps.map(config, Function.identity(), Refs::parseObject); } } 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 578f66a5..c6d04c72 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 @@ -70,7 +70,7 @@ public class SystemUserServiceImpl implements SystemUserService { private DataPermissionService dataPermissionService; @Resource - private DataAliasService dataAliasService; + private DataExtraService dataExtraService; @Override public Long createSystemUser(SystemUserCreateRequest request) { @@ -249,8 +249,8 @@ public class SystemUserServiceImpl implements SystemUserService { preferenceService.deletePreferenceByUserId(id); // 删除用户数据权限 dataPermissionService.deleteByUserId(id); - // 删除用户数据别名 - dataAliasService.deleteByUserId(id); + // 删除用户拓展数据 + dataExtraService.deleteByUserId(id); } @Override diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml new file mode 100644 index 00000000..1232e02b --- /dev/null +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/resources/mapper/DataExtraMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + id, user_id, rel_id, type, item, value, create_time, update_time, creator, updater, deleted + + +