Просмотр исходного кода

整合mybatisplus ,分页,窗口优化

lihong 2 лет назад
Родитель
Сommit
3761953b9e

+ 6 - 1
pom.xml

@@ -46,10 +46,15 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <dependency>
+       <!-- <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>2.0.1</version>
+        </dependency>-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.2</version>
         </dependency>
         <!-- 添加JDBC依赖 重要-->
         <dependency>

+ 49 - 0
src/main/java/cn/hnthyy/thmz/common/datasource/BaseDataSource.java

@@ -0,0 +1,49 @@
+package cn.hnthyy.thmz.common.datasource;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: 数据源基础配置
+ * @Author:lihong
+ * @Date: 2023/8/17
+ */
+@Configuration
+public class BaseDataSource {
+    @Value("${spring.datasource.durid.initial-size}")
+    protected Integer initialSize;
+    @Value("${spring.datasource.durid.max-active}")
+    protected Integer maxActive;
+    @Value("${spring.datasource.durid.min-idle}")
+    protected Integer minIdle;
+    @Value("${spring.datasource.durid.max-wait}")
+    protected Long maxWait;
+    @Value("${spring.datasource.durid.validation-query}")
+    protected String validationQuery;
+    @Value("${spring.datasource.durid.test-while-idle}")
+    protected Boolean testWhileIdle;
+    @Value("${spring.datasource.durid.test-on-borrow}")
+    protected Boolean testOnBorrow;
+    @Value("${spring.datasource.durid.test-on-return}")
+    protected Boolean testOnReturn;
+    @Value("${spring.datasource.durid.time-between-eviction-runs-millis}")
+    protected Long timeBetweenEvictionRunsMillis;
+    @Value("${spring.datasource.durid.min-evictable-idle-time-millis}")
+    protected Long minEvictableIdleTimeMillis;
+    @Value("${spring.datasource.durid.filters}")
+    protected String filters;
+    @Value("${spring.datasource.durid.pool-prepared-statements}")
+    protected Boolean poolPreparedStatements;
+    @Value("${spring.datasource.durid.max-pool-prepared-statement-per-connection-size}")
+    protected Integer maxPoolPreparedStatementPerConnectionSize;
+    @Value("${spring.datasource.durid.remove-abandoned}")
+    protected Boolean removeAbandoned;
+    @Value("${spring.datasource.durid.remove-abandoned-timeout}")
+    protected Integer removeAbandonedTimeout;
+    @Value("${spring.datasource.durid.log-abandoned}")
+    protected Boolean logAbandoned;
+    @Value("${spring.datasource.durid.use-unfair-lock}")
+    protected Boolean useUnfairLock;
+
+
+}

+ 17 - 43
src/main/java/cn/hnthyy/thmz/common/datasource/DruidHisDataSource.java

@@ -1,10 +1,13 @@
 package cn.hnthyy.thmz.common.datasource;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -12,12 +15,13 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
 import javax.sql.DataSource;
 import java.sql.SQLException;
 
 @Configuration
 @MapperScan(basePackages = "cn.hnthyy.thmz.mapper.his", sqlSessionTemplateRef = "hisSqlSessionTemplate")
