diff --git a/outbridge/src/main/java/com/sdm/outbridge/config/SecondMybatisPlusConfig.java b/outbridge/src/main/java/com/sdm/outbridge/config/SecondMybatisPlusConfig.java index 302d782a..88043fd6 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/config/SecondMybatisPlusConfig.java +++ b/outbridge/src/main/java/com/sdm/outbridge/config/SecondMybatisPlusConfig.java @@ -22,7 +22,7 @@ import java.io.IOException; @Configuration // 扫描第二个数据源的Mapper包，指定专属的sqlSessionFactory @MapperScan( - basePackages = "com.sdm.outbridge.dao", + basePackages = "com.sdm.outbridge.secondDao", sqlSessionFactoryRef = "secondSqlSessionFactory" ) public class SecondMybatisPlusConfig { @@ -45,7 +45,7 @@ public class SecondMybatisPlusConfig { MybatisSqlSessionFactoryBean fb = new MybatisSqlSessionFactoryBean(); // 设置第二个数据源的Mapper.xml路径（建议独立存放，避免冲突） fb.setMapperLocations(new PathMatchingResourcePatternResolver() - .getResources("classpath*:outbridgemapper/*.xml")); + .getResources("classpath*:secondDaoMapper/*.xml")); // 绑定第二个数据源 fb.setDataSource(dataSource); diff --git a/outbridge/src/main/java/com/sdm/outbridge/config/ThirdMybatisPlusConfig.java b/outbridge/src/main/java/com/sdm/outbridge/config/ThirdMybatisPlusConfig.java new file mode 100644 index 00000000..87b21fb2 --- /dev/null +++ b/outbridge/src/main/java/com/sdm/outbridge/config/ThirdMybatisPlusConfig.java @@ -0,0 +1,70 @@ +package com.sdm.outbridge.config; + +import com.baomidou.mybatisplus.core.MybatisConfiguration; +import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; +import org.apache.ibatis.session.SqlSessionFactory; +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.core.io.support.PathMatchingResourcePatternResolver; + +import javax.sql.DataSource; +import java.io.IOException; + +/** + * 第二个数据源的MyBatis-Plus配置 + * 扫描专属的Mapper包，使用独立的数据源 + */ +@Configuration +// 扫描第二个数据源的Mapper包，指定专属的sqlSessionFactory +@MapperScan( + basePackages = "com.sdm.outbridge.thirdDao", + sqlSessionFactoryRef = "thirdSqlSessionFactory" +) +public class ThirdMybatisPlusConfig { + + /** + * 初始化第二个数据源 + */ + @Bean(name = "thirdDataSource") + @ConfigurationProperties(prefix = "spring.datasource.third") // 对应yml中的third数据源配置 + public DataSource thirdDataSource() { + return DataSourceBuilder.create().build(); + } + + /** + * 第二个数据源的SqlSessionFactory + */ + @Bean(name = "thirdSqlSessionFactory") + public MybatisSqlSessionFactoryBean thirdSqlSessionFactory( + @Qualifier("thirdDataSource") DataSource dataSource) throws IOException { + MybatisSqlSessionFactoryBean fb = new MybatisSqlSessionFactoryBean(); + // 设置第二个数据源的Mapper.xml路径（建议独立存放，避免冲突） + fb.setMapperLocations(new PathMatchingResourcePatternResolver() + .getResources("classpath*:thirdDaoMapper/*.xml")); + + // 绑定第二个数据源 + fb.setDataSource(dataSource); + // 开启下划线转驼峰（和原有配置保持一致） + MybatisConfiguration configuration = new MybatisConfiguration(); + configuration.setMapUnderscoreToCamelCase(true); + fb.setConfiguration(configuration); + // 如需分页插件，可在此添加（和原有配置一致） + // fb.setPlugins(new MybatisPlusInterceptor(new PaginationInnerInterceptor(DbType.MYSQL))); + return fb; + } + + /** + * 第二个数据源的SqlSessionTemplate（可选，MyBatis-Plus可自动适配，建议添加） + */ + @Bean(name = "thirdSqlSessionTemplate") + public SqlSessionTemplate thirdSqlSessionTemplate( + @Qualifier("thirdSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception { + return new SqlSessionTemplate(sqlSessionFactory); + } + +} \ No newline at end of file diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/DynamicSqlExecutorMapper.java b/outbridge/src/main/java/com/sdm/outbridge/secondDao/DynamicSqlExecutorMapper.java similarity index 90% rename from outbridge/src/main/java/com/sdm/outbridge/dao/DynamicSqlExecutorMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/secondDao/DynamicSqlExecutorMapper.java index 17f1cd45..b127697a 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/DynamicSqlExecutorMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/secondDao/DynamicSqlExecutorMapper.java @@ -1,4 +1,4 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.secondDao; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVMainPlanDMMapper.java b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVMainPlanDMMapper.java similarity index 83% rename from outbridge/src/main/java/com/sdm/outbridge/dao/LyricVMainPlanDMMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVMainPlanDMMapper.java index 234d7bba..948a434f 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVMainPlanDMMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVMainPlanDMMapper.java @@ -1,4 +1,4 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.secondDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.outbridge.entity.LyricVMainPlanDM; diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVPdtDmMapper.java b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVPdtDmMapper.java similarity index 82% rename from outbridge/src/main/java/com/sdm/outbridge/dao/LyricVPdtDmMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVPdtDmMapper.java index d378d1ce..df7ac2e0 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVPdtDmMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVPdtDmMapper.java @@ -1,4 +1,4 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.secondDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.outbridge.entity.LyricVPdtToDM; diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProductionLineToDmMapper.java b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProductionLineToDmMapper.java similarity index 85% rename from outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProductionLineToDmMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProductionLineToDmMapper.java index 57ace491..2b49ce6e 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProductionLineToDmMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProductionLineToDmMapper.java @@ -1,4 +1,4 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.secondDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.outbridge.entity.LyricVProductionLineToDM; diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectBatchToDMMapper.java b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectBatchToDMMapper.java similarity index 84% rename from outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectBatchToDMMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectBatchToDMMapper.java index fd265af0..443dc9fe 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectBatchToDMMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectBatchToDMMapper.java @@ -1,4 +1,4 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.secondDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.outbridge.entity.LyricVProjectBatchToDM; diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectResourcePlanDMMapper.java b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectResourcePlanDMMapper.java similarity index 85% rename from outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectResourcePlanDMMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectResourcePlanDMMapper.java index e53b23e4..4bc7bcfb 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectResourcePlanDMMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectResourcePlanDMMapper.java @@ -1,4 +1,4 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.secondDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.outbridge.entity.LyricVProjectResourcePlanDM; diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectStationPlanToDmMapper.java b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectStationPlanToDmMapper.java similarity index 71% rename from outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectStationPlanToDmMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectStationPlanToDmMapper.java index ae71459f..a1d58cb4 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectStationPlanToDmMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectStationPlanToDmMapper.java @@ -1,8 +1,7 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.secondDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.outbridge.entity.LyricVProjectStationPlanToDM; -import com.sdm.outbridge.entity.LyricVProjectStationToDM; public interface LyricVProjectStationPlanToDmMapper extends BaseMapper { diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectStationToDmMapper.java b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectStationToDmMapper.java similarity index 85% rename from outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectStationToDmMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectStationToDmMapper.java index 6fffc857..90319fa0 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectStationToDmMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectStationToDmMapper.java @@ -1,4 +1,4 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.secondDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.outbridge.entity.LyricVProjectStationToDM; diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectToDmMapper.java b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectToDmMapper.java similarity index 83% rename from outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectToDmMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectToDmMapper.java index a353e1b3..0c6d8ad2 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectToDmMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVProjectToDmMapper.java @@ -1,4 +1,4 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.secondDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.outbridge.entity.LyricVProjectToDM; diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVTodoInfoMapper.java b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVTodoInfoMapper.java similarity index 84% rename from outbridge/src/main/java/com/sdm/outbridge/dao/LyricVTodoInfoMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVTodoInfoMapper.java index a017ded5..9f6f98e2 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVTodoInfoMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/secondDao/LyricVTodoInfoMapper.java @@ -1,4 +1,4 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.secondDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.outbridge.entity.LyricVTodoEmulationInfoDM; diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVMainPlanDMServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVMainPlanDMServiceImpl.java index 0c1169b8..ee85e0b9 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVMainPlanDMServiceImpl.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVMainPlanDMServiceImpl.java @@ -1,7 +1,7 @@ package com.sdm.outbridge.service.impl.lyric; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.outbridge.dao.LyricVMainPlanDMMapper; +import com.sdm.outbridge.secondDao.LyricVMainPlanDMMapper; import com.sdm.outbridge.entity.LyricVMainPlanDM; import com.sdm.outbridge.service.lyric.LyricVMainPlanDMService; import org.springframework.stereotype.Service; diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVPdtDmServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVPdtDmServiceImpl.java index 74ee71f8..e388d58c 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVPdtDmServiceImpl.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVPdtDmServiceImpl.java @@ -1,7 +1,7 @@ package com.sdm.outbridge.service.impl.lyric; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.outbridge.dao.LyricVPdtDmMapper; +import com.sdm.outbridge.secondDao.LyricVPdtDmMapper; import com.sdm.outbridge.entity.LyricVPdtToDM; import com.sdm.outbridge.service.lyric.LyricVPdtDmService; import org.springframework.stereotype.Service; diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProductionLineToDmServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProductionLineToDmServiceImpl.java index 2a4ae3d7..93b86c28 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProductionLineToDmServiceImpl.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProductionLineToDmServiceImpl.java @@ -1,6 +1,6 @@ package com.sdm.outbridge.service.impl.lyric; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.outbridge.dao.LyricVProductionLineToDmMapper; +import com.sdm.outbridge.secondDao.LyricVProductionLineToDmMapper; import com.sdm.outbridge.entity.LyricVProductionLineToDM; import com.sdm.outbridge.service.lyric.LyricVProductionLineToDmService; import org.springframework.stereotype.Service; diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectBatchToDMServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectBatchToDMServiceImpl.java index a61dd63e..39547a31 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectBatchToDMServiceImpl.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectBatchToDMServiceImpl.java @@ -1,6 +1,6 @@ package com.sdm.outbridge.service.impl.lyric; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.outbridge.dao.LyricVProjectBatchToDMMapper; +import com.sdm.outbridge.secondDao.LyricVProjectBatchToDMMapper; import com.sdm.outbridge.entity.LyricVProjectBatchToDM; import com.sdm.outbridge.service.lyric.LyricVProjectBatchToDmService; import org.springframework.stereotype.Service; diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectResourcePlanDMServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectResourcePlanDMServiceImpl.java index c4356abe..916f4348 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectResourcePlanDMServiceImpl.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectResourcePlanDMServiceImpl.java @@ -1,7 +1,7 @@ package com.sdm.outbridge.service.impl.lyric; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.outbridge.dao.LyricVProjectResourcePlanDMMapper; +import com.sdm.outbridge.secondDao.LyricVProjectResourcePlanDMMapper; import com.sdm.outbridge.entity.LyricVProjectResourcePlanDM; import com.sdm.outbridge.service.lyric.LyricVProjectResourcePlanDMService; import org.springframework.stereotype.Service; diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationExcepTionToDMServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationExcepTionToDMServiceImpl.java index 4a5b7d3a..2b101aac 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationExcepTionToDMServiceImpl.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationExcepTionToDMServiceImpl.java @@ -1,10 +1,10 @@ package com.sdm.outbridge.service.impl.lyric; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.outbridge.dao.LyricVProjectStationExcepTionToDMMapper; import com.sdm.outbridge.entity.LyricVProjectStationExcepTionToDM; import com.sdm.outbridge.mode.SimulationTaskSyncExBo; import com.sdm.outbridge.service.lyric.LyricVProjectStationExcepTionToDMService; +import com.sdm.outbridge.thirdDao.LyricVProjectStationExcepTionToDMMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationPlanToDmServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationPlanToDmServiceImpl.java index ec896ae1..acf01dee 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationPlanToDmServiceImpl.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationPlanToDmServiceImpl.java @@ -1,7 +1,7 @@ package com.sdm.outbridge.service.impl.lyric; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.outbridge.dao.LyricVProjectStationPlanToDmMapper; +import com.sdm.outbridge.secondDao.LyricVProjectStationPlanToDmMapper; import com.sdm.outbridge.entity.LyricVProjectStationPlanToDM; import com.sdm.outbridge.service.lyric.LyricVProjectStationPlanToDmService; import org.springframework.stereotype.Service; diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationToDmServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationToDmServiceImpl.java index a918341d..0943fe0b 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationToDmServiceImpl.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectStationToDmServiceImpl.java @@ -1,7 +1,7 @@ package com.sdm.outbridge.service.impl.lyric; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.outbridge.dao.LyricVProjectStationToDmMapper; +import com.sdm.outbridge.secondDao.LyricVProjectStationToDmMapper; import com.sdm.outbridge.entity.LyricVProjectStationToDM; import com.sdm.outbridge.service.lyric.LyricVProjectStationToDmService; import org.springframework.stereotype.Service; diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectToDmServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectToDmServiceImpl.java index 4c7acaf5..f2e08781 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectToDmServiceImpl.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVProjectToDmServiceImpl.java @@ -1,6 +1,6 @@ package com.sdm.outbridge.service.impl.lyric; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.outbridge.dao.LyricVProjectToDmMapper; +import com.sdm.outbridge.secondDao.LyricVProjectToDmMapper; import com.sdm.outbridge.entity.LyricVProjectToDM; import com.sdm.outbridge.service.lyric.LyricVProjectToDmService; import org.springframework.stereotype.Service; diff --git a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVTodoInfoServiceImpl.java b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVTodoInfoServiceImpl.java index 73d887a5..7eae52ca 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVTodoInfoServiceImpl.java +++ b/outbridge/src/main/java/com/sdm/outbridge/service/impl/lyric/LyricVTodoInfoServiceImpl.java @@ -1,7 +1,7 @@ package com.sdm.outbridge.service.impl.lyric; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.sdm.outbridge.dao.LyricVTodoInfoMapper; +import com.sdm.outbridge.secondDao.LyricVTodoInfoMapper; import com.sdm.outbridge.entity.LyricVTodoEmulationInfoDM; import com.sdm.outbridge.service.lyric.LyricVTodoInfoService; import org.springframework.stereotype.Service; diff --git a/outbridge/src/main/java/com/sdm/outbridge/thirdDao/DynamicSqlThirdExecutorMapper.java b/outbridge/src/main/java/com/sdm/outbridge/thirdDao/DynamicSqlThirdExecutorMapper.java new file mode 100644 index 00000000..9a95f283 --- /dev/null +++ b/outbridge/src/main/java/com/sdm/outbridge/thirdDao/DynamicSqlThirdExecutorMapper.java @@ -0,0 +1,12 @@ +package com.sdm.outbridge.thirdDao; + +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; +import java.util.Map; + +public interface DynamicSqlThirdExecutorMapper { + @Select("${sql}") // 核心：用${sql}直接拼接传入的SQL字符串 + List> executeThirdCustomSql(@Param("sql") String sql); +} diff --git a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectStationExcepTionToDMMapper.java b/outbridge/src/main/java/com/sdm/outbridge/thirdDao/LyricVProjectStationExcepTionToDMMapper.java similarity index 92% rename from outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectStationExcepTionToDMMapper.java rename to outbridge/src/main/java/com/sdm/outbridge/thirdDao/LyricVProjectStationExcepTionToDMMapper.java index 39841cfb..a08f8e5c 100644 --- a/outbridge/src/main/java/com/sdm/outbridge/dao/LyricVProjectStationExcepTionToDMMapper.java +++ b/outbridge/src/main/java/com/sdm/outbridge/thirdDao/LyricVProjectStationExcepTionToDMMapper.java @@ -1,4 +1,4 @@ -package com.sdm.outbridge.dao; +package com.sdm.outbridge.thirdDao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sdm.outbridge.entity.LyricVProjectStationExcepTionToDM; @@ -8,7 +8,5 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface LyricVProjectStationExcepTionToDMMapper extends BaseMapper { - List queryExceptionsByProjectAndStation(@Param("list") List list); - -} \ No newline at end of file +} diff --git a/outbridge/src/main/resources/common-dev-190.yml b/outbridge/src/main/resources/common-dev-190.yml index a928859b..95e0d507 100644 --- a/outbridge/src/main/resources/common-dev-190.yml +++ b/outbridge/src/main/resources/common-dev-190.yml @@ -6,6 +6,12 @@ spring: # todo 生产地址 jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver + third: + username: root + password: mysql + # todo 生产地址 + jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver # 测试开发环境 #appKey : 380ad3deb578424c9ca5178383f732c1 diff --git a/outbridge/src/main/resources/common-dev-65.yml b/outbridge/src/main/resources/common-dev-65.yml index 54c76f99..ab5cecdd 100644 --- a/outbridge/src/main/resources/common-dev-65.yml +++ b/outbridge/src/main/resources/common-dev-65.yml @@ -6,7 +6,12 @@ spring: # todo 生产地址 jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver - + third: + username: root + password: mysql + # todo 生产地址 + jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver # 测试开发环境 #appKey : 380ad3deb578424c9ca5178383f732c1 #appSecret : 805c316f35024b8b9566ca67b4991c42 diff --git a/outbridge/src/main/resources/common-local.yml b/outbridge/src/main/resources/common-local.yml index a928859b..95e0d507 100644 --- a/outbridge/src/main/resources/common-local.yml +++ b/outbridge/src/main/resources/common-local.yml @@ -6,6 +6,12 @@ spring: # todo 生产地址 jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver + third: + username: root + password: mysql + # todo 生产地址 + jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver # 测试开发环境 #appKey : 380ad3deb578424c9ca5178383f732c1 diff --git a/outbridge/src/main/resources/common-lyric.yml b/outbridge/src/main/resources/common-lyric.yml index 7dbb2705..c63537b7 100644 --- a/outbridge/src/main/resources/common-lyric.yml +++ b/outbridge/src/main/resources/common-lyric.yml @@ -1,11 +1,17 @@ spring: datasource: +# todo 生产地址 second: username: EP_DM password: ENC(c04rt9Z6Ygz024EU9eWvig==) -# todo 生产地址 jdbc-url: jdbc:mysql://10.122.48.11:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver +# todo 第三个数据源，生产ip不一样 + third: + username: EP_DM + password: ENC(c04rt9Z6Ygz024EU9eWvig==) + jdbc-url: jdbc:mysql://10.122.48.11:13306/ecn?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver # 测试开发环境 #appKey : 380ad3deb578424c9ca5178383f732c1 diff --git a/outbridge/src/main/resources/common-test.yml b/outbridge/src/main/resources/common-test.yml index 64572bf1..41307da4 100644 --- a/outbridge/src/main/resources/common-test.yml +++ b/outbridge/src/main/resources/common-test.yml @@ -6,6 +6,13 @@ spring: # todo 生产地址 jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver + third: + username: root + password: mysql + # todo 生产地址 + jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver + # 测试开发环境 #appKey : 380ad3deb578424c9ca5178383f732c1 diff --git a/outbridge/src/main/resources/common-yian.yml b/outbridge/src/main/resources/common-yian.yml index 4323b945..8f782df7 100644 --- a/outbridge/src/main/resources/common-yian.yml +++ b/outbridge/src/main/resources/common-yian.yml @@ -6,6 +6,12 @@ spring: # todo 生产地址 jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai driver-class-name: com.mysql.cj.jdbc.Driver + third: + username: root + password: mysql + # todo 生产地址 + jdbc-url: jdbc:mysql://127.0.0.1:13306/easy_project?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai + driver-class-name: com.mysql.cj.jdbc.Driver # 测试开发环境 #appKey : 380ad3deb578424c9ca5178383f732c1 diff --git a/outbridge/src/main/resources/outbridgemapper/LyricVProjectStationExcepTionToDMMapper.xml b/outbridge/src/main/resources/thirdDaoMapper/LyricVProjectStationExcepTionToDMMapper.xml similarity index 91% rename from outbridge/src/main/resources/outbridgemapper/LyricVProjectStationExcepTionToDMMapper.xml rename to outbridge/src/main/resources/thirdDaoMapper/LyricVProjectStationExcepTionToDMMapper.xml index db274dc5..c36ee14e 100644 --- a/outbridge/src/main/resources/outbridgemapper/LyricVProjectStationExcepTionToDMMapper.xml +++ b/outbridge/src/main/resources/thirdDaoMapper/LyricVProjectStationExcepTionToDMMapper.xml @@ -1,6 +1,6 @@ - +