From d032413a5644f586d40712301e351d2d676a1edf Mon Sep 17 00:00:00 2001 From: wxy001 Date: Tue, 24 May 2022 01:06:40 +0800 Subject: [PATCH] =?UTF-8?q?2022=E5=B9=B45=E6=9C=8824=E6=97=A501:05:38=20?= =?UTF-8?q?=E8=BF=98=E5=8E=9FApplicationStart,=E8=AE=B2TDengine=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=B1=BB=E5=9E=8B=E5=92=8C=E9=85=8D=E7=BD=AE=E5=BD=92?= =?UTF-8?q?=E4=BA=8E=E5=90=8C=E4=B8=80=E4=B8=AA=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 6 +- .../src/main/resources/application.yml | 17 ++-- .../framework/config/ApplicationConfig.java | 10 +-- .../ruoyi/framework/config/MyBatisConfig.java | 33 +++----- .../ruoyi/iot/init/ApplicationStarted.java | 76 ------------------ .../java/com/ruoyi/iot/mqtt/EmqxService.java | 5 +- .../service/impl/DeviceLogServiceImpl.java | 2 +- .../iot/service/impl/DeviceServiceImpl.java | 4 +- .../iot/tdengine/config/TDengineConfig.java | 14 +--- .../{mapper => dao}/DatabaseMapper.java | 2 +- .../{mapper => dao}/TDDeviceLogMapper.java | 3 +- .../iot/tdengine/init/ApplicationStarted.java | 79 +++++++++++++++++++ .../service/ILogService.java | 2 +- .../service/factory/LogServiceFactory.java | 21 ++--- .../service/impl/MySqlLogServiceImpl.java | 5 +- .../service/impl/TdengineLogServiceImpl.java | 9 +-- .../mapper/tdengine/DatabaseMapper.xml | 2 +- .../mapper/tdengine/TDDeviceLogMapper.xml | 2 +- 18 files changed, 125 insertions(+), 167 deletions(-) delete mode 100644 springboot/wumei-iot/src/main/java/com/ruoyi/iot/init/ApplicationStarted.java rename springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/{mapper => dao}/DatabaseMapper.java (89%) rename springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/{mapper => dao}/TDDeviceLogMapper.java (94%) create mode 100644 springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/init/ApplicationStarted.java rename springboot/wumei-iot/src/main/java/com/ruoyi/iot/{log => tdengine}/service/ILogService.java (92%) rename springboot/wumei-iot/src/main/java/com/ruoyi/iot/{log => tdengine}/service/factory/LogServiceFactory.java (75%) rename springboot/wumei-iot/src/main/java/com/ruoyi/iot/{log => tdengine}/service/impl/MySqlLogServiceImpl.java (87%) rename springboot/wumei-iot/src/main/java/com/ruoyi/iot/{log => tdengine}/service/impl/TdengineLogServiceImpl.java (83%) diff --git a/springboot/wumei-admin/src/main/resources/application-druid.yml b/springboot/wumei-admin/src/main/resources/application-druid.yml index 844bd4b9..ad6dbaf8 100644 --- a/springboot/wumei-admin/src/main/resources/application-druid.yml +++ b/springboot/wumei-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3316/wumei_smart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: wumei - password: 123456 + url: jdbc:mysql://localhost/wumei-smart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: admin # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/springboot/wumei-admin/src/main/resources/application.yml b/springboot/wumei-admin/src/main/resources/application.yml index a99c9bb5..6637f1ac 100644 --- a/springboot/wumei-admin/src/main/resources/application.yml +++ b/springboot/wumei-admin/src/main/resources/application.yml @@ -43,7 +43,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: druid + active: dev # 文件上传 servlet: multipart: @@ -65,7 +65,7 @@ spring: # 数据库索引 database: 0 # 密码 - password: wumei-smart + password: # 连接超时时间 timeout: 10s lettuce: @@ -80,12 +80,13 @@ spring: max-wait: -1ms # mqtt 配置 mqtt: - username: wumei-smart # 账号 - password: wumei-smart # 密码 - host-url: tcp://localhost:1883 # mqtt连接tcp地址 - client-id: ${random.int} # 客户端Id，不能相同，采用随机数 ${random.value} - default-topic: test # 默认主题 - timeout: 30000 # 超时时间 + username: wumei-smart # 账号 + password: wumei-smart # 密码 + host-url: tcp://wumei.live:1883 # mqtt连接tcp地址 + # host-url: tcp://127.0.0.1:1883 + client-id: ${random.value} # 客户端Id，每个启动的id要不同 随机：${random.value} + default-topic: test # 默认主题 + timeout: 100 # 超时时间 keepalive: 30 # 保持连接 clearSession: true # 清除会话(设置为false,断开连接，重连后使用原来的会话 保留订阅的主题，能接收离线期间的消息) task: diff --git a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java index d4e1a102..1d4dc1f7 100644 --- a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java @@ -12,11 +12,11 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; * * @author ruoyi */ -//@Configuration -//// 表示通过aop框架暴露该代理对象,AopContext能够访问 -//@EnableAspectJAutoProxy(exposeProxy = true) -//// 指定要扫描的Mapper类的包的路径 -//@MapperScan("com.ruoyi.**.mapper") +@Configuration +// 表示通过aop框架暴露该代理对象,AopContext能够访问 +@EnableAspectJAutoProxy(exposeProxy = true) +// 指定要扫描的Mapper类的包的路径 +@MapperScan("com.ruoyi.**.mapper") public class ApplicationConfig { /** diff --git a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java index d1503d6d..60155a3b 100644 --- a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java @@ -1,34 +1,21 @@ package com.ruoyi.framework.config; import java.io.IOException; -import java.util.*; -import javax.servlet.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; import javax.sql.DataSource; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; -import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; -import com.alibaba.druid.util.Utils; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.DruidProperties; -import com.ruoyi.framework.datasource.DynamicDataSource; import org.apache.ibatis.io.VFS; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.SqlSessionTemplate; -import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.boot.autoconfigure.SpringBootVFS; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import org.springframework.core.annotation.Order; import org.springframework.core.env.Environment; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; @@ -47,8 +34,8 @@ import com.ruoyi.common.utils.StringUtils; * @author ruoyi */ @Configuration -@MapperScan(basePackages = {"com.ruoyi.iot.mapper", "com.ruoyi.system.mapper", "com.ruoyi.quartz.mapper", "com.ruoyi.generator.mapper"}, sqlSessionTemplateRef = "mysqlSqlSessionTemplate") -public class MyBatisConfig { +public class MyBatisConfig +{ @Autowired private Environment env; @@ -132,11 +119,10 @@ public class MyBatisConfig { @Bean(name = "mysqlSessionFactory") @Primary - public SqlSessionFactory sqlSessionFactory(@Qualifier("dynamicDataSource") DataSource dataSource) throws Exception + public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception { - String typeAliasesPackage = "com.ruoyi.**.domain";//env.getProperty("mybatis.typeAliasesPackage"); - String mapperLocations = "classpath:mapper/iot/*Mapper.xml,classpath:mapper/system/*Mapper.xml,classpath:mapper/quartz/*Mapper.xml"; -// String typeAliasesPackage = "com.ruoyi.**.domain"; + String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage"); + String mapperLocations = env.getProperty("mybatis.mapperLocations"); String configLocation = env.getProperty("mybatis.configLocation"); typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage); VFS.addImplClass(SpringBootVFS.class); @@ -160,5 +146,4 @@ public class MyBatisConfig { public SqlSessionTemplate mysqlSqlSessionTemplate(@Qualifier("mysqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception { return new SqlSessionTemplate(sqlSessionFactory); } - } \ No newline at end of file diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/init/ApplicationStarted.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/init/ApplicationStarted.java deleted file mode 100644 index e809d54e..00000000 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/init/ApplicationStarted.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.ruoyi.iot.init; - - -//import com.ruoyi.mysql.config.TDengineConfig; - -//import com.ruoyi.iot.tdengine.config.TDengineConfig; -import com.alibaba.druid.pool.DruidDataSource; -import com.ruoyi.iot.tdengine.config.TDengineConfig; - import com.ruoyi.iot.domain.DeviceLog; -import com.ruoyi.iot.mapper.DeviceMapper; -import com.ruoyi.iot.tdengine.mapper.TDDeviceLogMapper; - import org.mybatis.spring.SqlSessionTemplate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; - -import javax.sql.DataSource; -import java.util.Date; - -/** - * 类名: ApplicationStarted - * 描述: TODO - * 时间: 2022/5/18,0018 1:41 - * 开发人: wxy - */ -@Component -public class ApplicationStarted implements ApplicationRunner { - - private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationStarted.class); - - @Autowired - private TDengineConfig dengineConfig; - - @Autowired - private TDDeviceLogMapper deviceLogMapper; - - @Autowired - private DeviceMapper deviceMapper; - - @Override - public void run(ApplicationArguments args) { - deviceMapper.selectDeviceByDeviceId(0L); - System.out.println("初始化MySql链接成功"); - initTDengine(); - System.out.println("初始化TDengine链接成功"); - } - - /** - * @Method - * @Description 开始初始化加载系统参数,创建数据库和超级表 - * @Param null - * @return - * @date 2022/5/22,0022 14:27 - * @author wxy - * - */ - public void initTDengine() { - try { - String dbName = dengineConfig.getDbName(); - int db = deviceLogMapper.createDB(dbName); - deviceLogMapper.createSTable(dbName); - - System.out.println(db); - } catch (Exception e) { - e.printStackTrace(); - System.out.println("ERROR"); - } - - } - -} diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java index bd875259..0d2d1710 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java @@ -3,16 +3,13 @@ package com.ruoyi.iot.mqtt; import com.alibaba.fastjson.JSON; import com.ruoyi.iot.domain.Device; import com.ruoyi.iot.domain.DeviceLog; -import com.ruoyi.iot.log.service.ILogService; +import com.ruoyi.iot.tdengine.service.ILogService; import com.ruoyi.iot.model.NtpModel; import com.ruoyi.iot.model.ThingsModels.IdentityAndName; -import com.ruoyi.iot.model.ThingsModels.ThingsModelValueItem; import com.ruoyi.iot.model.ThingsModels.ThingsModelValueRemarkItem; import com.ruoyi.iot.model.ThingsModels.ThingsModelValuesInput; -import com.ruoyi.iot.service.IDeviceLogService; import com.ruoyi.iot.service.IDeviceService; import org.eclipse.paho.client.mqttv3.MqttAsyncClient; -import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.slf4j.Logger; diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceLogServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceLogServiceImpl.java index da92a13d..54a9ef64 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceLogServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceLogServiceImpl.java @@ -2,7 +2,7 @@ package com.ruoyi.iot.service.impl; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.iot.domain.DeviceLog; -import com.ruoyi.iot.log.service.ILogService; +import com.ruoyi.iot.tdengine.service.ILogService; import com.ruoyi.iot.mapper.DeviceLogMapper; import com.ruoyi.iot.model.MonitorModel; import com.ruoyi.iot.service.IDeviceLogService; diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java index b40e0112..a3eaadc5 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java @@ -11,19 +11,17 @@ import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.iot.domain.Device; import com.ruoyi.iot.domain.DeviceLog; import com.ruoyi.iot.domain.Product; -import com.ruoyi.iot.log.service.ILogService; +import com.ruoyi.iot.tdengine.service.ILogService; import com.ruoyi.iot.mapper.DeviceLogMapper; import com.ruoyi.iot.mapper.DeviceMapper; import com.ruoyi.iot.mapper.DeviceUserMapper; import com.ruoyi.iot.model.*; import com.ruoyi.iot.model.ThingsModelItem.*; import com.ruoyi.iot.model.ThingsModels.*; -import com.ruoyi.iot.service.IDeviceLogService; import com.ruoyi.iot.service.IDeviceService; import com.ruoyi.iot.service.IProductService; import com.ruoyi.iot.service.IToolService; import com.ruoyi.system.service.ISysUserService; -import org.checkerframework.checker.units.qual.A; import org.quartz.SchedulerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/config/TDengineConfig.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/config/TDengineConfig.java index 9343ce19..316d034b 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/config/TDengineConfig.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/config/TDengineConfig.java @@ -2,7 +2,7 @@ package com.ruoyi.iot.tdengine.config; import com.alibaba.druid.pool.DruidDataSource; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.iot.tdengine.mapper.TDDeviceLogMapper; +import com.ruoyi.iot.tdengine.dao.TDDeviceLogMapper; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.SqlSessionTemplate; @@ -31,7 +31,7 @@ import java.util.List; * 开发人: wxy */ @Configuration -@MapperScan(basePackages = {"com.ruoyi.iot.tdengine.mapper"}, sqlSessionTemplateRef = "tdengineSqlSessionTemplate") +@MapperScan(basePackages = {"com.ruoyi.iot.tdengine.dao"}, sqlSessionTemplateRef = "tdengineSqlSessionTemplate") @ConditionalOnProperty(name = "spring.datasource.druid.tdengine-server.enabled", havingValue = "true") public class TDengineConfig { @@ -64,16 +64,6 @@ public class TDengineConfig { return new SqlSessionTemplate(sqlSessionFactory); } - -// @Bean -// @ConditionalOnProperty(name = "spring.datasource.druid.tdengine-server.enabled", havingValue = "true") -// public TDDeviceLogMapper genTdengineLogMapper(@Qualifier("tDengineDataSource") TDDeviceLogMapper mapper) { -// if(this.deviceLogMapper==null){ -// this.deviceLogMapper=mapper; -// } -// return this.deviceLogMapper; -// } - public TDDeviceLogMapper getTDengineLogMapper() { return deviceLogMapper; } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/mapper/DatabaseMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/DatabaseMapper.java similarity index 89% rename from springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/mapper/DatabaseMapper.java rename to springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/DatabaseMapper.java index 076e66ac..5eb3b677 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/mapper/DatabaseMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/DatabaseMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.iot.tdengine.mapper; +package com.ruoyi.iot.tdengine.dao; import org.springframework.stereotype.Repository; diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/mapper/TDDeviceLogMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogMapper.java similarity index 94% rename from springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/mapper/TDDeviceLogMapper.java rename to springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogMapper.java index 99aa0f6a..d338823d 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/mapper/TDDeviceLogMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogMapper.java @@ -1,11 +1,10 @@ -package com.ruoyi.iot.tdengine.mapper; +package com.ruoyi.iot.tdengine.dao; import com.ruoyi.iot.domain.DeviceLog; import com.ruoyi.iot.model.MonitorModel; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.lang.management.MonitorInfo; import java.util.Date; import java.util.List; diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/init/ApplicationStarted.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/init/ApplicationStarted.java new file mode 100644 index 00000000..5a2da7f4 --- /dev/null +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/init/ApplicationStarted.java @@ -0,0 +1,79 @@ +package com.ruoyi.iot.tdengine.init; + + +import com.ruoyi.iot.tdengine.config.TDengineConfig; +import com.ruoyi.iot.tdengine.dao.TDDeviceLogMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.context.ApplicationContext; +import org.springframework.lang.Nullable; +import org.springframework.stereotype.Component; + +/** + * 类名: ApplicationStarted + * 描述: TODO + * 时间: 2022/5/18,0018 1:41 + * 开发人: wxy + */ +@Component +public class ApplicationStarted implements ApplicationRunner { + + private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationStarted.class); + + @Autowired + private ApplicationContext applicationContext; + + @Override + public void run(ApplicationArguments args) { + //先获取TDengine的配置，检测TDengine是否已经配置 + if (containBean(TDengineConfig.class)) { + TDengineConfig tDengineConfig = applicationContext.getBean(TDengineConfig.class); + TDDeviceLogMapper tDDeviceLogMapper = applicationContext.getBean(TDDeviceLogMapper.class); + initTDengine(tDengineConfig, tDDeviceLogMapper); + System.out.println("初始化TDengine成功"); + }else{ + System.out.println("MySQL初始化成功"); + } + } + + /** + * @return + * @Method + * @Description 开始初始化加载系统参数, 创建数据库和超级表 + * @Param null + * @date 2022/5/22,0022 14:27 + * @author wxy + */ + public void initTDengine(TDengineConfig dengineConfig, TDDeviceLogMapper deviceLogMapper) { + try { + String dbName = dengineConfig.getDbName(); + int db = deviceLogMapper.createDB(dbName); + deviceLogMapper.createSTable(dbName); + System.out.println(db); + } catch (Exception e) { + e.printStackTrace(); + System.out.println("ERROR"); + } + + } + + /** + * @return + * @Method containBean + * @Description 根据类判断是否有对应bean + * @Param 类 + * @date 2022/5/22,0022 14:12 + * @author wxy + */ + private boolean containBean(@Nullable Class T) { + String[] beans = applicationContext.getBeanNamesForType(T); + if (beans == null || beans.length == 0) { + return false; + } else { + return true; + } + } +} diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/ILogService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/ILogService.java similarity index 92% rename from springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/ILogService.java rename to springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/ILogService.java index 829c962a..f775ade5 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/ILogService.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/ILogService.java @@ -1,4 +1,4 @@ -package com.ruoyi.iot.log.service; +package com.ruoyi.iot.tdengine.service; import com.ruoyi.iot.domain.DeviceLog; diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/factory/LogServiceFactory.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java similarity index 75% rename from springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/factory/LogServiceFactory.java rename to springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java index acd7be7f..342e7445 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/factory/LogServiceFactory.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java @@ -1,28 +1,17 @@ -package com.ruoyi.iot.log.service.factory; +package com.ruoyi.iot.tdengine.service.factory; -import com.alibaba.fastjson.JSONObject; import com.ruoyi.framework.config.MyBatisConfig; -import com.ruoyi.iot.log.service.impl.MySqlLogServiceImpl; -import com.ruoyi.iot.log.service.impl.TdengineLogServiceImpl; -import com.ruoyi.iot.model.MonitorModel; +import com.ruoyi.iot.tdengine.service.impl.MySqlLogServiceImpl; +import com.ruoyi.iot.tdengine.service.impl.TdengineLogServiceImpl; import com.ruoyi.iot.tdengine.config.TDengineConfig; -import com.ruoyi.iot.domain.DeviceLog; -import com.ruoyi.iot.log.service.ILogService; +import com.ruoyi.iot.tdengine.service.ILogService; import com.ruoyi.iot.mapper.DeviceLogMapper; -import com.ruoyi.iot.tdengine.mapper.TDDeviceLogMapper; -import com.ruoyi.iot.util.SnowflakeIdWorker; +import com.ruoyi.iot.tdengine.dao.TDDeviceLogMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.lang.Nullable; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -import javax.annotation.PostConstruct; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; /** * 类名: DeviceLogServiceImpl diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/impl/MySqlLogServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java similarity index 87% rename from springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/impl/MySqlLogServiceImpl.java rename to springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java index 1ba1f610..ecd4719b 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/impl/MySqlLogServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java @@ -1,10 +1,9 @@ -package com.ruoyi.iot.log.service.impl; +package com.ruoyi.iot.tdengine.service.impl; import com.ruoyi.iot.domain.DeviceLog; -import com.ruoyi.iot.log.service.ILogService; +import com.ruoyi.iot.tdengine.service.ILogService; import com.ruoyi.iot.mapper.DeviceLogMapper; import com.ruoyi.iot.model.MonitorModel; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/impl/TdengineLogServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java similarity index 83% rename from springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/impl/TdengineLogServiceImpl.java rename to springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java index 58d381a5..2b49b460 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/impl/TdengineLogServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java @@ -1,15 +1,12 @@ -package com.ruoyi.iot.log.service.impl; +package com.ruoyi.iot.tdengine.service.impl; import com.ruoyi.iot.domain.DeviceLog; -import com.ruoyi.iot.log.service.ILogService; +import com.ruoyi.iot.tdengine.service.ILogService; import com.ruoyi.iot.model.MonitorModel; import com.ruoyi.iot.tdengine.config.TDengineConfig; -import com.ruoyi.iot.tdengine.mapper.TDDeviceLogMapper; +import com.ruoyi.iot.tdengine.dao.TDDeviceLogMapper; import com.ruoyi.iot.util.SnowflakeIdWorker; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/springboot/wumei-iot/src/main/resources/mapper/tdengine/DatabaseMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/tdengine/DatabaseMapper.xml index a2925db9..4cc118cf 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/tdengine/DatabaseMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/tdengine/DatabaseMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml index a17ef4d2..461625c4 100644 --- a/springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml +++ b/springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml @@ -2,7 +2,7 @@ - +