-public class DruidHisDataSource {
+public class DruidHisDataSource  extends BaseDataSource{
     @Value("${spring.datasource.his.driver-class-name}")
     private String driverClassName;
     @Value("${spring.datasource.his.jdbc-url}")
@@ -26,43 +30,9 @@ public class DruidHisDataSource {
     private String username;
     @Value("${spring.datasource.his.password}")
     private String password;
+    @Autowired
+    private MybatisPlusInterceptor sqlSeverMybatisPlusInterceptor;
 
-//    @Value("${spring.datasource.durid.type}")
-//    private Class type;
-    @Value("${spring.datasource.durid.initial-size}")
-    private Integer initialSize;
-    @Value("${spring.datasource.durid.max-active}")
-    private Integer maxActive;
-    @Value("${spring.datasource.durid.min-idle}")
-    private Integer minIdle;
-    @Value("${spring.datasource.durid.max-wait}")
-    private Long maxWait;
-    @Value("${spring.datasource.durid.validation-query}")
-    private String validationQuery;
-    @Value("${spring.datasource.durid.test-while-idle}")
-    private Boolean testWhileIdle;
-    @Value("${spring.datasource.durid.test-on-borrow}")
-    private Boolean testOnBorrow;
-    @Value("${spring.datasource.durid.test-on-return}")
-    private Boolean testOnReturn;
-    @Value("${spring.datasource.durid.time-between-eviction-runs-millis}")
-    private Long timeBetweenEvictionRunsMillis;
-    @Value("${spring.datasource.durid.min-evictable-idle-time-millis}")
-    private Long minEvictableIdleTimeMillis;
-    @Value("${spring.datasource.durid.filters}")
-    private String filters;
-    @Value("${spring.datasource.durid.pool-prepared-statements}")
-    private Boolean poolPreparedStatements;
-    @Value("${spring.datasource.durid.max-pool-prepared-statement-per-connection-size}")
-    private Integer maxPoolPreparedStatementPerConnectionSize;
-    @Value("${spring.datasource.durid.remove-abandoned}")
-    private Boolean removeAbandoned;
-    @Value("${spring.datasource.durid.remove-abandoned-timeout}")
-    private Integer removeAbandonedTimeout;
-    @Value("${spring.datasource.durid.log-abandoned}")
-    private Boolean logAbandoned;
-    @Value("${spring.datasource.durid.use-unfair-lock}")
-    private Boolean useUnfairLock;
     /**
      * 多数据源工程,这是导致这个配置没有生效的原因,因为他不知道为哪个数据源开启驼峰命名
      * 所以我们需要在配置多数据源的文件中,单独加入配置,(其他配置也是如此,只要涉及到多数据源的,都需要给每一个数据源去配置)
@@ -70,10 +40,10 @@ public class DruidHisDataSource {
      * @return
      */
     @Bean(name = "hisConfiguration")
-    @ConfigurationProperties(prefix = "mybatis.configuration")
+    @ConfigurationProperties(prefix = "mybatis-plus.configuration")
     @Primary
-    public org.apache.ibatis.session.Configuration hisConfiguration() {
-        return new org.apache.ibatis.session.Configuration();
+    public MybatisConfiguration hisConfiguration() {
+        return new MybatisConfiguration();
     }
 
 
@@ -114,10 +84,12 @@ public class DruidHisDataSource {
 
     @Bean(name = "hisSqlSessionFactory")
     @Primary
-    public SqlSessionFactory hisSqlSessionFactory(@Qualifier("hisData") DataSource dataSource, @Qualifier("hisConfiguration") org.apache.ibatis.session.Configuration configuration) throws Exception {
-        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+    public SqlSessionFactory hisSqlSessionFactory(@Qualifier("hisData") DataSource dataSource, @Qualifier("hisConfiguration") MybatisConfiguration configuration) throws Exception {
+        //SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
         bean.setDataSource(dataSource);
         bean.setConfiguration(configuration);
+        bean.setPlugins(sqlSeverMybatisPlusInterceptor);
         return bean.getObject();
     }
 
@@ -133,4 +105,6 @@ public class DruidHisDataSource {
         return new SqlSessionTemplate(sqlSessionFactory);
     }
 
+
+
 }

+ 15 - 44
src/main/java/cn/hnthyy/thmz/common/datasource/DruidLisDataSource.java

@@ -1,22 +1,26 @@
 package cn.hnthyy.thmz.common.datasource;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
 import javax.sql.DataSource;
 import java.sql.SQLException;
 
 @Configuration
 @MapperScan(basePackages = "cn.hnthyy.thmz.mapper.lis", sqlSessionTemplateRef  = "lisSqlSessionTemplate")
-public class DruidLisDataSource {
+public class DruidLisDataSource extends BaseDataSource{
     @Value("${spring.datasource.lis.driver-class-name}")
     private String driverClassName;
     @Value("${spring.datasource.lis.jdbc-url}")
@@ -25,52 +29,17 @@ public class DruidLisDataSource {
     private String username;
     @Value("${spring.datasource.lis.password}")
     private String password;
-
-    //    @Value("${spring.datasource.durid.type}")
-//    private Class type;
-    @Value("${spring.datasource.durid.initial-size}")
-    private Integer initialSize;
-    @Value("${spring.datasource.durid.max-active}")
-    private Integer maxActive;
-    @Value("${spring.datasource.durid.min-idle}")
-    private Integer minIdle;
-    @Value("${spring.datasource.durid.max-wait}")
-    private Long maxWait;
-    @Value("${spring.datasource.durid.validation-query}")
-    private String validationQuery;
-    @Value("${spring.datasource.durid.test-while-idle}")
-    private Boolean testWhileIdle;
-    @Value("${spring.datasource.durid.test-on-borrow}")
-    private Boolean testOnBorrow;
-    @Value("${spring.datasource.durid.test-on-return}")
-    private Boolean testOnReturn;
-    @Value("${spring.datasource.durid.time-between-eviction-runs-millis}")
-    private Long timeBetweenEvictionRunsMillis;
-    @Value("${spring.datasource.durid.min-evictable-idle-time-millis}")
-    private Long minEvictableIdleTimeMillis;
-    @Value("${spring.datasource.durid.filters}")
-    private String filters;
-    @Value("${spring.datasource.durid.pool-prepared-statements}")
-    private Boolean poolPreparedStatements;
-    @Value("${spring.datasource.durid.max-pool-prepared-statement-per-connection-size}")
-    private Integer maxPoolPreparedStatementPerConnectionSize;
-    @Value("${spring.datasource.durid.remove-abandoned}")
-    private Boolean removeAbandoned;
-    @Value("${spring.datasource.durid.remove-abandoned-timeout}")
-    private Integer removeAbandonedTimeout;
-    @Value("${spring.datasource.durid.log-abandoned}")
-    private Boolean logAbandoned;
-    @Value("${spring.datasource.durid.use-unfair-lock}")
-    private Boolean useUnfairLock;
+    @Autowired
+    private MybatisPlusInterceptor sqlSeverMybatisPlusInterceptor;
     /**
      * 多数据源工程,这是导致这个配置没有生效的原因,因为他不知道为哪个数据源开启驼峰命名
      * 所以我们需要在配置多数据源的文件中,单独加入配置,(其他配置也是如此,只要涉及到多数据源的,都需要给每一个数据源去配置)
      * @return
      */
     @Bean(name = "lisConfiguration")
-    @ConfigurationProperties(prefix = "mybatis.configuration")
-    public org.apache.ibatis.session.Configuration lisConfiguration(){
-        return new org.apache.ibatis.session.Configuration();
+    @ConfigurationProperties(prefix = "mybatis-plus.configuration")
+    public MybatisConfiguration lisConfiguration(){
+        return new MybatisConfiguration();
     }
 
     @Bean(name = "lisData")
@@ -108,10 +77,12 @@ public class DruidLisDataSource {
     }
 
     @Bean(name = "lisSqlSessionFactory")
-    public SqlSessionFactory lisSqlSessionFactory(@Qualifier("lisData") DataSource dataSource,@Qualifier("lisConfiguration") org.apache.ibatis.session.Configuration configuration) throws Exception {
-        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+    public SqlSessionFactory lisSqlSessionFactory(@Qualifier("lisData") DataSource dataSource,@Qualifier("lisConfiguration") MybatisConfiguration configuration) throws Exception {
+        //SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
         bean.setDataSource(dataSource);
         bean.setConfiguration(configuration);
+        bean.setPlugins(sqlSeverMybatisPlusInterceptor);
         return bean.getObject();
     }
 

+ 16 - 44
src/main/java/cn/hnthyy/thmz/common/datasource/DruidThmzDataSource.java

@@ -1,22 +1,26 @@
 package cn.hnthyy.thmz.common.datasource;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
 import javax.sql.DataSource;
 import java.sql.SQLException;
 
 @Configuration
 @MapperScan(basePackages = "cn.hnthyy.thmz.mapper.thmz", sqlSessionTemplateRef  = "thmzSqlSessionTemplate")
-public class DruidThmzDataSource {
+public class DruidThmzDataSource extends BaseDataSource{
     @Value("${spring.datasource.thmz.driver-class-name}")
     private String driverClassName;
     @Value("${spring.datasource.thmz.jdbc-url}")
@@ -25,43 +29,8 @@ public class DruidThmzDataSource {
     private String username;
     @Value("${spring.datasource.thmz.password}")
     private String password;
-
-    //    @Value("${spring.datasource.durid.type}")
-//    private Class type;
-    @Value("${spring.datasource.durid.initial-size}")
-    private Integer initialSize;
-    @Value("${spring.datasource.durid.max-active}")
-    private Integer maxActive;
-    @Value("${spring.datasource.durid.min-idle}")
-    private Integer minIdle;
-    @Value("${spring.datasource.durid.max-wait}")
-    private Long maxWait;
-    @Value("${spring.datasource.durid.validation-query}")
-    private String validationQuery;
-    @Value("${spring.datasource.durid.test-while-idle}")
-    private Boolean testWhileIdle;
-    @Value("${spring.datasource.durid.test-on-borrow}")
-    private Boolean testOnBorrow;
-    @Value("${spring.datasource.durid.test-on-return}")
-    private Boolean testOnReturn;
-    @Value("${spring.datasource.durid.time-between-eviction-runs-millis}")
-    private Long timeBetweenEvictionRunsMillis;
-    @Value("${spring.datasource.durid.min-evictable-idle-time-millis}")
-    private Long minEvictableIdleTimeMillis;
-    @Value("${spring.datasource.durid.filters}")
-    private String filters;
-    @Value("${spring.datasource.durid.pool-prepared-statements}")
-    private Boolean poolPreparedStatements;
-    @Value("${spring.datasource.durid.max-pool-prepared-statement-per-connection-size}")
-    private Integer maxPoolPreparedStatementPerConnectionSize;
-    @Value("${spring.datasource.durid.remove-abandoned}")
-    private Boolean removeAbandoned;
-    @Value("${spring.datasource.durid.remove-abandoned-timeout}")
-    private Integer removeAbandonedTimeout;
-    @Value("${spring.datasource.durid.log-abandoned}")
-    private Boolean logAbandoned;
-    @Value("${spring.datasource.durid.use-unfair-lock}")
-    private Boolean useUnfairLock;
+    @Autowired
+    private MybatisPlusInterceptor mariadbMybatisPlusInterceptor;
 
     /**
      * 多数据源工程,这是导致这个配置没有生效的原因,因为他不知道为哪个数据源开启驼峰命名
@@ -69,9 +38,9 @@ public class DruidThmzDataSource {
      * @return
      */
     @Bean(name = "thmzConfiguration")
-    @ConfigurationProperties(prefix = "mybatis.configuration")
-    public org.apache.ibatis.session.Configuration thmzConfiguration(){
-        return new org.apache.ibatis.session.Configuration();
+    @ConfigurationProperties(prefix = "mybatis-plus.configuration")
+    public MybatisConfiguration thmzConfiguration(){
+        return new MybatisConfiguration();
     }
 
     @Bean(name = "thmzData")
@@ -109,10 +78,12 @@ public class DruidThmzDataSource {
     }
 
     @Bean(name = "thmzSqlSessionFactory")
-    public SqlSessionFactory thmzSqlSessionFactory(@Qualifier("thmzData") DataSource dataSource,@Qualifier("thmzConfiguration") org.apache.ibatis.session.Configuration configuration) throws Exception {
-        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+    public SqlSessionFactory thmzSqlSessionFactory(@Qualifier("thmzData") DataSource dataSource,@Qualifier("thmzConfiguration") MybatisConfiguration configuration) throws Exception {
+        //SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
         bean.setDataSource(dataSource);
         bean.setConfiguration(configuration);
+        bean.setPlugins(mariadbMybatisPlusInterceptor);
         return bean.getObject();
     }
 
@@ -126,4 +97,5 @@ public class DruidThmzDataSource {
         return new SqlSessionTemplate(sqlSessionFactory);
     }
 
+
 }

+ 29 - 0
src/main/java/cn/hnthyy/thmz/common/datasource/MybatisPlusInterceptorConfig.java

@@ -0,0 +1,29 @@
+package cn.hnthyy.thmz.common.datasource;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: 分页拦截器
+ * @Author:lihong
+ * @Date: 2023/8/17
+ */
+@Configuration
+public class MybatisPlusInterceptorConfig {
+    @Bean
+    public MybatisPlusInterceptor sqlSeverMybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.SQL_SERVER2005));
+        return interceptor;
+    }
+
+    @Bean
+    public MybatisPlusInterceptor mariadbMybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MARIADB));
+        return interceptor;
+    }
+}

+ 1 - 1
src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -5195,7 +5195,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                 feeMap.put(billItemCode, temp);
             }
         }
-        return totalPayable.setScale(2, BigDecimal.ROUND_FLOOR);
+        return totalPayable.setScale(2, BigDecimal.ROUND_HALF_UP);
     }
 
     /**

+ 15 - 2
src/main/java/cn/hnthyy/thmz/service/impl/thmz/WindowsServiceImpl.java

@@ -7,20 +7,25 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Service
 public class WindowsServiceImpl implements WindowsService {
+    //缓存
+    private static Map<String, Windows> map = new ConcurrentHashMap<>();
+
     @SuppressWarnings("all")
     @Autowired
     private WindowsMapper windowsMapper;
     @Override
     public int saveWindows(Windows windows) {
+        map.remove(windows.getIpAddress());
         if(windows.getId()==null){
             return windowsMapper.insertUser(windows);
         }
         windows.setUpdateDate(new Date());
         return windowsMapper.updateWindows(windows);
-
     }
 
     @Override
@@ -30,12 +35,20 @@ public class WindowsServiceImpl implements WindowsService {
 
     @Override
     public Windows queryLastWindowsIpAddress(String ipAddress) {
-        return windowsMapper.selectLastWindowsByIpAddress(ipAddress);
+        if(!map.containsKey(ipAddress)){
+            Windows windows = windowsMapper.selectLastWindowsByIpAddress(ipAddress);
+            if(windows != null){
+                map.put(ipAddress,windows);
+            }
+        }
+        return map.get(ipAddress);
     }
 
     @Override
     public int modifyWindows(Windows windows) {
+        map.remove(windows.getIpAddress());
         return windowsMapper.updateWindows(windows);
     }
 
+
 }

+ 8 - 6
src/main/resources/application-dev.yml

@@ -102,15 +102,17 @@ spring:
 
 
 #配置项:开启下划线到驼峰的自动转换. 作用:将数据库字段根据驼峰规则自动注入到对象属性。
-mybatis:
+#mybatis:
+#  configuration:
+#    map-underscore-to-camel-case: true
+mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
 
-
 #打印SQL信息
 logging:
   level:
-    cn.hnthyy.thmz.mapper: info
+    cn.hnthyy.thmz.mapper: debug
 
 
 #企业微信消息服务地址测试环境
@@ -130,10 +132,10 @@ setUnitPrice: false
 #泰和微信开放服务地址测试环境
 haiciServiceUrl: "http://172.16.30.26:8805/wxserver"
 
-#泰和微信缴费服务地址测试环境
+#泰和微信缴费服务地址测试环境 8077
 wxPayOrderServiceUrl: "http://172.16.30.26:8706"
 
-#特殊门诊测试地址
+#特殊门诊测试地址 8077
 tsmzServiceUrl: "http://172.16.30.26:8706/markMtFees"
 
 #流行病调查问卷测试地址
@@ -151,7 +153,7 @@ audioServiceUrl: "http://webhis.thyy.cn:8706/voice/textToSpeech"
 soap_url: "http://172.16.32.178:622/pushservice.asmx?wsdl"
 
 #websocket 地址前半部分
-webSocketHost: "ws://172.16.30.33:8089/thmz/"
+webSocketHost: "ws://172.16.30.119:8089/thmz/"
 
 #门诊结算单地址
 mzjsdHost: http://172.16.30.26:3000

+ 10 - 8
src/main/resources/application-prod.yml

@@ -98,11 +98,13 @@ spring:
     cache: false
 
 #配置项:开启下划线到驼峰的自动转换. 作用:将数据库字段根据驼峰规则自动注入到对象属性。
-mybatis:
+#mybatis:
+#  configuration:
+#    map-underscore-to-camel-case: true
+mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
 
-
 #打印SQL信息
 logging:
   level:
@@ -111,7 +113,7 @@ logging:
 
 
 #企业微信消息服务地址生产环境
-serviceUrl: "http://webhis.thyy.cn:8706/sendWxInfo/send"
+serviceUrl: "http://webhis.thyy.cn:8077/sendWxInfo/send"
 
 #卡号变更通知开关
 sendNoticeToHaiCi: true
@@ -129,10 +131,10 @@ setUnitPrice: false
 haiciServiceUrl: "http://192.168.200.3/wxserver"
 
 #泰和微信缴费服务地址生产环境
-wxPayOrderServiceUrl: "http://webhis.thyy.cn:8706"
+wxPayOrderServiceUrl: "http://webhis.thyy.cn:8077"
 
 #特殊门诊生产地址
-tsmzServiceUrl: "http://webhis.thyy.cn:8706/markMtFees"
+tsmzServiceUrl: "http://webhis.thyy.cn:8077/markMtFees"
 #流行病调查问卷生产地址
 lxbdcwjUrl: "http://csth.hnthhz.com:8083/assessments/covid/"
 
@@ -140,10 +142,10 @@ lxbdcwjUrl: "http://csth.hnthhz.com:8083/assessments/covid/"
 callBackYJYYUrl: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxbde6b16acad84204&redirect_uri=http://staticweb.hnthyy.cn/wxserver/redirect/page2?to=resignOrRefund_"
 
 #叫号通知接口地址
-notifyServiceUrl: "http://webhis.thyy.cn:8706/triage/notify"
+notifyServiceUrl: "http://webhis.thyy.cn:8077/triage/notify"
 
 #语音生成接口地址
-audioServiceUrl: "http://webhis.thyy.cn:8706/voice/textToSpeech"
+audioServiceUrl: "http://webhis.thyy.cn:8077/voice/textToSpeech"
 
 #化验结果接口
 soap_url: "http://172.16.32.178:622/pushservice.asmx?wsdl"
@@ -167,4 +169,4 @@ rationalUseOfMedicineUrl: "http://172.16.32.121:8016/Audit.ashx"
 misPossUrl: "http://172.16.32.201:8080/ccbmis/transaction/"
 
 #调用医保药品更新最新报销比例地址
-hiDrugPostUrl: "http://webhis.thyy.cn:8706/nationalMatch/queryPsnPayProp?hiListCode="
+hiDrugPostUrl: "http://webhis.thyy.cn:8077/nationalMatch/queryPsnPayProp?hiListCode="