From 81279264ecfa51cbc9ea058e81e0997d2330755f Mon Sep 17 00:00:00 2001 From: siyang <2337720667@qq.com> Date: Wed, 7 Aug 2024 09:14:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=A7=84=E5=88=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/data/pom.xml | 4 ++-- common/queue/pom.xml | 4 ++-- modules/filter-rule/pom.xml | 6 ++++++ .../listener/FilterLogSaveEventListener.java | 16 ++++++--------- .../service/impl/FilterLogServiceImpl.java | 18 ++++++++--------- .../service/impl/FilterRuleServiceImpl.java | 20 ++++++++----------- 6 files changed, 32 insertions(+), 36 deletions(-) diff --git a/common/data/pom.xml b/common/data/pom.xml index 8f74a8a..9cf2869 100644 --- a/common/data/pom.xml +++ b/common/data/pom.xml @@ -59,9 +59,9 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf.version}:exe:osx-x86_64 grpc-java - io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:1.0.0:exe:exe:osx-x86_64 diff --git a/common/queue/pom.xml b/common/queue/pom.xml index 11f75fe..ca9af28 100644 --- a/common/queue/pom.xml +++ b/common/queue/pom.xml @@ -89,9 +89,9 @@ protobuf-java directly, you will be transitively depending on the protobuf-java version that grpc depends on. --> - com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} + com.google.protobuf:protoc:${protobuf.version}:exe:osx-x86_64 grpc-java - io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:1.0.0:exe:exe:osx-x86_64 diff --git a/modules/filter-rule/pom.xml b/modules/filter-rule/pom.xml index 14f28b5..a3161b8 100644 --- a/modules/filter-rule/pom.xml +++ b/modules/filter-rule/pom.xml @@ -21,5 +21,11 @@ com.thing.modules thing + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + \ No newline at end of file diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java index 5e51953..88fcac2 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/listener/FilterLogSaveEventListener.java @@ -2,13 +2,12 @@ package com.thing.filter.rule.listener; import static com.thing.filter.rule.event.FilterSuccessEvent.FILTER_SUCCESS; -import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator; - import com.thing.common.core.enumeration.AggType; import com.thing.common.core.utils.DateTimeUtils; import com.thing.common.core.utils.MapUtil; import com.thing.common.data.tskv.TsKvDTO; import com.thing.common.data.tskv.TsKvEntity; +import com.thing.common.orm.utils.IdGenerator; import com.thing.common.tskv.event.FilterLogSaveEvent; import com.thing.common.tskv.service.TsKvService; import com.thing.filter.rule.dto.FilterRuleDTO; @@ -19,21 +18,18 @@ import com.thing.filter.rule.event.FilterSuccessEvent; import com.thing.filter.rule.service.FilterLogService; import com.thing.filter.rule.service.FilterRuleService; import com.thing.queue.util.Topics; - +import java.time.LocalDateTime; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; - import org.apache.commons.lang3.tuple.Pair; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.time.LocalDateTime; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - /** * @author siyang * @date 2024-03-21 @@ -200,7 +196,7 @@ public class FilterLogSaveEventListener { .appendSourceInfo(detail, tskv.getTs(), tskv.getVal()) .setStatus(LogStatus.MISMATCH.getCode()); filterLog - .setId(new SnowFlakeIDKeyGenerator().nextId()) + .setId(IdGenerator.nextId()) .setTenantCode(detail.getTenantCode()) .setCompanyId(detail.getCompanyId()) .setDeptId(detail.getDeptId()) diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java index 7a221ee..7ec16b2 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java @@ -1,6 +1,8 @@ package com.thing.filter.rule.service.impl; -import cn.hutool.core.map.MapUtil; + +import static com.thing.filter.rule.entity.table.FilterLogEntityTableDef.FILTER_LOG_ENTITY; +import static com.thing.filter.rule.entity.table.FilterRuleEntityTableDef.FILTER_RULE_ENTITY; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; @@ -13,16 +15,12 @@ import com.thing.filter.rule.enumeration.LogStatus; import com.thing.filter.rule.mapper.FilterLogMapper; import com.thing.filter.rule.service.FilterLogService; import com.thing.sys.security.context.UserContext; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - import java.util.List; import java.util.Map; import java.util.Objects; - -import static com.thing.filter.rule.entity.table.FilterLogEntityTableDef.FILTER_LOG_ENTITY; -import static com.thing.filter.rule.entity.table.FilterRuleEntityTableDef.FILTER_RULE_ENTITY; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; /** * 过滤日志 @@ -38,8 +36,8 @@ public class FilterLogServiceImpl extends BaseServiceImpl params) { - String filterRuleName = MapUtil.getStr(params, "filterRuleName"); - Integer status = MapUtil.getInt(params, "status"); + String filterRuleName = MapUtils.getString(params, "filterRuleName"); + Integer status = MapUtils.getInteger(params, "status"); return QueryWrapper.create() .select( FILTER_RULE_ENTITY.NAME.as("filter_rule_name"), diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterRuleServiceImpl.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterRuleServiceImpl.java index 855e2c7..944e0ea 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterRuleServiceImpl.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterRuleServiceImpl.java @@ -3,9 +3,6 @@ package com.thing.filter.rule.service.impl; import static com.thing.filter.rule.entity.table.FilterRuleDetailEntityTableDef.FILTER_RULE_DETAIL_ENTITY; import static com.thing.filter.rule.entity.table.FilterRuleEntityTableDef.FILTER_RULE_ENTITY; -import cn.hutool.core.map.MapUtil; -import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator; - import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.cache.constants.CacheNameEnum; @@ -15,6 +12,7 @@ import com.thing.common.core.utils.ConvertUtils; import com.thing.common.core.utils.FormulaUtil; import com.thing.common.core.web.response.PageData; import com.thing.common.orm.service.impl.BaseServiceImpl; +import com.thing.common.orm.utils.IdGenerator; import com.thing.filter.rule.dto.FilterRuleDTO; import com.thing.filter.rule.dto.FilterRuleDetailDTO; import com.thing.filter.rule.entity.FilterRuleDetailEntity; @@ -22,19 +20,17 @@ import com.thing.filter.rule.entity.FilterRuleEntity; import com.thing.filter.rule.mapper.FilterRuleMapper; import com.thing.filter.rule.service.FilterRuleDetailService; import com.thing.filter.rule.service.FilterRuleService; - import com.thing.sys.security.context.UserContext; +import java.util.*; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; - +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.*; -import java.util.stream.Collectors; - /** * 过滤规则表 * @@ -50,9 +46,9 @@ public class FilterRuleServiceImpl extends BaseServiceImpl params) { - String name = MapUtil.getStr(params, "name"); - String thingKeyword = MapUtil.getStr(params, "thingKeyword"); - String attrKeyword = MapUtil.getStr(params, "attrKeyword"); + String name = MapUtils.getString(params, "name"); + String thingKeyword = MapUtils.getString(params, "thingKeyword"); + String attrKeyword = MapUtils.getString(params, "attrKeyword"); QueryWrapper wrapper = QueryWrapper.create() .select(FILTER_RULE_ENTITY.ALL_COLUMNS) @@ -190,7 +186,7 @@ public class FilterRuleServiceImpl extends BaseServiceImpl details = filterRule.getDetails();