修复异味

src/main/java/com/sooka/sponest/middleware/base/config/ParamConfig.java

@@ -16,7 +16,7 @@ public class ParamConfig {
 
     @Value("${sooka.database.monitor}")
     public void setMonitorDB(String monitorDB) {
-        this.monitorDB = monitorDB;
+        ParamConfig.monitorDB = monitorDB;
     }
 
     public static String getSystemDB() {
@@ -25,6 +25,6 @@ public class ParamConfig {
 
     @Value("${sooka.database.system}")
     public void setSystemDB(String systemDB) {
-        this.systemDB = systemDB;
+        ParamConfig.systemDB = systemDB;
     }
 }

src/main/java/com/sooka/sponest/middleware/data/visual/controller/VisualController.java

@@ -271,7 +271,7 @@ public class VisualController extends BaseESController {
                 String str = mapper.writeValueAsString(object);
                 linkedHashMap = JSONObject.parseObject(str, LinkedHashMap.class);
             } catch (JsonProcessingException e) {
-                logger.error("error message : " + e);
+                logger.error(e.getMessage());
             }
         }
         Map<String, Object> resultMap = new HashMap<>();

src/main/java/com/sooka/sponest/middleware/event/eventcatalogue/controller/EventCatalogueController.java

@@ -38,6 +38,8 @@ public class EventCatalogueController extends BaseESController {
     @Autowired
     private IEventCatalogueService cnterEventService;
 
+    static final String EVENT_STATUS_VALUE = "eventStatusValue.keyword";
+
     /**
      * 批处理
      *
@@ -98,7 +100,7 @@ public class EventCatalogueController extends BaseESController {
         }
         // 事件状态
         if (StringUtils.isNotBlank(bo.getEventStatusValue())) {
-            queryBuilder.must(QueryBuilders.termQuery("eventStatusValue.keyword", bo.getEventStatusValue()));
+            queryBuilder.must(QueryBuilders.termQuery(EVENT_STATUS_VALUE, bo.getEventStatusValue()));
         }
         // 事件类型
         BoolQueryBuilder queryBuilderOr = QueryBuilders.boolQuery();
@@ -108,10 +110,10 @@ public class EventCatalogueController extends BaseESController {
                 BoolQueryBuilder builder = QueryBuilders.boolQuery();
                 builder.must(QueryBuilders.termQuery("eventType.keyword", "1"));
                 BoolQueryBuilder builderOr = QueryBuilders.boolQuery();
-                builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_1"));
-                builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_7"));
-                builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_3"));
-                builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_4"));
+                builderOr.should().add(QueryBuilders.termQuery(EVENT_STATUS_VALUE, "forest_event_status_1"));
+                builderOr.should().add(QueryBuilders.termQuery(EVENT_STATUS_VALUE, "forest_event_status_7"));
+                builderOr.should().add(QueryBuilders.termQuery(EVENT_STATUS_VALUE, "forest_event_status_3"));
+                builderOr.should().add(QueryBuilders.termQuery(EVENT_STATUS_VALUE, "forest_event_status_4"));
                 builder.must(builderOr);
                 queryBuilderOr.should().add(builder);
             }
@@ -121,10 +123,10 @@ public class EventCatalogueController extends BaseESController {
                 BoolQueryBuilder builder = QueryBuilders.boolQuery();
                 builder.must(QueryBuilders.termQuery("eventType.keyword", "1"));
                 BoolQueryBuilder builderOr = QueryBuilders.boolQuery();
-                builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_1"));
-                builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_7"));
-                builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_3"));
-                builderOr.should().add(QueryBuilders.termQuery("eventStatusValue.keyword", "forest_event_status_4"));
+                builderOr.should().add(QueryBuilders.termQuery(EVENT_STATUS_VALUE, "forest_event_status_1"));
+                builderOr.should().add(QueryBuilders.termQuery(EVENT_STATUS_VALUE, "forest_event_status_7"));
+                builderOr.should().add(QueryBuilders.termQuery(EVENT_STATUS_VALUE, "forest_event_status_3"));
+                builderOr.should().add(QueryBuilders.termQuery(EVENT_STATUS_VALUE, "forest_event_status_4"));
                 builder.must(builderOr);
                 queryBuilderOr.should().add(builder);
             }