xiaocy2021 4 years ago
parent
commit
8add9481d1

+ 14 - 4
pom.xml

@@ -33,9 +33,9 @@
         </dependency>
         <!-- 肖蟾 使用mybatis-plus-->
         <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.1.4</version>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.3.0</version>
         </dependency>
         <!--肖蟾 代码生成器-->
         <dependency>
@@ -55,7 +55,12 @@
             <artifactId>velocity-engine-core</artifactId>
             <version>2.0</version>
         </dependency>
-
+        <!--多数据源-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.3.2</version>
+        </dependency>
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ojdbc6</artifactId>
@@ -155,6 +160,11 @@
             <artifactId>jacob</artifactId>
             <version>1.18</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

+ 1 - 1
src/main/java/thyyxxk/webserver/WebServerApplication.java

@@ -1,5 +1,6 @@
 package thyyxxk.webserver;
 
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -11,7 +12,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableScheduling
 @EnableConfigurationProperties
 public class WebServerApplication {
-
     public static void main(String[] args) {
         SpringApplication.run(WebServerApplication.class, args);
     }

+ 13 - 0
src/main/java/thyyxxk/webserver/config/CorsConfig.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.config;
 
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
@@ -23,4 +25,15 @@ public class CorsConfig {
         source.registerCorsConfiguration("/**", buildConfig());
         return new CorsFilter(source);
     }
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        // 设置请求的页面大于最大页后操作, true调回到首页,false 继续请求  默认false
+        // paginationInterceptor.setOverflow(false);
+        // 设置最大单页限制数量,默认 500 条,-1 不受限制
+         paginationInterceptor.setLimit(-1);
+        // 开启 count 的 join 优化,只针对部分 left join
+        paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
+        return paginationInterceptor;
+    }
 }

+ 0 - 56
src/main/java/thyyxxk/webserver/config/database/HisDataSourceConfig.java

