diff --git a/pom.xml b/pom.xml index 04b0ad3..dba53d8 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ org.springframework.boot spring-boot-starter-data-mongodb + + org.springframework.boot + spring-boot-configuration-processor + true + com.baomidou dynamic-datasource-spring-boot-starter diff --git a/pom.xml b/pom.xml index 04b0ad3..dba53d8 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ org.springframework.boot spring-boot-starter-data-mongodb + + org.springframework.boot + spring-boot-configuration-processor + true + com.baomidou dynamic-datasource-spring-boot-starter diff --git a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java index fe1ee23..e94420b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java +++ b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java @@ -2,6 +2,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -13,7 +15,8 @@ **/ @EnableAsync @EnableScheduling -@SpringBootApplication +@SpringBootApplication(exclude = {MongoAutoConfiguration.class, + MongoDataAutoConfiguration.class}) public class DataAdapterApplication { public static void main(String[] args) { SpringApplication.run(DataAdapterApplication.class, args); diff --git a/pom.xml b/pom.xml index 04b0ad3..dba53d8 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ org.springframework.boot spring-boot-starter-data-mongodb + + org.springframework.boot + spring-boot-configuration-processor + true + com.baomidou dynamic-datasource-spring-boot-starter diff --git a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java index fe1ee23..e94420b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java +++ b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java @@ -2,6 +2,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -13,7 +15,8 @@ **/ @EnableAsync @EnableScheduling -@SpringBootApplication +@SpringBootApplication(exclude = {MongoAutoConfiguration.class, + MongoDataAutoConfiguration.class}) public class DataAdapterApplication { public static void main(String[] args) { SpringApplication.run(DataAdapterApplication.class, args); diff --git a/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java new file mode 100644 index 0000000..b6c4c4a --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java @@ -0,0 +1,34 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; + +/** + * mongo配置类 + * @author xiebinbin + * @since 2023/5/6 14:59 + */ +public abstract class AbstractMongoConfig { + + private String uri; + + /** + * 获取mongoDBTtemplate对象 + */ + public abstract MongoTemplate getMongoTemplate() throws Exception; + + /** + * 创建mongoDb工厂 + */ + public SimpleMongoClientDatabaseFactory mongoDbFactory() throws Exception { + return new SimpleMongoClientDatabaseFactory(uri); + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } +} diff --git a/pom.xml b/pom.xml index 04b0ad3..dba53d8 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ org.springframework.boot spring-boot-starter-data-mongodb + + org.springframework.boot + spring-boot-configuration-processor + true + com.baomidou dynamic-datasource-spring-boot-starter diff --git a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java index fe1ee23..e94420b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java +++ b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java @@ -2,6 +2,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -13,7 +15,8 @@ **/ @EnableAsync @EnableScheduling -@SpringBootApplication +@SpringBootApplication(exclude = {MongoAutoConfiguration.class, + MongoDataAutoConfiguration.class}) public class DataAdapterApplication { public static void main(String[] args) { SpringApplication.run(DataAdapterApplication.class, args); diff --git a/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java new file mode 100644 index 0000000..b6c4c4a --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java @@ -0,0 +1,34 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; + +/** + * mongo配置类 + * @author xiebinbin + * @since 2023/5/6 14:59 + */ +public abstract class AbstractMongoConfig { + + private String uri; + + /** + * 获取mongoDBTtemplate对象 + */ + public abstract MongoTemplate getMongoTemplate() throws Exception; + + /** + * 创建mongoDb工厂 + */ + public SimpleMongoClientDatabaseFactory mongoDbFactory() throws Exception { + return new SimpleMongoClientDatabaseFactory(uri); + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java new file mode 100644 index 0000000..1d84975 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java @@ -0,0 +1,24 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 前置mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.prefix") +public class PrefixMongoConfig extends AbstractMongoConfig{ + + @Override + @Bean(name = "prefixMongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/pom.xml b/pom.xml index 04b0ad3..dba53d8 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ org.springframework.boot spring-boot-starter-data-mongodb + + org.springframework.boot + spring-boot-configuration-processor + true + com.baomidou dynamic-datasource-spring-boot-starter diff --git a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java index fe1ee23..e94420b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java +++ b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java @@ -2,6 +2,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -13,7 +15,8 @@ **/ @EnableAsync @EnableScheduling -@SpringBootApplication +@SpringBootApplication(exclude = {MongoAutoConfiguration.class, + MongoDataAutoConfiguration.class}) public class DataAdapterApplication { public static void main(String[] args) { SpringApplication.run(DataAdapterApplication.class, args); diff --git a/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java new file mode 100644 index 0000000..b6c4c4a --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java @@ -0,0 +1,34 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; + +/** + * mongo配置类 + * @author xiebinbin + * @since 2023/5/6 14:59 + */ +public abstract class AbstractMongoConfig { + + private String uri; + + /** + * 获取mongoDBTtemplate对象 + */ + public abstract MongoTemplate getMongoTemplate() throws Exception; + + /** + * 创建mongoDb工厂 + */ + public SimpleMongoClientDatabaseFactory mongoDbFactory() throws Exception { + return new SimpleMongoClientDatabaseFactory(uri); + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java new file mode 100644 index 0000000..1d84975 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java @@ -0,0 +1,24 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 前置mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.prefix") +public class PrefixMongoConfig extends AbstractMongoConfig{ + + @Override + @Bean(name = "prefixMongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java new file mode 100644 index 0000000..3aea851 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java @@ -0,0 +1,25 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 监测数据mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.primary") +public class PrimaryMongoConfig extends AbstractMongoConfig{ + + @Primary + @Override + @Bean(name = "mongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/pom.xml b/pom.xml index 04b0ad3..dba53d8 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ org.springframework.boot spring-boot-starter-data-mongodb + + org.springframework.boot + spring-boot-configuration-processor + true + com.baomidou dynamic-datasource-spring-boot-starter diff --git a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java index fe1ee23..e94420b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java +++ b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java @@ -2,6 +2,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -13,7 +15,8 @@ **/ @EnableAsync @EnableScheduling -@SpringBootApplication +@SpringBootApplication(exclude = {MongoAutoConfiguration.class, + MongoDataAutoConfiguration.class}) public class DataAdapterApplication { public static void main(String[] args) { SpringApplication.run(DataAdapterApplication.class, args); diff --git a/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java new file mode 100644 index 0000000..b6c4c4a --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java @@ -0,0 +1,34 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; + +/** + * mongo配置类 + * @author xiebinbin + * @since 2023/5/6 14:59 + */ +public abstract class AbstractMongoConfig { + + private String uri; + + /** + * 获取mongoDBTtemplate对象 + */ + public abstract MongoTemplate getMongoTemplate() throws Exception; + + /** + * 创建mongoDb工厂 + */ + public SimpleMongoClientDatabaseFactory mongoDbFactory() throws Exception { + return new SimpleMongoClientDatabaseFactory(uri); + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java new file mode 100644 index 0000000..1d84975 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java @@ -0,0 +1,24 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 前置mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.prefix") +public class PrefixMongoConfig extends AbstractMongoConfig{ + + @Override + @Bean(name = "prefixMongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java new file mode 100644 index 0000000..3aea851 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java @@ -0,0 +1,25 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 监测数据mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.primary") +public class PrimaryMongoConfig extends AbstractMongoConfig{ + + @Primary + @Override + @Bean(name = "mongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java index 7d90aca..70e860d 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java @@ -22,7 +22,7 @@ * */ @TableId(type = IdType.AUTO) - private Integer id; + private int id; /** * 接入方式（讯飞实时数据 iflytek_realtime | 讯飞历史数据 iflytek_history） diff --git a/pom.xml b/pom.xml index 04b0ad3..dba53d8 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ org.springframework.boot spring-boot-starter-data-mongodb + + org.springframework.boot + spring-boot-configuration-processor + true + com.baomidou dynamic-datasource-spring-boot-starter diff --git a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java index fe1ee23..e94420b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java +++ b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java @@ -2,6 +2,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -13,7 +15,8 @@ **/ @EnableAsync @EnableScheduling -@SpringBootApplication +@SpringBootApplication(exclude = {MongoAutoConfiguration.class, + MongoDataAutoConfiguration.class}) public class DataAdapterApplication { public static void main(String[] args) { SpringApplication.run(DataAdapterApplication.class, args); diff --git a/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java new file mode 100644 index 0000000..b6c4c4a --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java @@ -0,0 +1,34 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; + +/** + * mongo配置类 + * @author xiebinbin + * @since 2023/5/6 14:59 + */ +public abstract class AbstractMongoConfig { + + private String uri; + + /** + * 获取mongoDBTtemplate对象 + */ + public abstract MongoTemplate getMongoTemplate() throws Exception; + + /** + * 创建mongoDb工厂 + */ + public SimpleMongoClientDatabaseFactory mongoDbFactory() throws Exception { + return new SimpleMongoClientDatabaseFactory(uri); + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java new file mode 100644 index 0000000..1d84975 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java @@ -0,0 +1,24 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 前置mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.prefix") +public class PrefixMongoConfig extends AbstractMongoConfig{ + + @Override + @Bean(name = "prefixMongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java new file mode 100644 index 0000000..3aea851 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java @@ -0,0 +1,25 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 监测数据mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.primary") +public class PrimaryMongoConfig extends AbstractMongoConfig{ + + @Primary + @Override + @Bean(name = "mongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java index 7d90aca..70e860d 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java @@ -22,7 +22,7 @@ * */ @TableId(type = IdType.AUTO) - private Integer id; + private int id; /** * 接入方式（讯飞实时数据 iflytek_realtime | 讯飞历史数据 iflytek_history） diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java b/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java index 073c1eb..81ec1fb 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java @@ -10,6 +10,8 @@ import java.util.HashMap; import java.util.Map; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springnewfiber.dataadapter.config.RequestDataHelper; @@ -17,6 +19,8 @@ import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; import org.springnewfiber.dataadapter.xf.mapper.DataAccessRecordMapper; +import javax.annotation.Resource; + /** * 数据接入记录 服务实现类 * @since 2022-06-28 15:06:03 @@ -25,21 +29,27 @@ @Service @DS("access") public class DataAccessRecordService extends ServiceImpl { + + @Resource + @Qualifier("prefixMongoTemplate") + private MongoTemplate prefixMongoTemplate; + @Async public Integer save(EDataAccessType accessType, String dataType, String content){ - RequestDataHelper.setRequestData(new HashMap() {{ - int year=DateUtil.thisYear(); - int month=DateUtil.thisMonth(); - put("t_data_access_record", "t_data_access_record".concat("_").concat(String.valueOf(year)).concat(String.valueOf(month+1))); - }}); +// RequestDataHelper.setRequestData(new HashMap() {{ +// int year=DateUtil.thisYear(); +// int month=DateUtil.thisMonth(); +// put("t_data_access_record", "t_data_access_record".concat("_").concat(String.valueOf(year)).concat(String.valueOf(month+1))); +// }}); DataAccessRecord dataAccessRecord = new DataAccessRecord(); dataAccessRecord.setAccessType(accessType.getCode()); dataAccessRecord.setDataType(dataType); dataAccessRecord.setContent(content); dataAccessRecord.setContentHash(DigestUtil.md5Hex(content)); dataAccessRecord.setCreateDatetime(new Date()); - save(dataAccessRecord); - + System.out.println(Thread.currentThread().getId()); +// save(dataAccessRecord); + prefixMongoTemplate.insert(dataAccessRecord, dataType); return dataAccessRecord.getId(); } diff --git a/pom.xml b/pom.xml index 04b0ad3..dba53d8 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ org.springframework.boot spring-boot-starter-data-mongodb + + org.springframework.boot + spring-boot-configuration-processor + true + com.baomidou dynamic-datasource-spring-boot-starter diff --git a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java index fe1ee23..e94420b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java +++ b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java @@ -2,6 +2,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -13,7 +15,8 @@ **/ @EnableAsync @EnableScheduling -@SpringBootApplication +@SpringBootApplication(exclude = {MongoAutoConfiguration.class, + MongoDataAutoConfiguration.class}) public class DataAdapterApplication { public static void main(String[] args) { SpringApplication.run(DataAdapterApplication.class, args); diff --git a/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java new file mode 100644 index 0000000..b6c4c4a --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java @@ -0,0 +1,34 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; + +/** + * mongo配置类 + * @author xiebinbin + * @since 2023/5/6 14:59 + */ +public abstract class AbstractMongoConfig { + + private String uri; + + /** + * 获取mongoDBTtemplate对象 + */ + public abstract MongoTemplate getMongoTemplate() throws Exception; + + /** + * 创建mongoDb工厂 + */ + public SimpleMongoClientDatabaseFactory mongoDbFactory() throws Exception { + return new SimpleMongoClientDatabaseFactory(uri); + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java new file mode 100644 index 0000000..1d84975 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java @@ -0,0 +1,24 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 前置mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.prefix") +public class PrefixMongoConfig extends AbstractMongoConfig{ + + @Override + @Bean(name = "prefixMongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java new file mode 100644 index 0000000..3aea851 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java @@ -0,0 +1,25 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 监测数据mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.primary") +public class PrimaryMongoConfig extends AbstractMongoConfig{ + + @Primary + @Override + @Bean(name = "mongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java index 7d90aca..70e860d 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java @@ -22,7 +22,7 @@ * */ @TableId(type = IdType.AUTO) - private Integer id; + private int id; /** * 接入方式（讯飞实时数据 iflytek_realtime | 讯飞历史数据 iflytek_history） diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java b/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java index 073c1eb..81ec1fb 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java @@ -10,6 +10,8 @@ import java.util.HashMap; import java.util.Map; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springnewfiber.dataadapter.config.RequestDataHelper; @@ -17,6 +19,8 @@ import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; import org.springnewfiber.dataadapter.xf.mapper.DataAccessRecordMapper; +import javax.annotation.Resource; + /** * 数据接入记录 服务实现类 * @since 2022-06-28 15:06:03 @@ -25,21 +29,27 @@ @Service @DS("access") public class DataAccessRecordService extends ServiceImpl { + + @Resource + @Qualifier("prefixMongoTemplate") + private MongoTemplate prefixMongoTemplate; + @Async public Integer save(EDataAccessType accessType, String dataType, String content){ - RequestDataHelper.setRequestData(new HashMap() {{ - int year=DateUtil.thisYear(); - int month=DateUtil.thisMonth(); - put("t_data_access_record", "t_data_access_record".concat("_").concat(String.valueOf(year)).concat(String.valueOf(month+1))); - }}); +// RequestDataHelper.setRequestData(new HashMap() {{ +// int year=DateUtil.thisYear(); +// int month=DateUtil.thisMonth(); +// put("t_data_access_record", "t_data_access_record".concat("_").concat(String.valueOf(year)).concat(String.valueOf(month+1))); +// }}); DataAccessRecord dataAccessRecord = new DataAccessRecord(); dataAccessRecord.setAccessType(accessType.getCode()); dataAccessRecord.setDataType(dataType); dataAccessRecord.setContent(content); dataAccessRecord.setContentHash(DigestUtil.md5Hex(content)); dataAccessRecord.setCreateDatetime(new Date()); - save(dataAccessRecord); - + System.out.println(Thread.currentThread().getId()); +// save(dataAccessRecord); + prefixMongoTemplate.insert(dataAccessRecord, dataType); return dataAccessRecord.getId(); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e85e87c..6b3b9c6 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -53,7 +53,10 @@ data: mongodb: - uri: mongodb://pt_mongo:pt_mongo@192.168.30.178:27017/pt_mongo + primary: + uri: mongodb://nf-water:xfgdgfA2019@dev-mongodb.wh-nf.cn:8634/pt_mongo?connectTimeoutMS=30000&maxPoolSize=50 + prefix: + uri: mongodb://monitor_data:monitor_data@172.16.3.107:27017/monitor_data?connectTimeoutMS=30000&maxPoolSize=50 logging: level: diff --git a/pom.xml b/pom.xml index 04b0ad3..dba53d8 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ org.springframework.boot spring-boot-starter-data-mongodb + + org.springframework.boot + spring-boot-configuration-processor + true + com.baomidou dynamic-datasource-spring-boot-starter diff --git a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java index fe1ee23..e94420b 100644 --- a/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java +++ b/src/main/java/org/springnewfiber/dataadapter/DataAdapterApplication.java @@ -2,6 +2,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -13,7 +15,8 @@ **/ @EnableAsync @EnableScheduling -@SpringBootApplication +@SpringBootApplication(exclude = {MongoAutoConfiguration.class, + MongoDataAutoConfiguration.class}) public class DataAdapterApplication { public static void main(String[] args) { SpringApplication.run(DataAdapterApplication.class, args); diff --git a/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java new file mode 100644 index 0000000..b6c4c4a --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/AbstractMongoConfig.java @@ -0,0 +1,34 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; + +/** + * mongo配置类 + * @author xiebinbin + * @since 2023/5/6 14:59 + */ +public abstract class AbstractMongoConfig { + + private String uri; + + /** + * 获取mongoDBTtemplate对象 + */ + public abstract MongoTemplate getMongoTemplate() throws Exception; + + /** + * 创建mongoDb工厂 + */ + public SimpleMongoClientDatabaseFactory mongoDbFactory() throws Exception { + return new SimpleMongoClientDatabaseFactory(uri); + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java new file mode 100644 index 0000000..1d84975 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrefixMongoConfig.java @@ -0,0 +1,24 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 前置mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.prefix") +public class PrefixMongoConfig extends AbstractMongoConfig{ + + @Override + @Bean(name = "prefixMongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java b/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java new file mode 100644 index 0000000..3aea851 --- /dev/null +++ b/src/main/java/org/springnewfiber/dataadapter/config/PrimaryMongoConfig.java @@ -0,0 +1,25 @@ +package org.springnewfiber.dataadapter.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.data.mongodb.core.MongoTemplate; + +/** + * 监测数据mongo库 + * @author xiebinbin + * @since 2023/5/6 15:10 + */ +@Configuration +@ConfigurationProperties(prefix = "spring.data.mongodb.primary") +public class PrimaryMongoConfig extends AbstractMongoConfig{ + + @Primary + @Override + @Bean(name = "mongoTemplate") + public MongoTemplate getMongoTemplate() throws Exception { + return new MongoTemplate(mongoDbFactory()); + } + +} diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java index 7d90aca..70e860d 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DataAccessRecord.java @@ -22,7 +22,7 @@ * */ @TableId(type = IdType.AUTO) - private Integer id; + private int id; /** * 接入方式（讯飞实时数据 iflytek_realtime | 讯飞历史数据 iflytek_history） diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java b/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java index 073c1eb..81ec1fb 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/service/DataAccessRecordService.java @@ -10,6 +10,8 @@ import java.util.HashMap; import java.util.Map; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springnewfiber.dataadapter.config.RequestDataHelper; @@ -17,6 +19,8 @@ import org.springnewfiber.dataadapter.xf.enums.EDataAccessType; import org.springnewfiber.dataadapter.xf.mapper.DataAccessRecordMapper; +import javax.annotation.Resource; + /** * 数据接入记录 服务实现类 * @since 2022-06-28 15:06:03 @@ -25,21 +29,27 @@ @Service @DS("access") public class DataAccessRecordService extends ServiceImpl { + + @Resource + @Qualifier("prefixMongoTemplate") + private MongoTemplate prefixMongoTemplate; + @Async public Integer save(EDataAccessType accessType, String dataType, String content){ - RequestDataHelper.setRequestData(new HashMap() {{ - int year=DateUtil.thisYear(); - int month=DateUtil.thisMonth(); - put("t_data_access_record", "t_data_access_record".concat("_").concat(String.valueOf(year)).concat(String.valueOf(month+1))); - }}); +// RequestDataHelper.setRequestData(new HashMap() {{ +// int year=DateUtil.thisYear(); +// int month=DateUtil.thisMonth(); +// put("t_data_access_record", "t_data_access_record".concat("_").concat(String.valueOf(year)).concat(String.valueOf(month+1))); +// }}); DataAccessRecord dataAccessRecord = new DataAccessRecord(); dataAccessRecord.setAccessType(accessType.getCode()); dataAccessRecord.setDataType(dataType); dataAccessRecord.setContent(content); dataAccessRecord.setContentHash(DigestUtil.md5Hex(content)); dataAccessRecord.setCreateDatetime(new Date()); - save(dataAccessRecord); - + System.out.println(Thread.currentThread().getId()); +// save(dataAccessRecord); + prefixMongoTemplate.insert(dataAccessRecord, dataType); return dataAccessRecord.getId(); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e85e87c..6b3b9c6 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -53,7 +53,10 @@ data: mongodb: - uri: mongodb://pt_mongo:pt_mongo@192.168.30.178:27017/pt_mongo + primary: + uri: mongodb://nf-water:xfgdgfA2019@dev-mongodb.wh-nf.cn:8634/pt_mongo?connectTimeoutMS=30000&maxPoolSize=50 + prefix: + uri: mongodb://monitor_data:monitor_data@172.16.3.107:27017/monitor_data?connectTimeoutMS=30000&maxPoolSize=50 logging: level: diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 1d07e26..fb4be7c 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -49,7 +49,10 @@ data: mongodb: - uri: mongodb://pt_mongo:pt_mongo@172.16.3.109:27017/pt_mongo + primary: + uri: mongodb://pt_mongo:pt_mongo@172.16.3.107:27017/pt_mongo?connectTimeoutMS=30000&maxPoolSize=50 + prefix: + uri: mongodb://monitor_data:monitor_data@172.16.3.107:27017/monitor_data?connectTimeoutMS=30000&maxPoolSize=50 cloud: nacos: