Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

config-server/src/main/resources/shared/aipt-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/aipt-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/aipt-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/aipt-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/bi-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/bi-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/bi-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/bi-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/diagbotman-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/diagbotman-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/diagbotman-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/diagbotman-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/feedback-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/feedback-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/feedback-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/feedback-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/icss-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/icss-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/icss-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/icss-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/icssman-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/icssman-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/icssman-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/icssman-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledge-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledge-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledge-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledge-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledgeman-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledgeman-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/knowledgeman-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/logger-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/logger-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/logger-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/logger-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/tran-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/tran-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/tran-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/tran-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/triage-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/triage-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/triage-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/triage-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/uaa-service-dev.yml

@@ -26,9 +26,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/uaa-service-local.yml

@@ -26,9 +26,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/uaa-service-pro.yml

@@ -26,9 +26,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/uaa-service-test.yml

@@ -26,9 +26,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/user-service-dev.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/user-service-local.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/user-service-pro.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

config-server/src/main/resources/shared/user-service-test.yml

@@ -29,9 +29,13 @@ spring:
       poolPreparedStatements: true
       maxPoolPreparedStatementPerConnectionSize: 20
       # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-      filters.commons-log.connection-logger-name: stat,wall,log4j
-      filter.stat.log-slow-sql: true
-      filter.stat.slow-sql-millis: 2000
+      filters.commons-log.connection-logger-name: wall,log4j
+      filter:
+        stat:
+          enabled: true
+          mergeSql: true
+          log-slow-sql: true
+          slow-sql-millis: 2000
       #监控配置
       web-stat-filter:
         enabled: true

icss-service/src/main/java/com/diagbot/facade/BuriedSomeStatisticalFacade.java

@@ -1,11 +1,14 @@
 package com.diagbot.facade;
 
 import com.diagbot.entity.BuriedSomeStatistical;
+import com.diagbot.service.BuriedSomeStatisticalService;
 import com.diagbot.service.impl.BuriedSomeStatisticalServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.BuriedSomeStatisticalVO;
 import com.diagbot.vo.Taggeds;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -18,7 +21,9 @@ import java.util.List;
  */
 @Component
 public class BuriedSomeStatisticalFacade extends BuriedSomeStatisticalServiceImpl {
-
+    @Autowired
+    @Qualifier("buriedSomeStatisticalServiceImpl")
+    private BuriedSomeStatisticalService buriedSomeStatisticalService;
     /**
      * 批量保存
      *
@@ -47,7 +52,7 @@ public class BuriedSomeStatisticalFacade extends BuriedSomeStatisticalServiceImp
                 buriedList.add(buriedData);
             }
 
-            res = insertCodeBatch(buriedList);
+            res = buriedSomeStatisticalService.saveBatch(buriedList);
         }
         return res;
     }

icss-service/src/main/java/com/diagbot/facade/TranDiseaseIcdFacade.java

@@ -6,12 +6,16 @@ import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -36,23 +40,34 @@ public class TranDiseaseIcdFacade {
      */
     public List<GetDiseaseIcdDTO> getDiseaseIcds(GetDiseaseIcdVO getDiseaseIcdVO) {
         RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcdsList =  tranServiceClient.getDiseaseIcds(getDiseaseIcdVO);
-        if (getDiseaseIcdsList == null
-                || !CommonErrorCode.OK.getCode().equals(getDiseaseIcdsList.code)) {
+        if (RespDTOUtil.respIsNG(getDiseaseIcdsList)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取icd编码失败");
         }
-        List<String> questionNames = getDiseaseIcdsList.data.stream().map(getDiseaseIcdDTO -> getDiseaseIcdDTO.getIcssQuestionName()).collect(Collectors.toList());
+
+        List<GetDiseaseIcdDTO> res = new ArrayList<>();
+
+        List<String> questionNames
+                = getDiseaseIcdsList.data.stream().map(getDiseaseIcdDTO -> getDiseaseIcdDTO.getIcssQuestionName()).collect(Collectors.toList());
+        if (ListUtil.isEmpty(questionNames)){
+            return res;
+        }
+
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-            .in("name",questionNames);
-        List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-        for (GetDiseaseIcdDTO getDiseaseIcdDTO: getDiseaseIcdsList.data) {
-            for (QuestionInfo questionInfo: questionInfoList) {
-                if(getDiseaseIcdDTO.getIcssQuestionName().equals(questionInfo.getName())){
-                    getDiseaseIcdDTO.setQuestionId(questionInfo.getId());
+                .eq("type", QuestionTypeEnum.Disease.getKey())
+                .in("name",questionNames);
+
+        List<String> icssQuestionNames
+                = questionFacade.list(questionInfoQueryWrapper).stream()
+                .map(r -> r.getName()).collect(Collectors.toList());
+        if (ListUtil.isNotEmpty(icssQuestionNames)){
+            for (GetDiseaseIcdDTO getDiseaseIcdDTO: getDiseaseIcdsList.data) {
+                if (icssQuestionNames.contains(getDiseaseIcdDTO.getIcssQuestionName())){
+                    res.add(getDiseaseIcdDTO);
                 }
             }
         }
-        return getDiseaseIcdsList.data;
+        return res;
     }
 }

icss-service/src/main/java/com/diagbot/vo/GetDiseaseIcdVO.java

@@ -11,7 +11,7 @@ import lombok.Setter;
 @Getter
 @Setter
 public class GetDiseaseIcdVO {
-    //疾病id
+    //疾病名称
     private String questions;
     //医院编码
     private String hospitalCode;

icssman-service/src/main/java/com/diagbot/dto/QuestionDTO.java

@@ -42,5 +42,6 @@ public class QuestionDTO {
     private List<QuestionDetail> questionDetailList = new ArrayList<>(); //标签明细表
     private List<QuestionDTO> questionMapping = new ArrayList<>();     //下级标签
     private Integer disType;//诊断类型
+    private List<ScaleContentDTO> scale = new ArrayList<>();
     private String remark;//备注
 }

icssman-service/src/main/java/com/diagbot/dto/ScaleContentDTO.java

@@ -0,0 +1,37 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 量表内容表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-04-08
+ */
+@Getter
+@Setter
+public class ScaleContentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 0:文本，1：大数据接口填充
+     */
+    private Integer type;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+}

icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -706,13 +706,17 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         }
         QuestionDTO res = new QuestionDTO();
         BeanUtil.copyProperties(questionInfo, res);
+        // 如果是诊断，返回诊断类型
         if (questionInfo.getType() == QuestionTypeEnum.Disease.getKey()) {
             DisType disType = disTypeFacade.getOne(new QueryWrapper<DisType>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("dis_id", questionInfo.getId()));
             res.setDisType(disType == null ? DisTypeEnum.COMMON.getKey() : disType.getType());
         }
-
+        //如果是量表内容，添加量表内容
+        if (questionInfo.getType() == QuestionTypeEnum.Scale.getKey()) {
+            res.setScale(scaleContentFacade.getByParamFac(questionInfo.getId()));
+        }
         //获取明细项
         List<QuestionDetail> questionDetailList = questionDetailFacade.getByQuestionId(questionVO.getId());
         res.setQuestionDetailList(questionDetailList);

icssman-service/src/main/java/com/diagbot/facade/ScaleContentFacade.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.ScaleContentDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -100,4 +101,15 @@ public class ScaleContentFacade extends ScaleContentServiceImpl {
         }
         return res;
     }
+
+
+    /**
+     * 量表列表
+     *
+     * @param scaleId
+     * @return
+     */
+    public List<ScaleContentDTO> getByParamFac(Long scaleId) {
+        return this.getByParam(scaleId);
+    }
 }

icssman-service/src/main/java/com/diagbot/mapper/ScaleContentMapper.java

@@ -3,8 +3,12 @@ package com.diagbot.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.QuestionPageDTO;
+import com.diagbot.dto.ScaleContentDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.QuestionPageVO;
+import com.diagbot.vo.ScaleContentVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -23,4 +27,13 @@ public interface ScaleContentMapper extends BaseMapper<ScaleContent> {
      * @return
      */
     public IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO);
+
+
+    /**
+     * 返回量表内容
+     *
+     * @param scaleId
+     * @return
+     */
+    public List<ScaleContentDTO> getByParam(Long scaleId);
 }