@@ -1,56 +0,0 @@
-package thyyxxk.webserver.config.database;
-
-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.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-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;
-
-@Configuration
-@MapperScan(basePackages = "thyyxxk.webserver.dao.his",sqlSessionFactoryRef = "hisSqlSessionFactory")
-public class HisDataSourceConfig {
-
-    @Bean(name = "hisConfiguration")
-    @ConfigurationProperties(prefix = "mybatis.configuration")
-    @Primary
-    public org.apache.ibatis.session.Configuration hisConfiguration() {
-        return new org.apache.ibatis.session.Configuration();
-    }
-
-    @Bean(name="hisDataSource")
-    @ConfigurationProperties(prefix="spring.datasource.his")
-    @Primary
-    public DataSource hisDataSource(){
-        return DataSourceBuilder.create().build();
-    }
-
-    @Bean(name = "hisSqlSessionFactory")
-    @Primary
-    public SqlSessionFactory hisSqlSessionFactory(@Qualifier("hisDataSource") DataSource dataSource,
-                                                  @Qualifier("hisConfiguration") org.apache.ibatis.session.Configuration configuration) throws Exception{
-        SqlSessionFactoryBean bean=new SqlSessionFactoryBean();
-        bean.setConfiguration(configuration);
-        bean.setDataSource(dataSource);
-        return bean.getObject();
-    }
-
-    @Bean(name="hisTransactionManager")
-    @Primary
-    public DataSourceTransactionManager hisTransactionManager(@Qualifier("hisDataSource") DataSource dataSource){
-        return new DataSourceTransactionManager(dataSource);
-    }
-
-    @Bean(name="hisSqlSessionTemplate")
-    @Primary
-    public SqlSessionTemplate hisSqlSessionTemplate(@Qualifier("hisSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
-        return new SqlSessionTemplate(sqlSessionFactory);
-    }
-}

+ 0 - 51
src/main/java/thyyxxk/webserver/config/database/LisDataSourceConfig.java

@@ -1,51 +0,0 @@
-package thyyxxk.webserver.config.database;
-
-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.Qualifier;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-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;
-
-@Configuration
-@MapperScan(basePackages = "thyyxxk.webserver.dao.lis", sqlSessionTemplateRef  = "lisSqlSessionTemplate")
-public class LisDataSourceConfig {
-
-    @Bean(name = "lisConfiguration")
-    @ConfigurationProperties(prefix = "mybatis.configuration.map-underscore-to-camel-case")
-    @Primary
-    public org.apache.ibatis.session.Configuration hisConfiguration() {
-        return new org.apache.ibatis.session.Configuration();
-    }
-
-    @Bean(name="lisDataSource")
-    @ConfigurationProperties(prefix="spring.datasource.lis")
-    public DataSource lisDataSource(){
-        return DataSourceBuilder.create().build();
-    }
-
-    @Bean(name = "lisSqlSessionFactory")
-    public SqlSessionFactory lisSqlSessionFactory(@Qualifier("lisDataSource") DataSource dataSource, @Qualifier("lisConfiguration") org.apache.ibatis.session.Configuration configuration)throws Exception{
-        SqlSessionFactoryBean bean=new SqlSessionFactoryBean();
-        bean.setConfiguration(configuration);
-        bean.setDataSource(dataSource);
-        return bean.getObject();
-    }
-
-    @Bean(name="lisTransactionManager")
-    public DataSourceTransactionManager lisTransactionManager(@Qualifier("lisDataSource") DataSource dataSource){
-        return new DataSourceTransactionManager(dataSource);
-    }
-
-    @Bean(name="lisSqlSessionTemplate")
-    public SqlSessionTemplate lisSqlSessionTemplate(@Qualifier("lisSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
-        return new SqlSessionTemplate(sqlSessionFactory);
-    }
-}

+ 4 - 5
src/main/java/thyyxxk/webserver/controller/datamodify/ZyDetailChargeController.java

@@ -6,8 +6,7 @@ import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.datamodify.ZyDetailCharge;
 import thyyxxk.webserver.service.datamodify.ZyDetailChargeService;
-
-import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,9 +26,9 @@ public class ZyDetailChargeController {
         this.zy = zy;
     }
 
-    @GetMapping("/queryTotal")
-    public ResultVo<List<ZyDetailCharge>> queryTotal(@RequestParam("inpatientNo")String inpatientNo,@RequestParam("chargeCodeMx") String chargeCodeMx){
-        return zy.queryTotal(inpatientNo,chargeCodeMx);
+    @PostMapping("/queryTotal")
+    public ResultVo<Map<String,Object>> queryTotal(@RequestBody ZyDetailCharge data){
+        return zy.queryTotal(data);
     }
 
     @PostMapping("/totalModify")

+ 2 - 1
src/main/java/thyyxxk/webserver/controller/querydata/TCovidVaccinateAppointmentController.java

@@ -12,6 +12,7 @@ import thyyxxk.webserver.service.querydata.TCovidVaccinateAppointmentService;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -31,7 +32,7 @@ public class TCovidVaccinateAppointmentController {
         this.tc = tc;
     }
     @PostMapping("/queryXGYM")
-    public ResultVo<List<TCovidVaccinateAppointment>> queryXGYM(@RequestBody TCovidVaccinateAppointment data){
+    public ResultVo<Map<String,Object>> queryXGYM(@RequestBody TCovidVaccinateAppointment data){
         return tc.queryXGYM(data);
     }
 

+ 25 - 1
src/main/java/thyyxxk/webserver/dao/his/datamodify/ZyDetailChargeMapper.java

@@ -2,6 +2,7 @@ package thyyxxk.webserver.dao.his.datamodify;
 
 
 import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -19,7 +20,6 @@ import java.util.List;
  * @since 2021-03-13
  */
 @Mapper
-@SqlParser(filter=true)
 public interface ZyDetailChargeMapper   {
 
     @Select("select admiss_times,ledger_sn,detail_sn,charge_date,inpatient_no,\n" +
@@ -49,4 +49,28 @@ public interface ZyDetailChargeMapper   {
             "where inpatient_no=#{inpatientNo} and detail_sn=#{detailSn} " +
             "and admiss_times=#{admissTimes} and ledger_sn=#{ledgerSn} ")
     boolean totalModify(ZyDetailCharge data);
+
+    @Select("select admiss_times,ledger_sn,detail_sn,charge_date,rtrim(inpatient_no) as inpatient_no,\n" +
+            "case when (a.serial=01) then '药品(小)' when (a.serial=99) then '药品(大)' else '项目' end as serial,\n" +
+            "op_id_code=rtrim((select name from a_employee_mi where code=op_id_code)),\n" +
+            "case when (infant_flag=0) then '否' else '是' end as  infant_flag,\n" +
+            "case when (charge_status=1) then '录入' when (charge_status=2) then '上账' else '结算' end as charge_status,\n" +
+            "case when ((select name from zd_charge_item where  code = charge_code_mx) is null) then (b.name)\n" +
+            "else (select name from zd_charge_item where  code = charge_code_mx )\n" +
+            "end as charge_code,\n" +
+            "charge_fee,\n" +
+            "case when (a.self_flag=0) then '否' else '是' end as self_flag,\n" +
+            "ward_code=(select name from zd_unit_code where code = ward_code),\n" +
+            "dept_code=(select name from zd_unit_code where code = dept_code),\n" +
+            "order_no,ope_flag,\n" +
+            "exec_unit=(select name from zd_unit_code where code=exec_unit),\n" +
+            "gen_time,a.charge_code_mx,charge_amount\n" +
+            "from zy_detail_charge as a\n" +
+            "inner join yp_zd_dict as b on (a.charge_code_mx = code and a.serial = b.serial)\n" +
+            "where inpatient_no=#{inpatientNo} and charge_code_mx=#{chargeCodeMx} and\n" +
+            "admiss_times=(select admiss_times from zy_actpatient where inpatient_no=a.inpatient_no)\n" +
+            "and ledger_sn=(select max(ledger_sn) from zy_ledger_file where inpatient_no=a.inpatient_no and admiss_times=a.admiss_times)")
+    IPage<ZyDetailCharge> queryHospitalizationExpenses(IPage<ZyDetailCharge> page,
+                                                       @Param("inpatientNo")String inpatientNo,
+                                                       @Param("chargeCodeMx")String chargeCodeMx);
 }

+ 1 - 1
src/main/java/thyyxxk/webserver/dao/his/makedbzfees/MakeDbzFeesDao.java

@@ -16,7 +16,7 @@ public interface MakeDbzFeesDao {
     String getInpatientNo(@Param("patientId") String patientId);
 
     @Select("select rtrim(inpatient_no) inpatientNo, " +
-            "admiss_times, " +
+            "admiss_times," +
             "rtrim(admiss_ward) wardCode, " +
             "rtrim(small_dept) deptCode, " +
             "rtrim(isnull(operation, '')) as operation, " +

+ 12 - 0
src/main/java/thyyxxk/webserver/dao/his/querydata/TCovidVaccinateAppointmentMapper.java

@@ -1,5 +1,8 @@
 package thyyxxk.webserver.dao.his.querydata;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.pojo.querydata.TCovidVaccinateAppointment;
 import thyyxxk.webserver.pojo.querydata.TcovidVaccinateThreshold;
@@ -49,4 +52,13 @@ public interface TCovidVaccinateAppointmentMapper  {
 
     @Update("update t_covid_vaccinate_threshold set value = #{value} where date=#{date}")
     Boolean update(@Param("value")int value, @Param("date")String date);
+
+    @Select("select patient_id,a.name," +
+            "case when (sex=1) then '男' else '女' end as new_sex," +
+            "phone,social_no,age,corp_name,\n" +
+            "new_job_category=(b.name),execute_date from t_covid_vaccinate_appointment a\n" +
+            "inner join t_covid_appointment_job_category_dict b on (b.id = job_category) ${ew.customSqlSegment}")
+    IPage<TCovidVaccinateAppointment> mybatisPlusQueryXGYM (IPage<TCovidVaccinateAppointment> page,
+                                                           @Param(Constants.WRAPPER) Wrapper<TCovidVaccinateAppointment> queryWrapper);
+
 }

+ 2 - 0
src/main/java/thyyxxk/webserver/dao/lis/CovidExamDao.java

@@ -1,5 +1,6 @@
 package thyyxxk.webserver.dao.lis;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -8,6 +9,7 @@ import thyyxxk.webserver.pojo.examinations.covidexam.CovidExamResult;
 import java.util.List;
 
 @Mapper
+@DS("lis")
 public interface CovidExamDao {
 
     @Select("select " +

+ 4 - 0
src/main/java/thyyxxk/webserver/pojo/datamodify/ZyDetailCharge.java

@@ -101,5 +101,9 @@ public class ZyDetailCharge implements Serializable {
 
     private String consultPhysician;
 
+    private Integer pageSize;
+
+    private Integer currentPage;
+
 
 }

+ 2 - 0
src/main/java/thyyxxk/webserver/pojo/querydata/TCovidVaccinateAppointment.java

@@ -70,5 +70,7 @@ public class TCovidVaccinateAppointment implements Serializable {
 
     private Integer delFlag;
 
+    private Integer currentPage;
 
+    private Integer pageSize;
 }

+ 14 - 7
src/main/java/thyyxxk/webserver/service/datamodify/ZyDetailChargeService.java

@@ -1,5 +1,7 @@
 package thyyxxk.webserver.service.datamodify;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
@@ -9,7 +11,8 @@ import thyyxxk.webserver.pojo.datamodify.ZyDetailCharge;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -31,13 +34,17 @@ public class ZyDetailChargeService  {
     }
 
 
-    public ResultVo<List<ZyDetailCharge>> queryTotal(String inpatientNo,String chargeCodeMx){
-        List<ZyDetailCharge> list = dao.queryTotal(inpatientNo,chargeCodeMx);
-        log.info("查看总价格=>住院号{},收费项目码{}",inpatientNo,chargeCodeMx);
-        if(list.size()!=0){
-            return ResultVoUtil.success(list);
+    public ResultVo<Map<String,Object>> queryTotal(ZyDetailCharge data){
+        IPage<ZyDetailCharge> page = new Page<>(data.getCurrentPage(),data.getPageSize());
+        dao.queryHospitalizationExpenses(page,data.getInpatientNo(),data.getChargeCodeMx());
+        log.info("查看总价格=>住院号{},收费项目码{}",data.getInpatientNo(),data.getChargeCodeMx());
+        Map<String,Object> map = new HashMap<>();
+        map.put("data",page.getRecords());
+        map.put("total",page.getTotal());
+        if (page.getRecords().size()>0 || page.getTotal()>0){
+            return ResultVoUtil.success(map);
         }
-       return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST,"没有查询到对应的数据,患者可能出院了");
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST,"没有查询到对应的数据,患者可能出院了");
     }
 
     //修改价格

+ 27 - 10
src/main/java/thyyxxk/webserver/service/querydata/TCovidVaccinateAppointmentService.java

@@ -1,5 +1,8 @@
 package thyyxxk.webserver.service.querydata;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
@@ -14,7 +17,9 @@ import thyyxxk.webserver.utils.TokenUtil;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -35,14 +40,27 @@ public class TCovidVaccinateAppointmentService  {
         this.dao = dao;
     }
 
-    public ResultVo<List<TCovidVaccinateAppointment>> queryXGYM(TCovidVaccinateAppointment data){
+    public ResultVo<Map<String,Object>> queryXGYM(TCovidVaccinateAppointment data){
         log.info("查询新冠疫苗预约=>操作人:{},查找姓名:{},查找日期:{}", TokenUtil.getTokenUserId(),
-                data.getName(), DateUtil.formatDatetime(data.getExecuteDate(),"yyyy-MM-dd"));
-        List<TCovidVaccinateAppointment> list = dao.queryXGYM(data);
-        if (list.size()!=0){
-            return ResultVoUtil.success(list);
+                data.getName(),data.getExecuteDate()!=null? DateUtil.formatDatetime(data.getExecuteDate(),"yyyy-MM-dd"): "");
+        IPage<TCovidVaccinateAppointment> page = new Page<>(data.getCurrentPage(),data.getPageSize());
+
+        QueryWrapper<TCovidVaccinateAppointment> qw = new QueryWrapper<>();
+        Map map = new HashMap();
+        if (data.getName() != null && data.getName() !="" && !data.getName().equals("")){
+            qw.eq("a.name",data.getName());
+        }
+        if (data.getExecuteDate() != null  ){
+            qw.eq("execute_date",DateUtil.formatDatetime(data.getExecuteDate(),"yyyy-MM-dd"));
         }
-        return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
+        dao.mybatisPlusQueryXGYM(page,qw);
+
+        if (page.getTotal()>0 || page.getRecords().size()>0){
+            map.put("total",page.getTotal());
+            map.put("data",page.getRecords());
+            return ResultVoUtil.success(map);
+        }
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
     }
 
     public ResultVo<List<TcovidVaccinateThreshold>> queryCount() throws ParseException {
@@ -57,11 +75,10 @@ public class TCovidVaccinateAppointmentService  {
 
     }
 
-    public ResultVo<Boolean> update(int value, Date date, int newValue){
+    public ResultVo<Boolean> update(int modificationDate, Date date, int newRevisionDate){
         String oldDate = sdf.format(date);
         log.info("修改疫苗预约人数=>操作员:{},修改的日期为:{},限制人数为:{},原本的人数为:{}",
-                TokenUtil.getTokenUserId(),oldDate,newValue,value);
-         return ResultVoUtil.success(dao.update(newValue,oldDate));
+                TokenUtil.getTokenUserId(),oldDate,newRevisionDate,modificationDate);
+         return ResultVoUtil.success(dao.update(newRevisionDate,oldDate));
     }
-
 }

+ 23 - 26
src/main/resources/application.yml

@@ -7,32 +7,29 @@ spring:
   thymeleaf:
     cache: false
   datasource:
-    his:
-      jdbc-url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
-      username: "sa"
-      password:
-      type: "com.zaxxer.hikari.HikariDataSource"
-      driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-      minimum-idle: 10
-      idle-timeout: 180000
-      maximum-pool-size: 30
-      auto-commit: true
-      pool-name: hisDbPool
-      connection-timeout: 30000
-      connection-test-query: select 1
-    lis:
-      jdbc-url: "jdbc:sqlserver://172.16.32.178:1433;databaseName=eLimsCore"
-      username: "sa"
-      password: "hnthxyyy"
-      type: "com.zaxxer.hikari.HikariDataSource"
-      driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-      minimum-idle: 10
-      idle-timeout: 180000
-      maximum-pool-size: 30
-      auto-commit: true
-      pool-name: lisDbPool
-      connection-timeout: 30000
-      connection-test-query: select 1
+    dynamic:
+      primary: his
+      strict: false
+      datasource:
+        his:
+          url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
+          username: "sa"
+          password:
+          type: "com.zaxxer.hikari.HikariDataSource"
+          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+        lis:
+          url: "jdbc:sqlserver://172.16.32.178:1433;databaseName=eLimsCore"
+          username: "sa"
+          password: "hnthxyyy"
+          type: "com.zaxxer.hikari.HikariDataSource"
+          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+    minimum-idle: 10
+    idle-timeout: 180000
+    maximum-pool-size: 30
+    auto-commit: true
+    pool-name: lisDbPool
+    connection-timeout: 30000
+    connection-test-query: select 1
   rabbitmq:
     host: 172.16.30.26 #测试
     port: 5672

+ 10 - 0
src/test/java/thyyxxk/webserver/WebServerApplicationTests.java

@@ -1,13 +1,23 @@
 package thyyxxk.webserver;
 
+
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import thyyxxk.webserver.service.datamodify.ZyDetailChargeService;
+
+
+
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class WebServerApplicationTests {
+    @Autowired
+    private ZyDetailChargeService zy;
+
 
     @Test
     void contextLoads() {
+
     }
 
 }