过滤规则代码format

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.
                     -->
-                    <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:osx-x86_64</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.0:exe:exe:osx-x86_64</pluginArtifact>
                 </configuration>
                 <executions>
                     <execution>

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.
                     -->
-                    <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:osx-x86_64</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.0:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.0.0:exe:exe:osx-x86_64</pluginArtifact>
                 </configuration>
                 <executions>
                     <execution>

modules/filter-rule/pom.xml

@@ -21,5 +21,11 @@
             <groupId>com.thing.modules</groupId>
             <artifactId>thing</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-dependencies</artifactId>
+            <version>${spring-boot.version}</version>
+            <type>pom</type>
+        </dependency>
     </dependencies>
 </project>

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())

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<FilterLogMapper, Filte
 
     @Override
     public QueryWrapper getWrapper(Map<String, Object> 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"),

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<FilterRuleMapper, Fil
 
     @Override
     public QueryWrapper getWrapper(Map<String, Object> 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<FilterRuleMapper, Fil
      * 之前与领导商量采用 {@link AggFunction} 示例中给出的公式写法，不过被否定了，认为用户是傻子，无法理解那种写法【摊手.jpg】
      */
     private void generateDefaultInfo(FilterRuleDTO filterRule) {
-        filterRule.setId(Optional.ofNullable(filterRule.getId()).orElse(new SnowFlakeIDKeyGenerator().nextId()));
+        filterRule.setId(Optional.ofNullable(filterRule.getId()).orElse(IdGenerator.nextId()));
         filterRule.setEnable(Optional.ofNullable(filterRule.getEnable()).orElse(true));
         // 生成过滤规则描述
         List<FilterRuleDetailDTO> details = filterRule.getDetails();