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..56463e7a 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); @@ -157,8 +143,7 @@ public class MyBatisConfig { @Bean(name = "mysqlSqlSessionTemplate") @Primary - public SqlSessionTemplate mysqlSqlSessionTemplate(@Qualifier("mysqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception { + public SqlSessionTemplate mysqlSqlSessionTemplate(@Qualifier("mysqlSessionFactory") SqlSessionFactory sqlSessionFactory) { 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/log/service/ILogService.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/ILogService.java deleted file mode 100644 index 829c962a..00000000 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/ILogService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.ruoyi.iot.log.service; - -import com.ruoyi.iot.domain.DeviceLog; - -import com.ruoyi.iot.model.MonitorModel; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @package iot.iot.log - * 类名: LogService - * 描述: 设备日志记录接口 - * 时间: 2022/5/19,0019 18:04 - * 开发人: admin - */ -public interface ILogService { - - int saveDeviceLog(DeviceLog deviceLog); - - List selectDeviceLogList(DeviceLog deviceLog); - - List selectMonitorList(DeviceLog 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/log/service/factory/LogServiceFactory.java deleted file mode 100644 index acd7be7f..00000000 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/factory/LogServiceFactory.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.ruoyi.iot.log.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.config.TDengineConfig; -import com.ruoyi.iot.domain.DeviceLog; -import com.ruoyi.iot.log.service.ILogService; -import com.ruoyi.iot.mapper.DeviceLogMapper; -import com.ruoyi.iot.tdengine.mapper.TDDeviceLogMapper; -import com.ruoyi.iot.util.SnowflakeIdWorker; -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 - * 描述: TODO - * 时间: 2022/5/19,0019 18:09 - * 开发人: wxy - */ -@Component -public class LogServiceFactory { - - @Autowired - private ApplicationContext applicationContext; - - @Bean - public ILogService getLogService() { - //先获取TDengine的配置，检测TDengine是否已经配置 - if (containBean(TDengineConfig.class)) { - TDengineConfig tDengineConfig = applicationContext.getBean(TDengineConfig.class); - TDDeviceLogMapper tDDeviceLogMapper = applicationContext.getBean(TDDeviceLogMapper.class); - ILogService logService = new TdengineLogServiceImpl(tDengineConfig, tDDeviceLogMapper); - return logService; - } else if (containBean(MyBatisConfig.class)) { - //没有配置TDengine，那么使用MySQL的日志配置 - DeviceLogMapper deviceLogMapper = applicationContext.getBean( DeviceLogMapper.class); - ILogService logService = new MySqlLogServiceImpl(deviceLogMapper); - return logService; - } else { - return null; - } - } - - /** - * @Method containBean - * @Description 根据类判断是否有对应bean - * @Param 类 - * @return - * @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/impl/MySqlLogServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/impl/MySqlLogServiceImpl.java deleted file mode 100644 index 1ba1f610..00000000 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/impl/MySqlLogServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.ruoyi.iot.log.service.impl; - -import com.ruoyi.iot.domain.DeviceLog; -import com.ruoyi.iot.log.service.ILogService; -import com.ruoyi.iot.mapper.DeviceLogMapper; -import com.ruoyi.iot.model.MonitorModel; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 类名: MySqlLogServiceImpl - * 描述: MySQL存储日志实现类 - * 时间: 2022/5/22,0022 13:37 - * 开发人: admin - */ -public class MySqlLogServiceImpl implements ILogService { - - private DeviceLogMapper deviceLogMapper; - - public MySqlLogServiceImpl(DeviceLogMapper _deviceLogMapper){ - this.deviceLogMapper=_deviceLogMapper; - } - @Override - public int saveDeviceLog(DeviceLog deviceLog) { - return deviceLogMapper.insertDeviceLog(deviceLog); - } - - @Override - public List selectDeviceLogList(DeviceLog deviceLog) { - return deviceLogMapper.selectDeviceLogList(deviceLog); - } - - @Override - public List selectMonitorList(DeviceLog deviceLog) { - return deviceLogMapper.selectMonitorList(deviceLog); - } -} 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/log/service/impl/TdengineLogServiceImpl.java deleted file mode 100644 index 58d381a5..00000000 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/log/service/impl/TdengineLogServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.ruoyi.iot.log.service.impl; - -import com.ruoyi.iot.domain.DeviceLog; -import com.ruoyi.iot.log.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.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; - -/** - * 类名: TdengineLogServiceImpl - * 描述: TDengine存储日志数据实现类 - * 时间: 2022/5/22,0022 13:38 - * 开发人: admin - */ -public class TdengineLogServiceImpl implements ILogService { - - private ApplicationContext applicationContext; - - private TDDeviceLogMapper tdDeviceLogMapper; - - private TDengineConfig tDengineConfig; - - private SnowflakeIdWorker snowflakeIdWorker; - - private String dbName; - - public TdengineLogServiceImpl(TDengineConfig _tDengineConfig,TDDeviceLogMapper _tdDeviceLogMapper) { - this.tdDeviceLogMapper = _tdDeviceLogMapper; - this.tDengineConfig = _tDengineConfig; - snowflakeIdWorker=new SnowflakeIdWorker(1); - this.dbName=_tDengineConfig.getDbName(); - } - - @Override - public int saveDeviceLog(DeviceLog deviceLog) { - long logId = snowflakeIdWorker.nextId(); - deviceLog.setLogId(logId); - return tdDeviceLogMapper.save(dbName,deviceLog); - } - - @Override - public List selectDeviceLogList(DeviceLog deviceLog) { - return tdDeviceLogMapper.selectDeviceLogList(dbName,deviceLog); - } - - @Override - public List selectMonitorList(DeviceLog deviceLog) { - return tdDeviceLogMapper.selectMonitorList(dbName,deviceLog); - } -} 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..bca6e263 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,7 +3,6 @@ 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.model.NtpModel; import com.ruoyi.iot.model.ThingsModels.IdentityAndName; import com.ruoyi.iot.model.ThingsModels.ThingsModelValueItem; @@ -11,6 +10,7 @@ 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 com.ruoyi.iot.tdengine.service.ILogService; import org.eclipse.paho.client.mqttv3.MqttAsyncClient; import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttException; 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..c71a0812 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,6 @@ 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 org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.SqlSessionTemplate; @@ -31,13 +30,10 @@ 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 { - @Autowired - private TDDeviceLogMapper deviceLogMapper; - @Value("${spring.datasource.druid.tdengine-server.dbName}") private String dbName; @@ -64,22 +60,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; - } - - - public String getDbName() { return dbName; } diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/DatabaseMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/DatabaseDAO.java similarity index 91% rename from springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/DatabaseMapper.java rename to springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/DatabaseDAO.java index 5eb3b677..3044d692 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/DatabaseMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/DatabaseDAO.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; * 开发人: wxy */ @Repository -public interface DatabaseMapper { +public interface DatabaseDAO { int createDB(); diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogMapper.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogDAO.java similarity index 97% rename from springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogMapper.java rename to springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogDAO.java index d338823d..b4907756 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogMapper.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/dao/TDDeviceLogDAO.java @@ -16,7 +16,7 @@ import java.util.List; * 开发人: wxy */ @Repository -public interface TDDeviceLogMapper { +public interface TDDeviceLogDAO { int createDB( String database); 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 index 5a2da7f4..44bc356f 100644 --- 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 @@ -2,7 +2,7 @@ package com.ruoyi.iot.tdengine.init; import com.ruoyi.iot.tdengine.config.TDengineConfig; -import com.ruoyi.iot.tdengine.dao.TDDeviceLogMapper; +import com.ruoyi.iot.tdengine.dao.TDDeviceLogDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -31,8 +31,8 @@ public class ApplicationStarted implements ApplicationRunner { //先获取TDengine的配置，检测TDengine是否已经配置 if (containBean(TDengineConfig.class)) { TDengineConfig tDengineConfig = applicationContext.getBean(TDengineConfig.class); - TDDeviceLogMapper tDDeviceLogMapper = applicationContext.getBean(TDDeviceLogMapper.class); - initTDengine(tDengineConfig, tDDeviceLogMapper); + TDDeviceLogDAO tDDeviceLogDAO = applicationContext.getBean(TDDeviceLogDAO.class); + initTDengine(tDengineConfig, tDDeviceLogDAO); System.out.println("初始化TDengine成功"); }else{ System.out.println("MySQL初始化成功"); @@ -47,7 +47,7 @@ public class ApplicationStarted implements ApplicationRunner { * @date 2022/5/22,0022 14:27 * @author wxy */ - public void initTDengine(TDengineConfig dengineConfig, TDDeviceLogMapper deviceLogMapper) { + public void initTDengine(TDengineConfig dengineConfig, TDDeviceLogDAO deviceLogMapper) { try { String dbName = dengineConfig.getDbName(); int db = deviceLogMapper.createDB(dbName); 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/mapper/DatabaseMapper.java deleted file mode 100644 index 076e66ac..00000000 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/mapper/DatabaseMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.ruoyi.iot.tdengine.mapper; - -import org.springframework.stereotype.Repository; - -/** - * @package com.ruoyi.mysql.mysql.tdengine - * 类名: DatabaseMapper - * 描述: TODO - * 时间: 2022/5/16,0016 1:27 - * 开发人: wxy - */ -@Repository -public interface DatabaseMapper { - - int createDB(); - - int dropDatabase(); - - int useDatabase(); - - int createTable(); - - - -} 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/mapper/TDDeviceLogMapper.java deleted file mode 100644 index 99aa0f6a..00000000 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/mapper/TDDeviceLogMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.ruoyi.iot.tdengine.mapper; - -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; - -/** - * @package com.ruoyi.mysql.mysql.tdengine - * 类名: DatabaseMapper - * 描述: TODO - * 时间: 2022/5/16,0016 1:27 - * 开发人: wxy - */ -@Repository -public interface TDDeviceLogMapper { - - - int createDB( String database); - - int createSTable(String database); - - int createTable(String database,String deviceId); - - int save(@Param("database") String database,@Param("device") DeviceLog deviceLog); - - List selectSTable(String database,DeviceLog deviceLog); - - int delete(String dbName, DeviceLog deviceLog); - -// List selectLogListByPage(String dbName, Integer pageSize, Integer pageNum, String deviceNum, Date beginDate, Date endDate); - - List selectLogList(String dbName, Long deviceId, String serialNumber, Long isMonitor, Long logType, Date beginDate, Date endDate); - - List selectMonitorList(@Param("database") String database, @Param("device") DeviceLog deviceLog); - - List selectDeviceLogList(@Param("database") String database,@Param("device") DeviceLog deviceLog); -} diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java index 342e7445..49500315 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/factory/LogServiceFactory.java @@ -6,7 +6,7 @@ import com.ruoyi.iot.tdengine.service.impl.TdengineLogServiceImpl; import com.ruoyi.iot.tdengine.config.TDengineConfig; import com.ruoyi.iot.tdengine.service.ILogService; import com.ruoyi.iot.mapper.DeviceLogMapper; -import com.ruoyi.iot.tdengine.dao.TDDeviceLogMapper; +import com.ruoyi.iot.tdengine.dao.TDDeviceLogDAO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; @@ -30,8 +30,8 @@ public class LogServiceFactory { //先获取TDengine的配置，检测TDengine是否已经配置 if (containBean(TDengineConfig.class)) { TDengineConfig tDengineConfig = applicationContext.getBean(TDengineConfig.class); - TDDeviceLogMapper tDDeviceLogMapper = applicationContext.getBean(TDDeviceLogMapper.class); - ILogService logService = new TdengineLogServiceImpl(tDengineConfig, tDDeviceLogMapper); + TDDeviceLogDAO tDDeviceLogDAO = applicationContext.getBean(TDDeviceLogDAO.class); + ILogService logService = new TdengineLogServiceImpl(tDengineConfig, tDDeviceLogDAO); return logService; } else if (containBean(MyBatisConfig.class)) { //没有配置TDengine，那么使用MySQL的日志配置 diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java index 2b49b460..01322450 100644 --- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java +++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/TdengineLogServiceImpl.java @@ -4,7 +4,7 @@ import com.ruoyi.iot.domain.DeviceLog; 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.dao.TDDeviceLogMapper; +import com.ruoyi.iot.tdengine.dao.TDDeviceLogDAO; import com.ruoyi.iot.util.SnowflakeIdWorker; import org.springframework.context.ApplicationContext; @@ -20,7 +20,7 @@ public class TdengineLogServiceImpl implements ILogService { private ApplicationContext applicationContext; - private TDDeviceLogMapper tdDeviceLogMapper; + private TDDeviceLogDAO tdDeviceLogDAO; private TDengineConfig tDengineConfig; @@ -28,8 +28,8 @@ public class TdengineLogServiceImpl implements ILogService { private String dbName; - public TdengineLogServiceImpl(TDengineConfig _tDengineConfig,TDDeviceLogMapper _tdDeviceLogMapper) { - this.tdDeviceLogMapper = _tdDeviceLogMapper; + public TdengineLogServiceImpl(TDengineConfig _tDengineConfig, TDDeviceLogDAO _tdDeviceLogDAO) { + this.tdDeviceLogDAO = _tdDeviceLogDAO; this.tDengineConfig = _tDengineConfig; snowflakeIdWorker=new SnowflakeIdWorker(1); this.dbName=_tDengineConfig.getDbName(); @@ -39,16 +39,16 @@ public class TdengineLogServiceImpl implements ILogService { public int saveDeviceLog(DeviceLog deviceLog) { long logId = snowflakeIdWorker.nextId(); deviceLog.setLogId(logId); - return tdDeviceLogMapper.save(dbName,deviceLog); + return tdDeviceLogDAO.save(dbName,deviceLog); } @Override public List selectDeviceLogList(DeviceLog deviceLog) { - return tdDeviceLogMapper.selectDeviceLogList(dbName,deviceLog); + return tdDeviceLogDAO.selectDeviceLogList(dbName,deviceLog); } @Override public List selectMonitorList(DeviceLog deviceLog) { - return tdDeviceLogMapper.selectMonitorList(dbName,deviceLog); + return tdDeviceLogDAO.selectMonitorList(dbName,deviceLog); } } 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..f5a6853a 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 @@ - + @@ -19,24 +19,6 @@ use ${dbName}; - - - create stable if not exists ${tableName} - (ts timestamp, - log_id BIGINT, - identity NCHAR(100), - log_type NCHAR(20), - log_value NCHAR(100), - device_id BIGINT, - device_name NCHAR(100), - serial_number NCHAR(100), - is_monitor int, - create_by NCHAR(100), - create_time timestamp, - remark NCHAR(1000), - ); - - create stable if not exists ${tableName} (ts timestamp, 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..1bf0071b 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 @@ - +