add sql监控

nb-admin/src/main/resources/application-dev.yml

@@ -57,6 +57,11 @@ spring:
       testWhileIdle: true
       testOnBorrow: false
       testOnReturn: false
+        # 通过别名的方式配置扩展插件，多个英文逗号分隔，常用的插件有：
+        # 监控统计用的filter:stat
+        # 日志用的filter:log4j
+        # 防御sql注入的filter:wall
+      filters: stat,wall,log4j #log4j
       webStatFilter:
         enabled: true
       statViewServlet:

nb-admin/src/main/resources/application-prod.yml

@@ -28,7 +28,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://192.168.100.32:3306/nbnetpump?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
+        url: jdbc:mysql://47.101.214.91:7001/nbnetpump?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true
         username: root
         password: 123456
       # 从库数据源
@@ -57,6 +57,11 @@ spring:
       testWhileIdle: true
       testOnBorrow: false
       testOnReturn: false
+      # 通过别名的方式配置扩展插件，多个英文逗号分隔，常用的插件有：
+      # 监控统计用的filter:stat
+      # 日志用的filter:log4j
+      # 防御sql注入的filter:wall
+      filters: stat,wall,log4j #log4j
       webStatFilter:
         enabled: true
       statViewServlet:
@@ -65,8 +70,8 @@ spring:
         allow:
         url-pattern: /druid/*
         # 控制台管理用户名和密码
-        login-username: scott
-        login-password: tiger
+        login-username: tuoren
+        login-password: Tuoren@123
       filter:
         stat:
           enabled: true
@@ -77,14 +82,16 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+      #合并多个DruidDataSource的监控数据
+      use-global-data-source-stat: true
   # redis 配置
   redis:
     # 地址
     host: 47.101.214.91
     # 端口，默认为6379
-    port: 9736
+    port: 7003
     # 数据库索引
-    database: 6
+    database: 0
     # 密码
     password: 6E6985E1F7CB40F24A\.
     # 连接超时时间
@@ -120,6 +127,6 @@ aliyun:
   # iotInstanceId：企业版实例请填写实例ID，公共实例请填空字符串""。
   iotInstanceId: "iot-060a0bgd"
   server-subscription:
-    enable: true  # 是否开启阿里云物联网服务端订阅
+    enable: false  # 是否开启阿里云物联网服务端订阅
   product:
     productKey: he1f6YdSWHW

nb-common/src/main/java/com/nb/common/config/CacheHttpServletRequestWrapper.java

@@ -1,5 +1,6 @@
 package com.nb.common.config;
 
+import lombok.SneakyThrows;
 import org.springframework.util.StreamUtils;
 
 import javax.servlet.ReadListener;
@@ -11,30 +12,43 @@ import javax.servlet.http.Part;
 import java.io.*;
 import java.nio.charset.Charset;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 
 public class CacheHttpServletRequestWrapper extends HttpServletRequestWrapper {
 
     private final byte[] body;
     private String bodyString;
+    private Map<String,String> bodyParams=new HashMap<>();
 
     public CacheHttpServletRequestWrapper(HttpServletRequest request) throws IOException {
         super(request);
         this.bodyString = StreamUtils.copyToString(request.getInputStream(), Charset.defaultCharset());
         body = bodyString.getBytes(Charset.defaultCharset());
+        String[] split = bodyString.split("&");
+        for (String param : split) {
+            String[] spl = param.split("=");
+            if(spl.length>1){
+                bodyParams.put(spl[0],spl[1]);
+            }
+        }
     }
 
     public String getBodyString() {
         return this.bodyString;
     }
 
+    @SneakyThrows
     @Override
     public String getParameter(String name) {
-        return super.getParameter(name);
+        String parameter = super.getParameter(name);
+        return parameter==null?this.bodyParams.get(name):parameter;
     }
 
 
 
+
     @Override
     public BufferedReader getReader() throws IOException {
         return new BufferedReader(new InputStreamReader(getInputStream(),Charset.defaultCharset()));

nb-common/src/main/java/com/nb/common/config/CorsConfig.java

@@ -1,5 +1,6 @@
 package com.nb.common.config;
 
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

nb-framework/src/main/java/com/nb/framework/config/DruidConfig.java

@@ -4,6 +4,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
+import com.alibaba.druid.support.http.StatViewServlet;
 import com.alibaba.druid.util.Utils;
 import com.nb.common.enums.DataSourceTypeEnum;
 import com.nb.framework.config.properties.DruidProperties;
@@ -12,6 +13,7 @@ import com.google.common.collect.Maps;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;

nb-framework/src/main/java/com/nb/framework/config/SaTokenConfig.java

@@ -32,6 +32,8 @@ public class SaTokenConfig {
     private static final List<String> IGNORE_URL = Lists.newArrayList();
 
     static {
+        IGNORE_URL.add("/api/druid/**");
+        IGNORE_URL.add("/druid/**");
         IGNORE_URL.add("/api/favicon.ico");
         IGNORE_URL.add("/sys/app/get");
         IGNORE_URL.add("/index");

nb-system/src/main/java/com/nb/bus/hospital/config/HospitalFinishMonitorConfigHandler.java

@@ -56,7 +56,7 @@ public class HospitalFinishMonitorConfigHandler extends AbstractHospitalConfigHa
     public void handler(BusDeviceRunningEntity source) {
         FunctionFinishMonitorConfig config = this.getConfig().as(FunctionFinishMonitorConfig.class);
         if(config==null||!Boolean.TRUE.equals(config.isEnable())||Objects.isNull(config.getShutDownInterval())){
-            log.warn("id:{},配置名称:{}，不存在",hospitalId,getId());
+            log.warn("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
             return;
         }
         judgeShutdownAutoFinish(source,config);

nb-system/src/main/java/com/nb/bus/hospital/config/HospitalFunctionAnalConfigHandler.java

@@ -9,9 +9,6 @@ import com.nb.bus.hospital.config.bean.FunctionAnalConfig;
 import com.nb.bus.entity.BusDeviceRunningEntity;
 import com.nb.bus.hospital.config.handler.HandlerConstant;
 import com.nb.bus.hospital.enums.ConfigHandlerEnums;
-import com.nb.bus.registry.device.DeviceRegistry;
-import com.nb.bus.service.LocalBusInfusionHistoryService;
-import com.nb.bus.utils.WsPublishUtils;
 import com.nb.common.cache.ConfigStorage;
 import com.nb.common.cache.value.Value;
 import com.nb.common.delay_queue.manager.DelayMessageManager;
@@ -60,7 +57,7 @@ public class HospitalFunctionAnalConfigHandler extends AbstractHospitalConfigHan
     public void handler(BusDeviceRunningEntity source) {
         FunctionAnalConfig config = this.getConfig().as(FunctionAnalConfig.class);
         if(config==null){
-            log.warn("id:{},配置名称:{}，不存在",hospitalId,getId());
+            log.warn("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
             return;
         }
         judgeAnalPoor(source,config);

nb-system/src/main/java/com/nb/bus/hospital/config/HospitalFunctionExtraConfigHandler.java

@@ -64,7 +64,7 @@ public class HospitalFunctionExtraConfigHandler  extends  AbstractHospitalConfig
     public void handler(BusDeviceRunningEntity source) {
         FunctionExtraConfig config = this.getConfig().as(FunctionExtraConfig.class);
         if(config==null){
-            log.warn("id:{},配置名称:{}，不存在",hospitalId,getId());
+            log.warn("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
             return;
         }
         if (config.getNoSignal()!=null&&config.getNoSignal()>=0) {

nb-system/src/main/java/com/nb/bus/hospital/config/HospitalPatientCodeHandler.java

@@ -42,11 +42,10 @@ public class HospitalPatientCodeHandler  extends AbstractHospitalConfigHandler<F
     public void handler(BusDeviceRunningEntity source) {
         FunctionPatientCodeConfig config = this.getConfig().as(FunctionPatientCodeConfig.class);
         if(config==null||!Boolean.TRUE.equals(config.getEnable())|| Objects.isNull(config.getFillChar())){
-            log.warn("id:{},配置名称:{}，不存在",hospitalId,getId());
+            log.warn("医院id:{},配置名称:{}，不存在",hospitalId,getId().getDescription());
             source.setFormatPatientCode(source.getPatientCode());
             return;
         }
-//        source.setIdentityCode(formatPatientCode(config,source.getIdentityCode(),source.getTenantId()));
         source.setFormatPatientCode(formatPatientCode(config,source.getPatientCode(),source.getTenantId()));
     }
 

nb-system/src/main/java/com/nb/bus/service/dto/ClinicAnalClinicRecord.java

@@ -74,6 +74,9 @@ public class ClinicAnalClinicRecord  implements Serializable {
     @ApiModelProperty(value = "医院名称")
     private String tenantName;
 
+    @ApiModelProperty(value = "术前访视单")
+    private String visitRecord;
+
     public static ClinicAnalClinicRecord parse(BusClinicEntity clinic){
         ClinicAnalClinicRecord clinicRecord = new ClinicAnalClinicRecord();
         clinicRecord.setId(clinic.getId());
@@ -92,6 +95,7 @@ public class ClinicAnalClinicRecord  implements Serializable {
         clinicRecord.setAnaType(clinic.getAnaType());
         clinicRecord.setAnalType(clinic.getAnalType());
         clinicRecord.setSurgeryDoctor(clinic.getSurgeryDoctor());
+        clinicRecord.setVisitRecord(clinic.getVisitRecord());
         return clinicRecord;
     }