icssman-service/src/main/java/com/diagbot/service/ScaleContentService.java

@@ -3,9 +3,12 @@ package com.diagbot.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.QuestionPageDTO;
+import com.diagbot.dto.ScaleContentDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.vo.QuestionPageVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 量表内容表 服务类
@@ -23,4 +26,13 @@ public interface ScaleContentService extends IService<ScaleContent> {
      * @return
      */
     IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO);
+
+
+    /**
+     * 返回量表内容
+     *
+     * @param scaleId
+     * @return
+     */
+    public List<ScaleContentDTO> getByParam(Long scaleId);
 }

icssman-service/src/main/java/com/diagbot/service/impl/ScaleContentServiceImpl.java

@@ -3,12 +3,15 @@ package com.diagbot.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.dto.QuestionPageDTO;
+import com.diagbot.dto.ScaleContentDTO;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.mapper.ScaleContentMapper;
 import com.diagbot.service.ScaleContentService;
 import com.diagbot.vo.QuestionPageVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 量表内容表 服务实现类
@@ -24,4 +27,9 @@ public class ScaleContentServiceImpl extends ServiceImpl<ScaleContentMapper, Sca
     public IPage<QuestionPageDTO> getList(QuestionPageVO questionPageVO) {
         return baseMapper.getList(questionPageVO);
     }
+
+    @Override
+    public List<ScaleContentDTO> getByParam(Long scaleId) {
+        return baseMapper.getByParam(scaleId);
+    }
 }

icssman-service/src/main/resources/mapper/ScaleContentMapper.xml

@@ -46,7 +46,10 @@
             </foreach>
         </if>
         order by a.gmt_modified desc
+    </select>
 
+    <select id="getByParam" resultType="com.diagbot.dto.ScaleContentDTO">
+        SELECT a.* FROM `icss_scale_content` a where a.is_deleted = 'N' and a.scale_id = #{scaleId}
     </select>
 
 </mapper>