diff --git a/pom.xml b/pom.xml index 20bf181..1943a5f 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,18 @@ cxf-rt-transports-http 3.1.8 + + com.alibaba + druid-spring-boot-starter + 1.1.10 + + + + + com.oracle.database.jdbc + ojdbc6 + 11.2.0.4 + org.apache.cxf cxf-rt-frontend-jaxws diff --git a/src/main/java/com/docus/bgts/DemoApplication.java b/src/main/java/com/docus/bgts/DemoApplication.java index 8f79215..d5059f8 100644 --- a/src/main/java/com/docus/bgts/DemoApplication.java +++ b/src/main/java/com/docus/bgts/DemoApplication.java @@ -1,11 +1,12 @@ package com.docus.bgts; +import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableScheduling; @EnableScheduling -@SpringBootApplication +@SpringBootApplication(exclude = {MybatisPlusAutoConfiguration.class}) public class DemoApplication { public static void main(String[] args) { diff --git a/src/main/java/com/docus/bgts/config/DbMysqlConfig.java b/src/main/java/com/docus/bgts/config/DbMysqlConfig.java new file mode 100644 index 0000000..1d4eb87 --- /dev/null +++ b/src/main/java/com/docus/bgts/config/DbMysqlConfig.java @@ -0,0 +1,66 @@ +package com.docus.bgts.config; + +import com.alibaba.druid.pool.DruidDataSource; +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; +import org.apache.ibatis.session.SqlSessionFactory; +import org.apache.ibatis.type.JdbcType; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.core.io.support.ResourcePatternResolver; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; + +import javax.sql.DataSource; + + +@Configuration +@MapperScan(basePackages = DbMysqlConfig.PACKAGE, sqlSessionFactoryRef = "dbmysqlSqlSessionFactory") +public class DbMysqlConfig { + // 这里一定要指定精准 否则后果不堪设想 + static final String PACKAGE = "com.docus.bgts.mapper.dbmysql"; + static final String MAPPER_LOCATION = "classpath:mapper/dbmysql/*.xml"; + + @Bean(name = "dbmysqlDataSource") + @ConfigurationProperties(prefix = "spring.datasource.mysql-docus") + public DataSource secondDataSource(){ + return new DruidDataSource(); + } + + /*注入事务*/ + @Bean(name = "dbmysqlTransactionManager") + public DataSourceTransactionManager secondTransactionManager() { + return new DataSourceTransactionManager(secondDataSource()); + } + + @Bean(name = "dbmysqlSqlSessionFactory") + public SqlSessionFactory secondSqlSessionFactory(@Qualifier("dbmysqlDataSource") DataSource dataSource) + throws Exception { + //配置mybatis-plus源 + MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean (); + //添加XML目录 + ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); + bean.setMapperLocations(resolver.getResources(MAPPER_LOCATION)); + // 实体类别名 + bean.setTypeAliasesPackage("com.docus.bgts.entity.*"); + MybatisConfiguration configuration = new MybatisConfiguration(); + //开启下划线转驼峰 + configuration.setMapUnderscoreToCamelCase(true); + configuration.setJdbcTypeForNull(JdbcType.NULL); + bean.setDataSource(dataSource); + bean.setConfiguration(configuration); + return bean.getObject(); +// +// final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); +// sessionFactory.setDataSource(secondDataSource); +// sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver() +// .getResources(DbMysqlConfig.MAPPER_LOCATION)); +// return sessionFactory.getObject(); + } + + +} diff --git a/src/main/java/com/docus/bgts/config/DbOracleConfig.java b/src/main/java/com/docus/bgts/config/DbOracleConfig.java new file mode 100644 index 0000000..cb64fc5 --- /dev/null +++ b/src/main/java/com/docus/bgts/config/DbOracleConfig.java @@ -0,0 +1,45 @@ +package com.docus.bgts.config; + +import com.alibaba.druid.pool.DruidDataSource; +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; + +import javax.sql.DataSource; + +@Configuration +@MapperScan(basePackages = DbOracleConfig.PACKAGE, sqlSessionFactoryRef = "dboracleSqlSessionFactory") +public class DbOracleConfig { + // 这里一定要指定精准 否则后果不堪设想 + static final String PACKAGE = "com.docus.bgts.mapper.dboracle"; + static final String MAPPER_LOCATION = "classpath:mapper/dboracle/*.xml"; + + @Bean(name = "dboracleDataSource") + @ConfigurationProperties(prefix = "spring.datasource.oracle-docus") + public DataSource secondDataSource(){ + return new DruidDataSource(); + } + + /*注入事务*/ + @Bean(name = "dboracleTransactionManager") + public DataSourceTransactionManager secondTransactionManager() { + return new DataSourceTransactionManager(secondDataSource()); + } + + @Bean(name = "dboracleSqlSessionFactory") + public SqlSessionFactory secondSqlSessionFactory(@Qualifier("dboracleDataSource") DataSource secondDataSource) + throws Exception { + final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); + sessionFactory.setDataSource(secondDataSource); + sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver() + .getResources(DbOracleConfig.MAPPER_LOCATION)); + return sessionFactory.getObject(); + } + +} diff --git a/src/main/java/com/docus/bgts/config/MybatisPlusConfig.java b/src/main/java/com/docus/bgts/config/MybatisPlusConfig.java index be9705c..3c12567 100644 --- a/src/main/java/com/docus/bgts/config/MybatisPlusConfig.java +++ b/src/main/java/com/docus/bgts/config/MybatisPlusConfig.java @@ -17,50 +17,50 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import javax.annotation.PostConstruct; import java.util.Objects; -@Configuration -@RequiredArgsConstructor -@EnableTransactionManagement -@MapperScan("com.docus.bgts.mapper") -@ConditionalOnClass(value = {PaginationInterceptor.class}) -public class MybatisPlusConfig { - - - private final MybatisPlusProperties mybatisPlusProperties; - @Bean - public PaginationInterceptor paginationInterceptor() { - PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); - return paginationInterceptor; - } - - @PostConstruct - public void initMybatisConfig(){ - mybatisPlusProperties.setMapperLocations(new String[]{"classpath*:/mapper/*Mapper.xml"}); - mybatisPlusProperties.setTypeAliasesPackage("com.docus.bgts.entity"); - - MybatisConfiguration configuration = mybatisPlusProperties.getConfiguration(); - if(Objects.isNull(configuration)){ - configuration=new MybatisConfiguration(); - } - configuration.setMapUnderscoreToCamelCase(true); - configuration.setCacheEnabled(true); - configuration.setLogImpl(NoLoggingImpl.class); - mybatisPlusProperties.setConfiguration(configuration); - - var globalConfig = mybatisPlusProperties.getGlobalConfig(); - if(Objects.isNull(globalConfig)){ - globalConfig=new GlobalConfig(); - } - GlobalConfig.DbConfig dbConfig = globalConfig.getDbConfig(); - if(Objects.isNull(dbConfig)){ - dbConfig=new GlobalConfig.DbConfig(); - } - configuration.setCallSettersOnNulls(true); - dbConfig.setIdType(IdType.ASSIGN_ID); - dbConfig.setTableUnderline(true); - dbConfig.setLogicDeleteValue("1"); - dbConfig.setLogicNotDeleteValue("0"); - dbConfig.setLogicDeleteField("def_flag"); - globalConfig.setDbConfig(dbConfig); - globalConfig.setBanner(false); - } -} \ No newline at end of file +//@Configuration +//@RequiredArgsConstructor +//@EnableTransactionManagement +//@MapperScan("com.docus.bgts.mapper") +//@ConditionalOnClass(value = {PaginationInterceptor.class}) +//public class MybatisPlusConfig { +// +// +// private final MybatisPlusProperties mybatisPlusProperties; +// @Bean +// public PaginationInterceptor paginationInterceptor() { +// PaginationInterceptor paginationInterceptor = new PaginationInterceptor(); +// return paginationInterceptor; +// } +// +// @PostConstruct +// public void initMybatisConfig(){ +// mybatisPlusProperties.setMapperLocations(new String[]{"classpath*:/mapper/*Mapper.xml"}); +// mybatisPlusProperties.setTypeAliasesPackage("com.docus.bgts.entity"); +// +// MybatisConfiguration configuration = mybatisPlusProperties.getConfiguration(); +// if(Objects.isNull(configuration)){ +// configuration=new MybatisConfiguration(); +// } +// configuration.setMapUnderscoreToCamelCase(true); +// configuration.setCacheEnabled(true); +// configuration.setLogImpl(NoLoggingImpl.class); +// mybatisPlusProperties.setConfiguration(configuration); +// +// var globalConfig = mybatisPlusProperties.getGlobalConfig(); +// if(Objects.isNull(globalConfig)){ +// globalConfig=new GlobalConfig(); +// } +// GlobalConfig.DbConfig dbConfig = globalConfig.getDbConfig(); +// if(Objects.isNull(dbConfig)){ +// dbConfig=new GlobalConfig.DbConfig(); +// } +// configuration.setCallSettersOnNulls(true); +// dbConfig.setIdType(IdType.ASSIGN_ID); +// dbConfig.setTableUnderline(true); +// dbConfig.setLogicDeleteValue("1"); +// dbConfig.setLogicNotDeleteValue("0"); +// dbConfig.setLogicDeleteField("def_flag"); +// globalConfig.setDbConfig(dbConfig); +// globalConfig.setBanner(false); +// } +//} \ No newline at end of file diff --git a/src/main/java/com/docus/bgts/controller/BgtsController.java b/src/main/java/com/docus/bgts/controller/BgtsController.java index 7895b05..9c56598 100644 --- a/src/main/java/com/docus/bgts/controller/BgtsController.java +++ b/src/main/java/com/docus/bgts/controller/BgtsController.java @@ -29,6 +29,11 @@ public class BgtsController { @Autowired IAfCollectTaskService afCollectTaskService; + @GetMapping("/test1") + public String test1(){ + return afCollectTaskService.getA(); + } + @ApiOperation("采集接口") @ApiImplicitParams({ @ApiImplicitParam(name = "empId",value = "患者主索引号",required = true,dataTypeClass = String.class), diff --git a/src/main/java/com/docus/bgts/entity/VDocumentPdf.java b/src/main/java/com/docus/bgts/entity/VDocumentPdf.java new file mode 100644 index 0000000..924071b --- /dev/null +++ b/src/main/java/com/docus/bgts/entity/VDocumentPdf.java @@ -0,0 +1,4 @@ +package com.docus.bgts.entity; + +public class VDocumentPdf { +} diff --git a/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java b/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java index 2ee8f97..50b8aa8 100644 --- a/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java +++ b/src/main/java/com/docus/bgts/facade/IAfCollectTaskService.java @@ -22,4 +22,6 @@ public interface IAfCollectTaskService extends IService { void insert(ReportDownDto reportDownDto); void updateInterfaceCollect(String collectSubId, int state); + + String getA(); } diff --git a/src/main/java/com/docus/bgts/mapper/AfCollectTaskMapper.java b/src/main/java/com/docus/bgts/mapper/dbmysql/AfCollectTaskMapper.java similarity index 92% rename from src/main/java/com/docus/bgts/mapper/AfCollectTaskMapper.java rename to src/main/java/com/docus/bgts/mapper/dbmysql/AfCollectTaskMapper.java index 27f9246..4619bb5 100644 --- a/src/main/java/com/docus/bgts/mapper/AfCollectTaskMapper.java +++ b/src/main/java/com/docus/bgts/mapper/dbmysql/AfCollectTaskMapper.java @@ -1,4 +1,4 @@ -package com.docus.bgts.mapper; +package com.docus.bgts.mapper.dbmysql; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/docus/bgts/mapper/AfInterfaceCollectMapper.java b/src/main/java/com/docus/bgts/mapper/dbmysql/AfInterfaceCollectMapper.java similarity index 83% rename from src/main/java/com/docus/bgts/mapper/AfInterfaceCollectMapper.java rename to src/main/java/com/docus/bgts/mapper/dbmysql/AfInterfaceCollectMapper.java index aa1e32a..0ddadb8 100644 --- a/src/main/java/com/docus/bgts/mapper/AfInterfaceCollectMapper.java +++ b/src/main/java/com/docus/bgts/mapper/dbmysql/AfInterfaceCollectMapper.java @@ -1,4 +1,4 @@ -package com.docus.bgts.mapper; +package com.docus.bgts.mapper.dbmysql; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.docus.bgts.entity.AfInterfaceCollect; diff --git a/src/main/java/com/docus/bgts/mapper/AfInterfaceCollectSubMapper.java b/src/main/java/com/docus/bgts/mapper/dbmysql/AfInterfaceCollectSubMapper.java similarity index 83% rename from src/main/java/com/docus/bgts/mapper/AfInterfaceCollectSubMapper.java rename to src/main/java/com/docus/bgts/mapper/dbmysql/AfInterfaceCollectSubMapper.java index 016177b..ba294d7 100644 --- a/src/main/java/com/docus/bgts/mapper/AfInterfaceCollectSubMapper.java +++ b/src/main/java/com/docus/bgts/mapper/dbmysql/AfInterfaceCollectSubMapper.java @@ -1,4 +1,4 @@ -package com.docus.bgts.mapper; +package com.docus.bgts.mapper.dbmysql; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.docus.bgts.entity.AfInterfaceCollectSub; diff --git a/src/main/java/com/docus/bgts/mapper/dboracle/TestMapper.java b/src/main/java/com/docus/bgts/mapper/dboracle/TestMapper.java new file mode 100644 index 0000000..30b7c24 --- /dev/null +++ b/src/main/java/com/docus/bgts/mapper/dboracle/TestMapper.java @@ -0,0 +1,8 @@ +package com.docus.bgts.mapper.dboracle; + +import java.util.List; + +public interface TestMapper { + + List getA(); +} diff --git a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java index 95c97d6..399101c 100644 --- a/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java +++ b/src/main/java/com/docus/bgts/service/AfCollectTaskServiceImpl.java @@ -5,14 +5,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.docus.bgts.entity.*; import com.docus.bgts.facade.IAfCollectTaskService; -import com.docus.bgts.mapper.AfCollectTaskMapper; -import com.docus.bgts.mapper.AfInterfaceCollectMapper; -import com.docus.bgts.mapper.AfInterfaceCollectSubMapper; +import com.docus.bgts.mapper.dbmysql.AfCollectTaskMapper; +import com.docus.bgts.mapper.dbmysql.AfInterfaceCollectMapper; +import com.docus.bgts.mapper.dbmysql.AfInterfaceCollectSubMapper; +import com.docus.bgts.mapper.dboracle.TestMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -27,6 +29,9 @@ import java.util.List; @Service public class AfCollectTaskServiceImpl extends ServiceImpl implements IAfCollectTaskService { + @Autowired + TestMapper testMapper; + @Autowired AfCollectTaskMapper afCollectTaskMapper; @@ -108,4 +113,12 @@ public class AfCollectTaskServiceImpl extends ServiceImpl())); + List a = testMapper.getA(); + return Arrays.asList(a).toString(); + } + } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d07cb7b..1c3bbc5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -20,7 +20,13 @@ ws: spring: datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - username: docus - password: docus702 - url: jdbc:mysql://db.docus.cn:3306/docus_archivefile?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true \ No newline at end of file + mysql-docus: + driver-class-name: com.mysql.cj.jdbc.Driver + username: docus + password: docus702 + url: jdbc:mysql://db.docus.cn:3306/docus_archivefile?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true + oracle-docus: + driver-class-name: oracle.jdbc.driver.OracleDriver + url: jdbc:oracle:thin:@192.168.117.100:1521:helowin + username: docus + password: docus702 diff --git a/src/main/resources/mapper/AfCollectTaskMapper.xml b/src/main/resources/mapper/dbmysql/AfCollectTaskMapper.xml similarity index 80% rename from src/main/resources/mapper/AfCollectTaskMapper.xml rename to src/main/resources/mapper/dbmysql/AfCollectTaskMapper.xml index 3242789..f13964e 100644 --- a/src/main/resources/mapper/AfCollectTaskMapper.xml +++ b/src/main/resources/mapper/dbmysql/AfCollectTaskMapper.xml @@ -2,7 +2,7 @@ - + + SELECT "DOCUS"."student"."id" FROM "DOCUS"."student" + + + \ No newline at end of file