> showSuperTables(@Param("dataBaseName") String dataBaseName,
- @Param("superTableName") String superTableName);
-
- /**
- * 查看超级表 - 获取超级表的结构信息
- * SQL：DESCRIBE [db_name.]stb_name;
- *
- * * @param dataBaseName 数据库名称
- * * @param superTableName 超级表名称
- */
- @InterceptorIgnore(tenantLine = "true")
- List> describeSuperTable(@Param("dataBaseName") String dataBaseName,
- @Param("superTableName") String superTableName);
-
- /**
- * 为超级表添加列
- *
- * @param dataBaseName 数据库名称
- * @param superTableName 超级表名称
- * @param field 字段信息
- */
- @InterceptorIgnore(tenantLine = "true")
- void addColumnForSuperTable(@Param("dataBaseName") String dataBaseName,
- @Param("superTableName") String superTableName,
- @Param("field") TdFieldDO field);
-
- /**
- * 为超级表删除列
- *
- * @param dataBaseName 数据库名称
- * @param superTableName 超级表名称
- * @param field 字段信息
- */
- @InterceptorIgnore(tenantLine = "true")
- void dropColumnForSuperTable(@Param("dataBaseName") String dataBaseName,
- @Param("superTableName") String superTableName,
- @Param("field") TdFieldDO field);
-
- /**
- * 创建表 - 创建超级表的子表
- *
- * @param tableDO 表信息
- */
- @InterceptorIgnore(tenantLine = "true")
- void createTable(TableDO tableDO);
-
- /**
- * 插入数据 - 指定列插入数据
- *
- * @param tableDto 数据
- */
- @InterceptorIgnore(tenantLine = "true")
- void insertData(TableDO tableDto);
-
- List> selectByTimestamp(SelectDto selectDto);
-
-
- void addTagForSuperTable(@Param("superTableName") String superTableName,
- @Param("fieldsVo") FieldsVo fieldsVo);
-
- void dropTagForSuperTable(@Param("superTableName") String superTableName,
- @Param("fieldsVo") FieldsVo fieldsVo);
-
- Map getCountByTimestamp(SelectDto selectDto);
-
- Map getLastData(SelectDto selectDto);
-
- @InterceptorIgnore(tenantLine = "true")
- List> getHistoryData(SelectVisualDto selectVisualDto);
-
- List> getRealtimeData(SelectVisualDto selectVisualDto);
-
- List> getAggregateData(SelectVisualDto selectVisualDto);
-
- List> getLastDataByTags(TagsSelectDao tagsSelectDao);
-
- @InterceptorIgnore(tenantLine = "true")
- Long getHistoryCount(SelectVisualDto selectVisualDto);
-}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java
new file mode 100644
index 0000000000..e5353f7ee9
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java
@@ -0,0 +1,85 @@
+package cn.iocoder.yudao.module.iot.dal.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TagsSelectDO;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TD 引擎的查询 Mapper
+ */
+@Mapper
+@DS("tdengine")
+public interface TdEngineQueryMapper {
+
+ /**
+ * 根据时间戳查询数据
+ *
+ * @param selectDO 查询条件
+ * @return 查询结果
+ */
+ List> selectByTimestamp(SelectDO selectDO);
+
+ /**
+ * 根据时间戳获取数据条数
+ *
+ * @param selectDO 查询条件
+ * @return 数据条数
+ */
+ Map getCountByTimestamp(SelectDO selectDO);
+
+ /**
+ * 获取最新数据
+ *
+ * @param selectDO 查询条件
+ * @return 最新数据
+ */
+ Map getLastData(SelectDO selectDO);
+
+ /**
+ * 获取历史数据
+ *
+ * @param selectVisualDO 查询条件
+ * @return 历史数据列表
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ List> getHistoryData(SelectVisualDO selectVisualDO);
+
+ /**
+ * 获取实时数据
+ *
+ * @param selectVisualDO 查询条件
+ * @return 实时数据列表
+ */
+ List> getRealtimeData(SelectVisualDO selectVisualDO);
+
+ /**
+ * 获取聚合数据
+ *
+ * @param selectVisualDO 查询条件
+ * @return 聚合数据列表
+ */
+ List> getAggregateData(SelectVisualDO selectVisualDO);
+
+ /**
+ * 根据标签获取最新数据
+ *
+ * @param tagsSelectDO 查询条件
+ * @return 最新数据列表
+ */
+ List> getLastDataByTags(TagsSelectDO tagsSelectDO);
+
+ /**
+ * 获取历史数据条数
+ *
+ * @param selectVisualDO 查询条件
+ * @return 数据条数
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ Long getHistoryCount(SelectVisualDO selectVisualDO);
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineSuperTableMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineSuperTableMapper.java
new file mode 100644
index 0000000000..e688563d5f
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineSuperTableMapper.java
@@ -0,0 +1,111 @@
+package cn.iocoder.yudao.module.iot.dal.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TD 引擎的超级表 Mapper
+ */
+@Mapper
+@DS("tdengine")
+public interface TdEngineSuperTableMapper {
+
+ /**
+ * 创建超级表
+ * SQL：CREATE STABLE [IF NOT EXISTS] stb_name (create_definition [, create_definition] ...) TAGS (create_definition [, create_definition] ...) [table_options];
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * columns 列信息
+ * tags 标签信息
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ void createSuperTable(TdTableDO superTable);
+
+ /**
+ * 查看超级表 - 显示当前数据库下的所有超级表信息
+ * SQL：SHOW STABLES [LIKE tb_name_wildcard];
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ List> showSuperTables(TdTableDO superTable);
+
+ /**
+ * 查看超级表 - 获取超级表的结构信息
+ * SQL：DESCRIBE [db_name.]stb_name;
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ List> describeSuperTable(TdTableDO superTable);
+
+ /**
+ * 修改超级表 - 增加列
+ * SQL：ALTER STABLE stb_name ADD COLUMN col_name column_type;
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * column 列信息
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ void addColumnForSuperTable(TdTableDO superTable);
+
+ /**
+ * 修改超级表 - 删除列
+ * SQL：ALTER STABLE stb_name DROP COLUMN col_name;
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * column 列信息
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ void dropColumnForSuperTable(TdTableDO superTable);
+
+ /**
+ * 修改超级表 - 修改列宽
+ * SQL：ALTER STABLE stb_name MODIFY COLUMN col_name data_type(length);
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * column 列信息
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ void modifyColumnWidthForSuperTable(TdTableDO superTable);
+
+
+ /**
+ * 修改超级表 - 为超级表添加标签
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * tag 标签信息
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ void addTagForSuperTable(TdTableDO superTable);
+
+ /**
+ * 修改超级表 - 为超级表删除标签
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * tag 标签信息
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ void dropTagForSuperTable(TdTableDO superTable);
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineTableMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineTableMapper.java
new file mode 100644
index 0000000000..72517bcaba
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineTableMapper.java
@@ -0,0 +1,41 @@
+package cn.iocoder.yudao.module.iot.dal.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * TD 引擎的表 Mapper
+ */
+@Mapper
+@DS("tdengine")
+public interface TdEngineTableMapper {
+
+ /**
+ * 创建子表 - 创建子表
+ * SQL：CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name TAGS (tag_value1, ...);
+ *
+ * @param table 表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * tableName 子表名称
+ * tags TAG 字段
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ void createTable(TdTableDO table);
+
+ /**
+ * 创建子表 - 创建子表并指定标签的值
+ * SQL：CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name (tag_name1, ...) TAGS (tag_value1, ...);
+ *
+ * @param table 表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * tableName 子表名称
+ * tags TAG 字段
+ */
+ @InterceptorIgnore(tenantLine = "true")
+ void createTableWithTags(TdTableDO table);
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
index 1b44bd5d0a..4179075dfb 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
@@ -6,13 +6,13 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData.IotDeviceDataReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDataDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.ThingModelMessage;
import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodelfunction.IotThinkModelFunctionDO;
import cn.iocoder.yudao.module.iot.dal.redis.deviceData.DeviceDataRedisDAO;
-import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineMapper;
-import cn.iocoder.yudao.module.iot.domain.visual.SelectVisualDto;
import cn.iocoder.yudao.module.iot.enums.product.IotProductFunctionTypeEnum;
import cn.iocoder.yudao.module.iot.service.tdengine.IotThingModelMessageService;
+import cn.iocoder.yudao.module.iot.service.tdengine.TdEngineQueryService;
import cn.iocoder.yudao.module.iot.service.thinkmodelfunction.IotThinkModelFunctionService;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
@@ -39,13 +39,12 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
private IotThingModelMessageService thingModelMessageService;
@Resource
private IotThinkModelFunctionService thinkModelFunctionService;
+ @Resource
+ private TdEngineQueryService tdEngineQueryService;
@Resource
private DeviceDataRedisDAO deviceDataRedisDAO;
- @Resource
- private TdEngineMapper tdEngineMapper;
-
@Override
public void saveDeviceData(String productKey, String deviceName, String message) {
// 1. 根据产品 key 和设备名称，获得设备信息
@@ -112,18 +111,18 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
// 1. 获取设备信息
IotDeviceDO device = deviceService.getDevice(deviceDataReqVO.getDeviceId());
// 2. 获取设备属性历史数据
- SelectVisualDto selectVisualDto = new SelectVisualDto();
- selectVisualDto.setDataBaseName(getDatabaseName());
- selectVisualDto.setTableName(getDeviceTableName(device.getProductKey(), device.getDeviceName()));
- selectVisualDto.setFieldName(deviceDataReqVO.getIdentifier());
- selectVisualDto.setStartTime(DateUtil.date(deviceDataReqVO.getTimes()[0].atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()).getTime());
- selectVisualDto.setEndTime(DateUtil.date(deviceDataReqVO.getTimes()[1].atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()).getTime());
+ SelectVisualDO selectVisualDO = new SelectVisualDO();
+ selectVisualDO.setDataBaseName(getDatabaseName());
+ selectVisualDO.setTableName(getDeviceTableName(device.getProductKey(), device.getDeviceName()));
+ selectVisualDO.setFieldName(deviceDataReqVO.getIdentifier());
+ selectVisualDO.setStartTime(DateUtil.date(deviceDataReqVO.getTimes()[0].atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()).getTime());
+ selectVisualDO.setEndTime(DateUtil.date(deviceDataReqVO.getTimes()[1].atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()).getTime());
Map params = new HashMap<>();
params.put("rows", deviceDataReqVO.getPageSize());
params.put("page", (deviceDataReqVO.getPageNo() - 1) * deviceDataReqVO.getPageSize());
- selectVisualDto.setParams(params);
- pageResult.setList(tdEngineMapper.getHistoryData(selectVisualDto));
- pageResult.setTotal(tdEngineMapper.getHistoryCount(selectVisualDto));
+ selectVisualDO.setParams(params);
+ pageResult.setList(tdEngineQueryService.getHistoryData(selectVisualDO));
+ pageResult.setTotal(tdEngineQueryService.getHistoryCount(selectVisualDO));
return pageResult;
}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotDbStructureDataService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableService.java
similarity index 50%
rename from yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotDbStructureDataService.java
rename to yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableService.java
index 42439e25a2..7c88b83aa5 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotDbStructureDataService.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableService.java
@@ -1,26 +1,15 @@
package cn.iocoder.yudao.module.iot.service.tdengine;
-import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelRespVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodelfunction.IotThinkModelFunctionDO;
import java.util.List;
/**
- * 数据结构接口
+ * IoT 超级表服务，负责根据物模型创建和更新超级表，以及创建超级表的子表等操作。
*/
-public interface IotDbStructureDataService {
-
- /**
- * 创建物模型定义
- */
- void createSuperTable(ThingModelRespVO thingModel, Integer deviceType);
-
- /**
- * 更新物模型定义
- */
- void updateSuperTable(ThingModelRespVO thingModel, Integer deviceType);
+public interface IotSuperTableService {
/**
* 创建超级表数据模型
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotDbStructureDataServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableServiceImpl.java
similarity index 55%
rename from yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotDbStructureDataServiceImpl.java
rename to yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableServiceImpl.java
index 9471781027..3be324c4e6 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotDbStructureDataServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableServiceImpl.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingMode
import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.FieldParser;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdFieldDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodelfunction.IotThinkModelFunctionDO;
import cn.iocoder.yudao.module.iot.enums.product.IotProductFunctionTypeEnum;
import jakarta.annotation.Resource;
@@ -17,135 +18,19 @@ import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
+/**
+ * IoT 超级表服务实现类，负责根据物模型创建和更新超级表，以及创建超级表的子表等操作。
+ */
@Service
@Slf4j
-public class IotDbStructureDataServiceImpl implements IotDbStructureDataService {
+public class IotSuperTableServiceImpl implements IotSuperTableService {
@Resource
- private IotTdEngineService iotTdEngineService;
+ private TdEngineSuperTableService tdEngineSuperTableService;
@Value("${spring.datasource.dynamic.datasource.tdengine.url}")
private String url;
- @Override
- public void createSuperTable(ThingModelRespVO thingModel, Integer deviceType) {
- // 1. 解析物模型，获得字段列表
- List schemaFields = new ArrayList<>();
- schemaFields.add(TdFieldDO.builder()
- .fieldName("time")
- .dataType("TIMESTAMP")
- .build());
- schemaFields.addAll(FieldParser.parse(thingModel));
-
- // 3. 设置超级表的标签
- List tagsFields = Arrays.asList(
- TdFieldDO.builder().fieldName("product_key").dataType("NCHAR").dataLength(64).build(),
- TdFieldDO.builder().fieldName("device_key").dataType("NCHAR").dataLength(64).build(),
- TdFieldDO.builder().fieldName("device_name").dataType("NCHAR").dataLength(64).build(),
- TdFieldDO.builder().fieldName("device_type").dataType("INT").build()
- );
-
- // 4. 获取超级表的名称
- String superTableName = getProductPropertySTableName(deviceType, thingModel.getProductKey());
-
- // 5. 创建超级表
- String dataBaseName = getDatabaseName();
- iotTdEngineService.createSuperTable(schemaFields, tagsFields, dataBaseName, superTableName);
- }
-
- @Override
- public void updateSuperTable(ThingModelRespVO thingModel, Integer deviceType) {
- try {
- String tbName = getProductPropertySTableName(deviceType, thingModel.getProductKey());
- List oldFields = getTableFields(tbName);
- List newFields = FieldParser.parse(thingModel);
-
- updateTableFields(tbName, oldFields, newFields);
- } catch (Exception e) {
- log.error("更新物模型超级表失败", e);
- }
- }
-
- // 获取表字段
- private List getTableFields(String tableName) {
- List fields = new ArrayList<>();
- // 获取超级表的描述信息
- List> maps = iotTdEngineService.describeSuperTable(getDatabaseName(), tableName);
- if (maps != null) {
- // 过滤掉 note 字段为 TAG 的记录和 time 字段
- List> filteredMaps = maps.stream()
- .filter(map -> !"TAG".equals(map.get("note")))
- .filter(map -> !"time".equals(map.get("field")))
- .toList();
- // 解析字段信息
- fields = FieldParser.parse(filteredMaps.stream()
- .map(map -> List.of(map.get("field"), map.get("type"), map.get("length")))
- .collect(Collectors.toList()));
- }
- return fields;
- }
-
- // 更新表字段
- private void updateTableFields(String tableName, List oldFields, List newFields) {
- // 获取新增字段
- List addFields = getAddFields(oldFields, newFields);
- // 获取修改字段
- List modifyFields = getModifyFields(oldFields, newFields);
- // 获取删除字段
- List dropFields = getDropFields(oldFields, newFields);
-
- String dataBaseName = getDatabaseName();
- // 添加新增字段
- if (CollUtil.isNotEmpty(addFields)) {
- iotTdEngineService.addColumnForSuperTable(dataBaseName, tableName, addFields);
- }
- // 删除旧字段
- if (CollUtil.isNotEmpty(dropFields)) {
- iotTdEngineService.dropColumnForSuperTable(dataBaseName, tableName, dropFields);
- }
- // 修改字段（先删除再添加）
- if (CollUtil.isNotEmpty(modifyFields)) {
- iotTdEngineService.dropColumnForSuperTable(dataBaseName, tableName, modifyFields);
- iotTdEngineService.addColumnForSuperTable(dataBaseName, tableName, modifyFields);
- }
- }
-
- // 获取新增字段
- private List getAddFields(List oldFields, List newFields) {
- Set oldFieldNames = oldFields.stream()
- .map(TdFieldDO::getFieldName)
- .collect(Collectors.toSet());
- return newFields.stream()
- .filter(f -> !oldFieldNames.contains(f.getFieldName()))
- .collect(Collectors.toList());
- }
-
- // 获取修改字段
- private List getModifyFields(List oldFields, List newFields) {
- Map oldFieldMap = oldFields.stream()
- .collect(Collectors.toMap(TdFieldDO::getFieldName, f -> f));
-
- return newFields.stream()
- .filter(f -> {
- TdFieldDO oldField = oldFieldMap.get(f.getFieldName());
- return oldField != null &&
- (!oldField.getDataType().equals(f.getDataType()) ||
- !Objects.equals(oldField.getDataLength(), f.getDataLength()));
- })
- .collect(Collectors.toList());
- }
-
- // 获取删除字段
- private List getDropFields(List oldFields, List newFields) {
- Set newFieldNames = newFields.stream()
- .map(TdFieldDO::getFieldName)
- .collect(Collectors.toSet());
- return oldFields.stream()
- .filter(f -> !"time".equals(f.getFieldName()) && !"device_id".equals(f.getFieldName()))
- .filter(f -> !newFieldNames.contains(f.getFieldName()))
- .collect(Collectors.toList());
- }
-
@Override
public void createSuperTableDataModel(IotProductDO product, List functionList) {
ThingModelRespVO thingModel = buildThingModel(product, functionList);
@@ -155,9 +40,9 @@ public class IotDbStructureDataServiceImpl implements IotDbStructureDataService
return;
}
- String superTableName = getProductPropertySTableName(product.getDeviceType(), product.getProductKey());
- String dataBaseName = getDatabaseName();
- Integer tableExists = iotTdEngineService.checkSuperTableExists(dataBaseName, superTableName);
+ String superTableName = getSuperTableName(product.getDeviceType(), product.getProductKey());
+ String databaseName = getDatabaseName();
+ Integer tableExists = tdEngineSuperTableService.checkSuperTableExists(new TdTableDO(databaseName, superTableName));
if (tableExists != null && tableExists > 0) {
updateSuperTable(thingModel, product.getDeviceType());
@@ -166,40 +51,202 @@ public class IotDbStructureDataServiceImpl implements IotDbStructureDataService
}
}
+ /**
+ * 创建超级表
+ */
+ private void createSuperTable(ThingModelRespVO thingModel, Integer deviceType) {
+ // 解析物模型，获取字段列表
+ List schemaFields = new ArrayList<>();
+ schemaFields.add(TdFieldDO.builder()
+ .fieldName("time")
+ .dataType("TIMESTAMP")
+ .build());
+ schemaFields.addAll(FieldParser.parse(thingModel));
+
+ // 设置超级表的标签
+ List tagsFields = List.of(
+ TdFieldDO.builder().fieldName("product_key").dataType("NCHAR").dataLength(64).build(),
+ TdFieldDO.builder().fieldName("device_key").dataType("NCHAR").dataLength(64).build(),
+ TdFieldDO.builder().fieldName("device_name").dataType("NCHAR").dataLength(64).build(),
+ TdFieldDO.builder().fieldName("device_type").dataType("INT").build()
+ );
+
+ // 获取超级表的名称和数据库名称
+ String superTableName = getSuperTableName(deviceType, thingModel.getProductKey());
+ String databaseName = getDatabaseName();
+
+ // 创建超级表
+ tdEngineSuperTableService.createSuperTable(new TdTableDO(databaseName, superTableName, schemaFields, tagsFields));
+ }
+
+ /**
+ * 更新超级表
+ */
+ private void updateSuperTable(ThingModelRespVO thingModel, Integer deviceType) {
+ String superTableName = getSuperTableName(deviceType, thingModel.getProductKey());
+ try {
+ List oldFields = getTableFields(superTableName);
+ List newFields = FieldParser.parse(thingModel);
+
+ updateTableFields(superTableName, oldFields, newFields);
+ } catch (Exception e) {
+ log.error("更新物模型超级表失败: {}", e.getMessage(), e);
+ }
+ }
+
+ /**
+ * 获取表的字段信息
+ */
+ private List getTableFields(String tableName) {
+ List> tableDescription = tdEngineSuperTableService.describeSuperTable(new TdTableDO(getDatabaseName(), tableName));
+ if (CollUtil.isEmpty(tableDescription)) {
+ return Collections.emptyList();
+ }
+
+ return tableDescription.stream()
+ .filter(map -> !"TAG".equals(map.get("note")))
+ .filter(map -> !"time".equals(map.get("field")))
+ .map(map -> TdFieldDO.builder()
+ .fieldName((String) map.get("field"))
+ .dataType((String) map.get("type"))
+ .dataLength((Integer) map.get("length"))
+ .build())
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * 更新表的字段，包括新增、修改和删除字段
+ */
+ private void updateTableFields(String tableName, List oldFields, List newFields) {
+ String databaseName = getDatabaseName();
+
+ // 获取新增、修改、删除的字段
+ List addFields = getAddFields(oldFields, newFields);
+ List modifyFields = getModifyFields(oldFields, newFields);
+ List dropFields = getDropFields(oldFields, newFields);
+
+ // 添加新增字段
+ if (CollUtil.isNotEmpty(addFields)) {
+ tdEngineSuperTableService.addColumnsForSuperTable(TdTableDO.builder()
+ .dataBaseName(databaseName)
+ .superTableName(tableName)
+ .columns(addFields)
+ .build());
+ }
+ // 删除旧字段
+ if (CollUtil.isNotEmpty(dropFields)) {
+ tdEngineSuperTableService.dropColumnsForSuperTable(TdTableDO.builder()
+ .dataBaseName(databaseName)
+ .superTableName(tableName)
+ .columns(dropFields)
+ .build());
+ }
+ // 修改字段（先删除再添加）
+ if (CollUtil.isNotEmpty(modifyFields)) {
+ tdEngineSuperTableService.dropColumnsForSuperTable(TdTableDO.builder()
+ .dataBaseName(databaseName)
+ .superTableName(tableName)
+ .columns(modifyFields)
+ .build());
+ tdEngineSuperTableService.addColumnsForSuperTable(TdTableDO.builder()
+ .dataBaseName(databaseName)
+ .superTableName(tableName)
+ .columns(addFields)
+ .build());
+ }
+ }
+
+ /**
+ * 获取需要新增的字段
+ */
+ private List getAddFields(List oldFields, List newFields) {
+ Set oldFieldNames = oldFields.stream()
+ .map(TdFieldDO::getFieldName)
+ .collect(Collectors.toSet());
+ return newFields.stream()
+ .filter(f -> !oldFieldNames.contains(f.getFieldName()))
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * 获取需要修改的字段
+ */
+ private List getModifyFields(List oldFields, List newFields) {
+ Map oldFieldMap = oldFields.stream()
+ .collect(Collectors.toMap(TdFieldDO::getFieldName, f -> f));
+
+ return newFields.stream()
+ .filter(f -> {
+ TdFieldDO oldField = oldFieldMap.get(f.getFieldName());
+ return oldField != null && (
+ !oldField.getDataType().equals(f.getDataType()) ||
+ !Objects.equals(oldField.getDataLength(), f.getDataLength())
+ );
+ })
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * 获取需要删除的字段
+ */
+ private List getDropFields(List oldFields, List newFields) {
+ Set newFieldNames = newFields.stream()
+ .map(TdFieldDO::getFieldName)
+ .collect(Collectors.toSet());
+ return oldFields.stream()
+ .filter(f -> !"time".equals(f.getFieldName()))
+ .filter(f -> !newFieldNames.contains(f.getFieldName()))
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * 构建物模型
+ */
private ThingModelRespVO buildThingModel(IotProductDO product, List functionList) {
ThingModelRespVO thingModel = new ThingModelRespVO();
thingModel.setId(product.getId());
thingModel.setProductKey(product.getProductKey());
- ThingModelRespVO.Model model = new ThingModelRespVO.Model();
List properties = functionList.stream()
.filter(function -> IotProductFunctionTypeEnum.PROPERTY.equals(
IotProductFunctionTypeEnum.valueOfType(function.getType())))
.map(this::buildThingModelProperty)
.collect(Collectors.toList());
+ ThingModelRespVO.Model model = new ThingModelRespVO.Model();
model.setProperties(properties);
thingModel.setModel(model);
return thingModel;
}
+ /**
+ * 构建物模型属性
+ */
private ThingModelProperty buildThingModelProperty(IotThinkModelFunctionDO function) {
ThingModelProperty property = BeanUtil.copyProperties(function, ThingModelProperty.class);
property.setDataType(function.getProperty().getDataType());
return property;
}
+ /**
+ * 获取数据库名称
+ */
private String getDatabaseName() {
- return url.substring(url.lastIndexOf("/") + 1);
+ int index = url.lastIndexOf("/");
+ return index != -1 ? url.substring(index + 1) : url;
}
- static String getProductPropertySTableName(Integer deviceType, String productKey) {
- return switch (deviceType) {
- case 1 -> String.format("gateway_sub_%s", productKey).toLowerCase();
- case 2 -> String.format("gateway_%s", productKey).toLowerCase();
- default -> String.format("device_%s", productKey).toLowerCase();
+ /**
+ * 获取超级表名称
+ */
+ private String getSuperTableName(Integer deviceType, String productKey) {
+ String prefix = switch (deviceType) {
+ case 1 -> "gateway_sub_";
+ case 2 -> "gateway_";
+ default -> "device_";
};
+ return (prefix + productKey).toLowerCase();
}
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotTdEngineService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotTdEngineService.java
deleted file mode 100644
index 753284acae..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotTdEngineService.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TableDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdFieldDO;
-import cn.iocoder.yudao.module.iot.domain.SelectDto;
-import cn.iocoder.yudao.module.iot.domain.TagsSelectDao;
-import cn.iocoder.yudao.module.iot.domain.visual.SelectVisualDto;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * TdEngineService
- */
-public interface IotTdEngineService {
-
- /**
- * 创建数据库
- *
- * @param dataBaseName 数据库名称
- * @throws Exception 异常
- */
- void createDateBase(String dataBaseName) throws Exception;
-
- /**
- * 创建超级表
- *
- * @param schemaFields schema字段
- * @param tagsFields tags字段
- * @param superTableName 超级表名称
- */
- void createSuperTable(List schemaFields, List tagsFields, String dataBaseName, String superTableName);
-
- /**
- * 检查超级表是否存在
- */
- Integer checkSuperTableExists(String dataBaseName, String superTableName);
-
-
- /**
- * 获取超级表的结构信息
- */
- List> describeSuperTable(String dataBaseName, String superTableName);
-
- /**
- * 为超级表添加列
- *
- * @param dataBaseName 数据库名称
- * @param superTableName 超级表名称
- * @param fieldsVo 字段信息
- */
- void addColumnForSuperTable(String dataBaseName, String superTableName, List fieldsVo);
-
- /**
- * 为超级表删除列
- *
- * @param dataBaseName 数据库名称
- * @param superTableName 超级表名称
- * @param fieldsVo 字段信息
- */
- void dropColumnForSuperTable(String dataBaseName, String superTableName, List fieldsVo);
-
- /**
- * 为超级表添加tag
- */
- Long getCountByTimesTamp(SelectDto selectDto) throws Exception;
-
-
- /**
- * 创建表
- *
- * @param tableDto 表信息
- */
- void createTable(TableDO tableDto);
-
- /**
- * 插入数据
- *
- * @param tableDto 表信息
- */
- void insertData(TableDO tableDto);
-
- /**
- * 根据时间戳查询数据
- *
- * @param selectDto 查询条件
- * @return 数据
- * @throws Exception 异常
- */
- List> selectByTimesTamp(SelectDto selectDto) throws Exception;
-
- /**
- * 初始化超级表
- *
- * @param msg 消息
- * @throws Exception 异常
- */
- void initSTableFrame(String msg) throws Exception;
-
- /**
- * 获取最新数据
- *
- * @param selectDto 查询条件
- * @return 数据
- * @throws Exception 异常
- */
- Map getLastData(SelectDto selectDto) throws Exception;
-
- /**
- * 根据tag查询最新数据
- *
- * @param tagsSelectDao 查询条件
- * @return 数据
- */
- Map> getLastDataByTags(TagsSelectDao tagsSelectDao);
-
- /**
- * 获取历史数据
- *
- * @param selectVisualDto 查询条件
- * @return 数据
- */
- List> getHistoryData(SelectVisualDto selectVisualDto);
-
- /**
- * 获取实时数据
- *
- * @param selectVisualDto 查询条件
- * @return 数据
- */
- List> getRealtimeData(SelectVisualDto selectVisualDto);
-
- /**
- * 获取聚合数据
- *
- * @param selectVisualDto 查询条件
- * @return 数据
- */
- List> getAggregateData(SelectVisualDto selectVisualDto);
-
-
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotTdEngineServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotTdEngineServiceImpl.java
deleted file mode 100644
index c7f7e73093..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotTdEngineServiceImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TableDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdFieldDO;
-import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineMapper;
-import cn.iocoder.yudao.module.iot.domain.SelectDto;
-import cn.iocoder.yudao.module.iot.domain.TagsSelectDao;
-import cn.iocoder.yudao.module.iot.domain.visual.SelectVisualDto;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-@Slf4j
-public class IotTdEngineServiceImpl implements IotTdEngineService {
-
- @Resource
- private TdEngineMapper tdEngineMapper;
-
- @Override
- public void createDateBase(String dataBaseName) {
- tdEngineMapper.createDatabase(dataBaseName);
- }
-
- @Override
- public void createSuperTable(List schemaFields, List tagsFields, String dataBaseName, String superTableName) {
- tdEngineMapper.createSuperTable(schemaFields, tagsFields, dataBaseName, superTableName);
- }
-
- @Override
- public void createTable(TableDO tableDto) {
- tdEngineMapper.createTable(tableDto);
- }
-
- @Override
- public void insertData(TableDO tableDto) {
- tdEngineMapper.insertData(tableDto);
- }
-
- @Override
- public List> selectByTimesTamp(SelectDto selectDto) {
- return List.of();
- }
-
- @Override
- public void addColumnForSuperTable(String dataBaseName,String superTableName, List fields) {
- for (TdFieldDO field : fields) {
- tdEngineMapper.addColumnForSuperTable(dataBaseName,superTableName, field);
- }
- }
-
- @Override
- public void dropColumnForSuperTable(String dataBaseName,String superTableName, List fields) {
- for (TdFieldDO field : fields) {
- tdEngineMapper.dropColumnForSuperTable(dataBaseName,superTableName, field);
- }
- }
-
- @Override
- public Long getCountByTimesTamp(SelectDto selectDto) {
- return 0L;
- }
-
- @Override
- public void initSTableFrame(String msg) {
-
- }
-
- @Override
- public Map getLastData(SelectDto selectDto) {
- return Map.of();
- }
-
- @Override
- public Map> getLastDataByTags(TagsSelectDao tagsSelectDao) {
- return Map.of();
- }
-
- @Override
- public List> getHistoryData(SelectVisualDto selectVisualDto) {
- return List.of();
- }
-
- @Override
- public List> getRealtimeData(SelectVisualDto selectVisualDto) {
- return List.of();
- }
-
- @Override
- public List> getAggregateData(SelectVisualDto selectVisualDto) {
- return List.of();
- }
-
- @Override
- public Integer checkSuperTableExists(String dataBaseName, String superTableName) {
- List> results = tdEngineMapper.showSuperTables(dataBaseName, superTableName);
- return results == null || results.isEmpty() ? 0 : results.size();
- }
-
- @Override
- public List> describeSuperTable(String dataBaseName, String superTableName) {
- return tdEngineMapper.describeSuperTable(dataBaseName, superTableName);
- }
-}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageService.java
index b2f51a7f83..ffcb3063c5 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageService.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageService.java
@@ -11,8 +11,8 @@ public interface IotThingModelMessageService {
/**
* 保存物模型消息
*
- * @param device 设备
+ * @param device 设备
* @param thingModelMessage 物模型消息
*/
- void saveThingModelMessage(IotDeviceDO device,ThingModelMessage thingModelMessage);
+ void saveThingModelMessage(IotDeviceDO device, ThingModelMessage thingModelMessage);
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
index 9bad7613ed..69c4178398 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
@@ -6,8 +6,8 @@ import cn.iocoder.yudao.module.iot.controller.admin.device.vo.device.IotDeviceSt
import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDataDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.FieldParser;
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TableDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdFieldDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.ThingModelMessage;
import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodelfunction.IotThinkModelFunctionDO;
import cn.iocoder.yudao.module.iot.dal.redis.deviceData.DeviceDataRedisDAO;
@@ -23,6 +23,9 @@ import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
+/**
+ * 物模型消息 Service 实现类
+ */
@Slf4j
@Service
public class IotThingModelMessageServiceImpl implements IotThingModelMessageService {
@@ -35,7 +38,11 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
@Resource
private IotDeviceService iotDeviceService;
@Resource
- private IotTdEngineService iotTdEngineService;
+ private TdEngineTableService tdEngineTableService;
+ @Resource
+ private TdEngineSuperTableService tdEngineSuperTableService;
+ @Resource
+ private TdEngineDataWriterService tdEngineDataWriterService;
@Resource
private DeviceDataRedisDAO deviceDataRedisDAO;
@@ -90,14 +97,11 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
return;
}
- // 构建并保存设备属性
- TableDO tableData = new TableDO();
- tableData.setDataBaseName(getDatabaseName());
- tableData.setSuperTableName(getProductPropertySTableName(device.getDeviceType(), device.getProductKey()));
- tableData.setTableName(getDeviceTableName(device.getProductKey(), device.getDeviceName()));
- tableData.setSchemaFieldValues(schemaFieldValues);
-
- iotTdEngineService.insertData(tableData);
+ // 构建并保存设备属性数据
+ tdEngineDataWriterService.insertData(TdTableDO.builder().build()
+ .setDataBaseName(getDatabaseName())
+ .setTableName(getDeviceTableName(device.getProductKey(), device.getDeviceName()))
+ .setColumns(schemaFieldValues));
}
/**
@@ -135,7 +139,7 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
String superTableName = getProductPropertySTableName(deviceType, productKey);
String dataBaseName = getDatabaseName();
- List> maps = iotTdEngineService.describeSuperTable(dataBaseName, superTableName);
+ List> maps = tdEngineSuperTableService.describeSuperTable(new TdTableDO(dataBaseName, superTableName));
List tagsFieldValues = new ArrayList<>();
if (maps != null) {
@@ -159,13 +163,11 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
// 创建设备数据表
String tableName = getDeviceTableName(productKey, deviceName);
- TableDO tableDto = new TableDO();
- tableDto.setDataBaseName(dataBaseName);
- tableDto.setSuperTableName(superTableName);
- tableDto.setTableName(tableName);
- tableDto.setTagsFieldValues(tagsFieldValues);
-
- iotTdEngineService.createTable(tableDto);
+ tdEngineTableService.createTable(TdTableDO.builder().build()
+ .setDataBaseName(dataBaseName)
+ .setSuperTableName(superTableName)
+ .setTableName(tableName)
+ .setTags(tagsFieldValues));
}
/**
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterService.java
new file mode 100644
index 0000000000..0995b07977
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterService.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.iot.service.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
+
+/**
+ * TD 引擎的数据写入 Service 接口
+ */
+public interface TdEngineDataWriterService {
+
+ /**
+ * 插入数据 - 指定列插入数据
+ *
+ * @param table 数据
+ * dataBaseName 数据库名
+ * tableName 表名
+ * columns 列
+ */
+ void insertData(TdTableDO table);
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterServiceImpl.java
new file mode 100644
index 0000000000..f4dd2c8fd7
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterServiceImpl.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.iot.service.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
+import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDataWriterMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * TD 引擎的数据写入 Service 实现类
+ */
+@Service
+public class TdEngineDataWriterServiceImpl implements TdEngineDataWriterService {
+
+ @Resource
+ private TdEngineDataWriterMapper tdEngineDataWriterMapper;
+
+ @Override
+ public void insertData(TdTableDO table) {
+ tdEngineDataWriterMapper.insertData(table);
+ }
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseService.java
new file mode 100644
index 0000000000..d895262cca
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseService.java
@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.iot.service.tdengine;
+
+/**
+ * TD 引擎的数据库 Service 接口
+ */
+public interface TdEngineDatabaseService {
+
+ /**
+ * 创建数据库
+ *
+ * @param dataBaseName 数据库名称
+ */
+ void createDatabase(String dataBaseName);
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseServiceImpl.java
new file mode 100644
index 0000000000..c880db8a93
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseServiceImpl.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.iot.service.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDatabaseMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * TD 引擎的数据库 Service 实现类
+ */
+@Service
+@Slf4j
+public class TdEngineDatabaseServiceImpl implements TdEngineDatabaseService {
+
+ @Resource
+ private TdEngineDatabaseMapper tdEngineDatabaseMapper;
+
+ @Override
+ public void createDatabase(String dataBaseName) {
+ tdEngineDatabaseMapper.createDatabase(dataBaseName);
+ }
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryService.java
new file mode 100644
index 0000000000..8d07b43344
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryService.java
@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.iot.service.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TD 引擎的查询 Service 接口
+ */
+public interface TdEngineQueryService {
+
+ /**
+ * 获取历史数据
+ *
+ * @param selectVisualDO 查询条件
+ * @return 历史数据列表
+ */
+ List> getHistoryData(SelectVisualDO selectVisualDO);
+
+ /**
+ * 获取历史数据条数
+ *
+ * @param selectVisualDO 查询条件
+ * @return 数据条数
+ */
+ Long getHistoryCount(SelectVisualDO selectVisualDO);
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryServiceImpl.java
new file mode 100644
index 0000000000..672a58640a
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryServiceImpl.java
@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.iot.service.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO;
+import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineQueryMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class TdEngineQueryServiceImpl implements TdEngineQueryService {
+
+ @Resource
+ private TdEngineQueryMapper tdEngineQueryMapper;
+
+ @Override
+ public List> getHistoryData(SelectVisualDO selectVisualDO) {
+ return tdEngineQueryMapper.getHistoryData(selectVisualDO);
+ }
+
+ @Override
+ public Long getHistoryCount(SelectVisualDO selectVisualDO) {
+ return tdEngineQueryMapper.getHistoryCount(selectVisualDO);
+ }
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableService.java
new file mode 100644
index 0000000000..df6290a983
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableService.java
@@ -0,0 +1,123 @@
+package cn.iocoder.yudao.module.iot.service.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TD 引擎的超级表 Service 接口
+ */
+public interface TdEngineSuperTableService {
+
+ /**
+ * 创建超级表
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * columns 列信息
+ * tags 标签信息
+ */
+ void createSuperTable(TdTableDO superTable);
+
+ /**
+ * 查看超级表 - 显示当前数据库下的所有超级表信息
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ */
+
+ List> showSuperTables(TdTableDO superTable);
+
+ /**
+ * 查看超级表 - 获取超级表的结构信息
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ */
+ List> describeSuperTable(TdTableDO superTable);
+
+ /**
+ * 修改超级表 - 增加列
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * column 列信息
+ */
+ void addColumnForSuperTable(TdTableDO superTable);
+
+ /**
+ * 修改超级表 - 删除列
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * column 列信息
+ */
+ void dropColumnForSuperTable(TdTableDO superTable);
+
+ /**
+ * 修改超级表 - 修改列宽
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * column 列信息
+ */
+ void modifyColumnWidthForSuperTable(TdTableDO superTable);
+
+
+ /**
+ * 修改超级表 - 为超级表添加标签
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * tag 标签信息
+ */
+ void addTagForSuperTable(TdTableDO superTable);
+
+ /**
+ * 修改超级表 - 为超级表删除标签
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * tag 标签信息
+ */
+ void dropTagForSuperTable(TdTableDO superTable);
+
+ /**
+ * 检查超级表是否存在
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * @return 超级表数量
+ */
+ Integer checkSuperTableExists(TdTableDO superTable);
+
+ /**
+ * 为超级表添加列
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * columns 列信息
+ */
+ void addColumnsForSuperTable(TdTableDO superTable);
+
+ /**
+ * 为超级表删除列
+ *
+ * @param superTable 超级表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * columns 列信息
+ */
+ void dropColumnsForSuperTable(TdTableDO superTable);
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableServiceImpl.java
new file mode 100644
index 0000000000..60436e7bd1
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableServiceImpl.java
@@ -0,0 +1,90 @@
+package cn.iocoder.yudao.module.iot.service.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdFieldDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
+import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineSuperTableMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TD 引擎的超级表 Service 实现类
+ */
+@Slf4j
+@Service
+public class TdEngineSuperTableServiceImpl implements TdEngineSuperTableService {
+
+ @Resource
+ private TdEngineSuperTableMapper tdEngineSuperTableMapper;
+
+ @Override
+ public void createSuperTable(TdTableDO superTable) {
+ tdEngineSuperTableMapper.createSuperTable(superTable);
+ }
+
+ @Override
+ public List> showSuperTables(TdTableDO superTable) {
+ return tdEngineSuperTableMapper.showSuperTables(superTable);
+ }
+
+ @Override
+ public List> describeSuperTable(TdTableDO superTable) {
+ return tdEngineSuperTableMapper.describeSuperTable(superTable);
+ }
+
+ @Override
+ public void addColumnForSuperTable(TdTableDO superTable) {
+ tdEngineSuperTableMapper.addColumnForSuperTable(superTable);
+ }
+
+ @Override
+ public void dropColumnForSuperTable(TdTableDO superTable) {
+ tdEngineSuperTableMapper.dropColumnForSuperTable(superTable);
+ }
+
+ @Override
+ public void modifyColumnWidthForSuperTable(TdTableDO superTable) {
+ tdEngineSuperTableMapper.modifyColumnWidthForSuperTable(superTable);
+ }
+
+ @Override
+ public void addTagForSuperTable(TdTableDO superTable) {
+ tdEngineSuperTableMapper.addTagForSuperTable(superTable);
+ }
+
+ @Override
+ public void dropTagForSuperTable(TdTableDO superTable) {
+ tdEngineSuperTableMapper.dropTagForSuperTable(superTable);
+ }
+
+ @Override
+ public Integer checkSuperTableExists(TdTableDO superTable) {
+ List> results = tdEngineSuperTableMapper.showSuperTables(superTable);
+ return results == null || results.isEmpty() ? 0 : results.size();
+ }
+
+ @Override
+ public void addColumnsForSuperTable(TdTableDO superTable) {
+ for (TdFieldDO column : superTable.getColumns()) {
+ tdEngineSuperTableMapper.addColumnForSuperTable(TdTableDO.builder()
+ .dataBaseName(superTable.getDataBaseName())
+ .superTableName(superTable.getSuperTableName())
+ .column(column)
+ .build());
+ }
+ }
+
+ @Override
+ public void dropColumnsForSuperTable(TdTableDO superTable) {
+ for (TdFieldDO column : superTable.getColumns()) {
+ tdEngineSuperTableMapper.dropColumnForSuperTable(TdTableDO.builder()
+ .dataBaseName(superTable.getDataBaseName())
+ .superTableName(superTable.getSuperTableName())
+ .column(column)
+ .build());
+ }
+ }
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableService.java
new file mode 100644
index 0000000000..0781597848
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableService.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.iot.service.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
+
+/**
+ * TD 引擎的表 Service 接口
+ */
+public interface TdEngineTableService {
+
+ /**
+ * 创建表 - 创建超级表的子表
+ *
+ * @param table 表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * tableName 子表名称
+ * tags TAG 字段
+ */
+ void createTable(TdTableDO table);
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableServiceImpl.java
new file mode 100644
index 0000000000..cdca47888a
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableServiceImpl.java
@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.iot.service.tdengine;
+
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
+import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineTableMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * TD 引擎的表 Service 实现类
+ */
+@Slf4j
+@Service
+public class TdEngineTableServiceImpl implements TdEngineTableService {
+
+ @Resource
+ private TdEngineTableMapper tdEngineTableMapper;
+
+ @Override
+ public void createTable(TdTableDO table) {
+ tdEngineTableMapper.createTable(table);
+ }
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionService.java
index a6bf7b4583..f60610faff 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionService.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionService.java
@@ -75,5 +75,5 @@ public interface IotThinkModelFunctionService {
* @param productKey 产品 Key
* @return 产品物模型列表
*/
- List getThinkModelFunctionListByProductKey(String productKey);
+ List getThinkModelFunctionListByProductKey(String productKey);
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionServiceImpl.java
index 25cfe7b462..404a2aaa05 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/thinkmodelfunction/IotThinkModelFunctionServiceImpl.java
@@ -22,7 +22,7 @@ import cn.iocoder.yudao.module.iot.enums.product.IotAccessModeEnum;
import cn.iocoder.yudao.module.iot.enums.product.IotProductFunctionTypeEnum;
import cn.iocoder.yudao.module.iot.enums.product.IotProductStatusEnum;
import cn.iocoder.yudao.module.iot.service.product.IotProductService;
-import cn.iocoder.yudao.module.iot.service.tdengine.IotDbStructureDataService;
+import cn.iocoder.yudao.module.iot.service.tdengine.IotSuperTableService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -52,7 +52,7 @@ public class IotThinkModelFunctionServiceImpl implements IotThinkModelFunctionSe
@Resource
private IotProductService productService;
@Resource
- private IotDbStructureDataService dbStructureDataService;
+ private IotSuperTableService dbStructureDataService;
@Override
@Transactional(rollbackFor = Exception.class)
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml
new file mode 100644
index 0000000000..b5f0446149
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+ INSERT INTO ${dataBaseName}.${tableName}
+
+ ${item.fieldName}
+
+ VALUES
+
+ #{item.fieldValue}
+
+
+
+
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml
new file mode 100644
index 0000000000..4d9a125db6
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+ CREATE DATABASE IF NOT EXISTS ${dataBaseName}
+
+
+
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineMapper.xml
deleted file mode 100644
index 4e127e44b1..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineMapper.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-
-
-
-
-
-
-
- CREATE DATABASE IF NOT EXISTS ${dataBaseName}
-
-
-
- CREATE STABLE IF NOT EXISTS ${dataBaseName}.${superTableName}
-
-
- ${item.fieldName}
-
-
-
-
- TIMESTAMP
-
-
- TINYINT
-
-
- SMALLINT
-
-
- INT
-
-
- BIGINT
-
-
- FLOAT
-
-
- DOUBLE
-
-
- BINARY
-
-
- NCHAR
-
-
- BOOL
-
-
- JSON
-
-
-
-
- (
- ${item.dataLength}
- )
-
-
- TAGS
-
-
-
- ${item.fieldName}
-
-
-
-
- TIMESTAMP
-
-
- TINYINT
-
-
- SMALLINT
-
-
- INT
-
-
- BIGINT
-
-
- FLOAT
-
-
- DOUBLE
-
-
- BINARY
-
-
- NCHAR
-
-
- BOOL
-
-
- JSON
-
-
-
-
- (
- ${item.dataLength}
- )
-
-
-
-
-
-
- CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
- USING ${dataBaseName}.${superTableName}
-
- ${item.fieldName}
-
- TAGS
-
- #{item.fieldValue}
-
-
-
-
-
- INSERT INTO ${dataBaseName}.${tableName}
-
- ${item.fieldName}
-
- VALUES
-
- #{item.fieldValue}
-
-
-
-
-
-
- ALTER STABLE ${dataBaseName}.${superTableName} ADD COLUMN
-
- #{field.fieldName}
-
-
-
-
- TIMESTAMP
-
-
- TINYINT
-
-
- SMALLINT
-
-
- INT
-
-
- BIGINT
-
-
- FLOAT
-
-
- DOUBLE
-
-
- BINARY
-
-
- NCHAR
-
-
- BOOL
-
-
- JSON
-
-
-
-
- (
- #{field.dataLength}
- )
-
-
-
-
- ALTER STABLE ${dataBaseName}.${superTableName} DROP COLUMN
-
- #{field.fieldName}
-
-
-
-
- ALTER
- STABLE
- #{superTableName}
- ADD
- TAG
-
- #{fieldDO.fieldName}
-
-
-
-
- timestamp
-
-
- tinyint
-
-
- smallint
-
-
- int
-
-
- bigint
-
-
- float
-
-
- double
-
-
- binary
-
-
- nchar
-
-
- bool
-
-
- json
-
-
-
-
- (
- #{fieldDO.dataLength}
- )
-
-
-
-
- ALTER
- STABLE
- #{superTableName}
- DROP
- TAG
-
- #{fieldsVo.fieldName}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineQueryMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineQueryMapper.xml
new file mode 100644
index 0000000000..9407b371d9
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineQueryMapper.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineSuperTableMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineSuperTableMapper.xml
new file mode 100644
index 0000000000..1ddbe3b977
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineSuperTableMapper.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+ CREATE STABLE IF NOT EXISTS ${dataBaseName}.${superTableName}
+
+ ${item.fieldName} ${item.dataType}
+
+ (${item.dataLength})
+
+
+ TAGS
+
+ ${item.fieldName} ${item.dataType}
+
+ (${item.dataLength})
+
+
+
+
+
+
+
+
+
+
+
+
+ ALTER STABLE ${dataBaseName}.${superTableName} ADD COLUMN ${column.fieldName} ${column.dataType}
+
+ (${column.dataLength})
+
+
+
+
+
+ ALTER STABLE ${dataBaseName}.${superTableName} DROP COLUMN ${column.fieldName}
+
+
+
+
+ ALTER STABLE ${dataBaseName}.${superTableName} MODIFY COLUMN ${column.fieldName} ${column.dataType}
+
+ (${column.dataLength})
+
+
+
+
+
+ ALTER STABLE ${dataBaseName}.${superTableName} ADD TAG ${tag.fieldName} ${tag.dataType}
+
+ (${tag.dataLength})
+
+
+
+
+
+ ALTER STABLE ${dataBaseName}.${superTableName} DROP TAG ${tag.fieldName}
+
+
+
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml
new file mode 100644
index 0000000000..2d469a3905
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+ CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
+ USING ${dataBaseName}.${superTableName}
+ TAGS
+
+ #{item.fieldValue}
+
+
+
+
+
+ CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
+ USING ${dataBaseName}.${superTableName}
+
+ #{item.fieldName}
+
+ TAGS
+
+ #{item.fieldValue}
+
+
+
+
\ No newline at end of file
From 9b30d5d35572dc54646b2c3f3ad2fe04368fcd5d Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Sat, 9 Nov 2024 13:39:51 +0800
Subject: [PATCH 011/309] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84?=
=?UTF-8?q?=E5=AE=A1=E3=80=91IoT=EF=BC=9Atdengine=20=E5=B0=81=E8=A3=85?=
=?UTF-8?q?=E7=9A=84=20review?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/device/IotDeviceDataController.java | 2 ++
.../vo/deviceData/IotDeviceDataReqVO.java | 1 +
.../dataobject/device/IotDeviceDataDO.java | 1 +
.../iot/dal/dataobject/tdengine/SelectDO.java | 4 ++++
.../dataobject/tdengine/SelectVisualDO.java | 1 +
.../dal/dataobject/tdengine/TableManager.java | 1 +
.../dal/dataobject/tdengine/TdRestApi.java | 1 +
.../dal/dataobject/tdengine/TdTableDO.java | 1 +
.../iot/dal/mysql/device/IotDeviceMapper.java | 1 +
.../IotThinkModelFunctionMapper.java | 5 +++--
.../dal/tdengine/TdEngineDatabaseMapper.java | 1 +
.../iot/dal/tdengine/TdEngineQueryMapper.java | 1 +
.../iot/emq/service/EmqxServiceImpl.java | 2 ++
.../device/IotDeviceDataServiceImpl.java | 1 +
.../service/device/IotDeviceServiceImpl.java | 21 +++++++++----------
.../IotThingModelMessageServiceImpl.java | 13 +++++++++++-
.../tdengine/TdEngineDataWriterMapper.xml | 1 -
.../tdengine/TdEngineDatabaseMapper.xml | 1 -
.../mapper/tdengine/TdEngineQueryMapper.xml | 1 -
.../tdengine/TdEngineSuperTableMapper.xml | 1 -
.../mapper/tdengine/TdEngineTableMapper.xml | 1 -
21 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java
index e710d0ea8f..ac2ec5cf78 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java
@@ -31,6 +31,7 @@ public class IotDeviceDataController {
@Resource
private IotDeviceDataService deviceDataService;
+ // TODO @haohao：是不是叫 get-latest 就好了。因为 data 已经在 url 里了哈
@GetMapping("/latest-data")
@Operation(summary = "获取设备属性最新数据")
public CommonResult> getDevicePropertiesLatestData(@Valid IotDeviceDataReqVO deviceDataReqVO) {
@@ -38,6 +39,7 @@ public class IotDeviceDataController {
return success(BeanUtils.toBean(list, IotDeviceDataRespVO.class));
}
+ // TODO @haohao：是不是叫 /history-data => page
@GetMapping("/history-data")
@Operation(summary = "获取设备属性历史数据")
public CommonResult> getDevicePropertiesHistoryData(@Valid IotDeviceDataReqVO deviceDataReqVO) {
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataReqVO.java
index 5f87a1cb82..21e53aff81 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataReqVO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataReqVO.java
@@ -10,6 +10,7 @@ import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+// TODO @haohao：IotDeviceDataPageReqVO
@Schema(description = "管理后台 - IoT 设备数据 Request VO")
@Data
public class IotDeviceDataReqVO extends PageParam {
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDataDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDataDO.java
index 5d80511721..68370d7312 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDataDO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDataDO.java
@@ -23,6 +23,7 @@ import java.time.LocalDateTime;
@AllArgsConstructor
public class IotDeviceDataDO {
+ // TODO @haohao：每个字段的关联关系，可以 @ 下哈。
/**
* 设备编号
*/
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectDO.java
index 503b26310e..652c3aee6c 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectDO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectDO.java
@@ -3,12 +3,15 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine;
import lombok.Data;
import java.util.Set;
+
+// TODO @haohao：类似这个，其实可以参考 mybatis plus，querywrapper，搞个 TdEngineQueryWrapper。这样看起来会更好懂。
/**
* 查询DO
*/
@Data
public class SelectDO {
+ // TODO @haoha：database 是个单词
/**
* 数据库名称
*/
@@ -39,6 +42,7 @@ public class SelectDO {
*/
private String type;
+ // TODO @haohao：这个字段，是啥哈？
/**
* 查询条件
*/
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectVisualDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectVisualDO.java
index d5faf45a9c..d4c35d66df 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectVisualDO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectVisualDO.java
@@ -4,6 +4,7 @@ import lombok.Data;
import java.util.Map;
+// TODO @haohao：类似 SelectDO 的想法，只是它是返回。ps：貌似可以在 tdengine 里面，创建一个 query 包，放这种比较特殊的查询和结果对象。dataobject 更多还是实际存储的结构化的 do
@Data
public class SelectVisualDO {
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableManager.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableManager.java
index 65663d8053..e11db58e7d 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableManager.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableManager.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine;
import java.util.List;
+// TODO @haohao：这个还有用哇？
/**
* TableManager 类用于管理 TDengine 表的创建、删除和结构信息获取
*/
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TdRestApi.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TdRestApi.java
index 6653ece40e..b2d1ac0292 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TdRestApi.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TdRestApi.java
@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+// TODO @haohao：有部分非实体的部分，是不是可以搞到 iot 的 framework 包下，搞个 tdengine 包，作为框架级的封装，放在 dataobject，感觉不是很合理哈。【可以微信讨论下】
/**
* TdRestApi 类用于处理 TDengine 的 REST API 请求
*/
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TdTableDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TdTableDO.java
index 314c51de3c..3b30352e4c 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TdTableDO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TdTableDO.java
@@ -21,6 +21,7 @@ public class TdTableDO {
*/
private String dataBaseName;
+ // TODO @haohao：superTableName 和 tableName 是不是合并。因为每个 mapper 操作的时候，有且只会使用到其中一个。
/**
* 超级表名称
*/
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
index 3129f400c2..4d8315eb3c 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/IotDeviceMapper.java
@@ -15,6 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface IotDeviceMapper extends BaseMapperX {
+ // TODO @haohao：可能多余的查询条件，要去掉哈
default PageResult selectPage(IotDevicePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX()
.eqIfPresent(IotDeviceDO::getDeviceKey, reqVO.getDeviceKey())
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/thinkmodelfunction/IotThinkModelFunctionMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/thinkmodelfunction/IotThinkModelFunctionMapper.java
index 2883abe4e3..c8745aab69 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/thinkmodelfunction/IotThinkModelFunctionMapper.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/thinkmodelfunction/IotThinkModelFunctionMapper.java
@@ -43,7 +43,7 @@ public interface IotThinkModelFunctionMapper extends BaseMapperX selectListByProductIdAndIdentifiersAndTypes(Long productId,
List identifiers,
- List types){
+ List types) {
return selectList(new LambdaQueryWrapperX()
.eq(IotThinkModelFunctionDO::getProductId, productId)
.in(IotThinkModelFunctionDO::getIdentifier, identifiers)
@@ -55,7 +55,8 @@ public interface IotThinkModelFunctionMapper extends BaseMapperX selectListByProductKey(String productKey){
+ default List selectListByProductKey(String productKey) {
return selectList(IotThinkModelFunctionDO::getProductKey, productKey);
}
+
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDatabaseMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDatabaseMapper.java
index bc562ccca7..cd3eaa8b93 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDatabaseMapper.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDatabaseMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+// TODO @haohao：InterceptorIgnore 忽略租户，可以在每个方法上，添加 @TenantIgnore 哈。
/**
* TD 引擎的数据库 Mapper
*/
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java
index e5353f7ee9..a2408e3355 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java
@@ -25,6 +25,7 @@ public interface TdEngineQueryMapper {
*/
List> selectByTimestamp(SelectDO selectDO);
+ // TODO @haohao：最好方法的命名，和数据库操作的保持一直。get => select。然后 selectList or selectOne
/**
* 根据时间戳获取数据条数
*
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/service/EmqxServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/service/EmqxServiceImpl.java
index f338d62498..343f9ba21c 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/service/EmqxServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/emq/service/EmqxServiceImpl.java
@@ -31,6 +31,7 @@ public class EmqxServiceImpl implements EmqxService {
// 根据不同的主题，处理不同的业务逻辑
if (topic.contains("/property/post")) {
// 设备上报数据 topic /sys/f13f57c63e9/dianbiao1/thing/event/property/post
+ // TODO @hao：这块未来可能，搞个 IotTopicUrls 之类？把拼接和解析的逻辑，收敛
String productKey = topic.split("/")[2];
String deviceName = topic.split("/")[3];
String message = new String(mqttMessage.getPayload());
@@ -48,4 +49,5 @@ public class EmqxServiceImpl implements EmqxService {
log.error("订阅默认主题失败", e);
}
}
+
}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
index 4179075dfb..8f68989c94 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
@@ -133,4 +133,5 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
private static String getDeviceTableName(String productKey, String deviceName) {
return String.format("device_%s_%s", productKey.toLowerCase(), deviceName.toLowerCase());
}
+
}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
index 60743f6713..0ec737a30e 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
@@ -213,31 +213,30 @@ public class IotDeviceServiceImpl implements IotDeviceService {
@Override
public void updateDeviceStatus(IotDeviceStatusUpdateReqVO updateReqVO) {
- // 校验存在
+ // 1. 校验存在
+ // TODO @haohao：这里的 iotDeviceDO => device。一个是去掉 iot，一个是去掉 DO 后缀。这样，简洁一点。
IotDeviceDO iotDeviceDO = validateDeviceExists(updateReqVO.getId());
- // 更新状态和更新时间
+ // 2.1 更新状态和更新时间
IotDeviceDO updateObj = BeanUtils.toBean(updateReqVO, IotDeviceDO.class);
-
- // 以前是未激活，现在是上线，设置设备激活时间
+ // TODO @haohao：下面几个状态的处理，可以考虑 if else if。这样，看起来会有层次感哈
+ // 2.2.1 以前是未激活，现在是上线，设置设备激活时间
+ // TODO @haohao：这里可以使用 ObjectUtils.equalsAny 类似这种哈。
if (Objects.equals(iotDeviceDO.getStatus(), IotDeviceStatusEnum.INACTIVE.getStatus())
&& Objects.equals(updateObj.getStatus(), IotDeviceStatusEnum.ONLINE.getStatus())) {
updateObj.setActiveTime(LocalDateTime.now());
}
-
- // 如果是上线，设置上线时间
+ // 2.2.2 如果是上线，设置上线时间
if (Objects.equals(updateObj.getStatus(), IotDeviceStatusEnum.ONLINE.getStatus())) {
updateObj.setLastOnlineTime(LocalDateTime.now());
}
-
- // 如果是离线，设置离线时间
+ // 2.2.3 如果是离线，设置离线时间
if (Objects.equals(updateObj.getStatus(), IotDeviceStatusEnum.OFFLINE.getStatus())) {
updateObj.setLastOfflineTime(LocalDateTime.now());
}
-
- // 设置状态更新时间
+ // 2.3 设置状态更新时间
updateObj.setStatusLastUpdateTime(LocalDateTime.now());
-
+ // 2.4 更新到数据库
deviceMapper.updateById(updateObj);
}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
index 69c4178398..280b32d9a4 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
@@ -47,6 +47,7 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
@Resource
private DeviceDataRedisDAO deviceDataRedisDAO;
+ // TODO @haohao：这个方法，可以考虑加下 1. 2. 3. 更有层次感
@Override
@TenantIgnore
public void saveThingModelMessage(IotDeviceDO device, ThingModelMessage thingModelMessage) {
@@ -55,12 +56,14 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
// 创建设备数据表
createDeviceTable(device.getDeviceType(), device.getProductKey(), device.getDeviceName(), device.getDeviceKey());
// 更新设备状态
+ // TODO @haohao：下面可以考虑，链式调用。iotDeviceService.updateDeviceStatus(new IotDeviceStatusUpdateReqVO().setid().setstatus())
IotDeviceStatusUpdateReqVO updateReqVO = new IotDeviceStatusUpdateReqVO();
updateReqVO.setId(device.getId());
updateReqVO.setStatus(IotDeviceStatusEnum.ONLINE.getStatus());
iotDeviceService.updateDeviceStatus(updateReqVO);
}
+ // TODO @haohao：这个变量，可以和 “过滤并收集有效的属性字段” 那块，因为关联度高一点。
// 获取设备属性
Map params = thingModelMessage.dataToMap();
@@ -70,12 +73,12 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
.stream()
.filter(function -> IotProductFunctionTypeEnum.PROPERTY.getType().equals(function.getType()))
.toList();
-
if (functionList.isEmpty()) {
return;
}
// 获取属性标识符集合
+ // TODO @haohao：这个变量，可以和 “过滤并收集有效的属性字段” 那块，因为关联度高一点。另外，可以使用 CollectionUtils。convertSet
Set propertyIdentifiers = functionList.stream()
.map(IotThinkModelFunctionDO::getIdentifier)
.collect(Collectors.toSet());
@@ -90,9 +93,11 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
if (propertyIdentifiers.contains(key)) {
schemaFieldValues.add(new TdFieldDO(key.toLowerCase(), val));
// 缓存设备属性
+ // TODO @haohao：这个缓存的写入，可以使用的时候 cache 么？被动读
setDeviceDataCache(device, functionMap.get(key), val, thingModelMessage.getTime());
}
});
+ // TODO @haohao：疑问，为什么 1 不继续哈？
if (schemaFieldValues.size() == 1) {
return;
}
@@ -127,6 +132,7 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
deviceDataRedisDAO.set(deviceData);
}
+ // TODO @haohao：实现没问题哈。这个方法的空行有点多，逻辑分块上没这么明显。看看能不能改下。
/**
* 创建设备数据表
*
@@ -143,6 +149,8 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
List tagsFieldValues = new ArrayList<>();
if (maps != null) {
+ // TODO @haohao：一些字符串，是不是可以枚举起来哈。
+ // TODO @haohao：这种过滤的，常用的，可以考虑用 CollectionUtils.filterList。一些常用的 stream 操作，适合封装哈
List> taggedNotesList = maps.stream()
.filter(map -> "TAG".equals(map.get("note")))
.toList();
@@ -176,6 +184,7 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
* @return 数据库名称
*/
private String getDatabaseName() {
+ // TODO @haohao：可以使用 StrUtil.subAftetLast 这种方法
return url.substring(url.lastIndexOf("/") + 1);
}
@@ -187,6 +196,7 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
* @return 产品属性表名
*/
private static String getProductPropertySTableName(Integer deviceType, String productKey) {
+ // TODO @haohao：枚举下，会好点哈。
return switch (deviceType) {
case 1 -> String.format("gateway_sub_%s", productKey).toLowerCase();
case 2 -> String.format("gateway_%s", productKey).toLowerCase();
@@ -204,4 +214,5 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
private static String getDeviceTableName(String productKey, String deviceName) {
return String.format("device_%s_%s", productKey.toLowerCase(), deviceName.toLowerCase());
}
+
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml
index b5f0446149..dd38cd08ec 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml
@@ -2,7 +2,6 @@
-
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml
index 4d9a125db6..919c301f73 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml
@@ -2,7 +2,6 @@
-
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineQueryMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineQueryMapper.xml
index 9407b371d9..f4361bc67f 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineQueryMapper.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineQueryMapper.xml
@@ -2,7 +2,6 @@
-
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineSuperTableMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineSuperTableMapper.xml
index 1ddbe3b977..37cf719101 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineSuperTableMapper.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineSuperTableMapper.xml
@@ -2,7 +2,6 @@
-
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml
index 2d469a3905..867ef8f437 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml
@@ -2,7 +2,6 @@
-
From 89fb71e8573d1f6552d70a699e3a8b1ec8612f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E6=B5=A9=E6=B5=A9?= <1036606149@qq.com>
Date: Sat, 9 Nov 2024 23:44:05 +0800
Subject: [PATCH 012/309] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E3=80=91=20=E4=BC=98=E5=8C=96=20tdengine=20=E6=93=8D?=
=?UTF-8?q?=E4=BD=9C=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../yudao/module/iot/enums/IotConstants.java | 38 +++++
.../admin/device/IotDeviceDataController.java | 16 +-
...ReqVO.java => IotDeviceDataPageReqVO.java} | 3 +-
.../vo/deviceData/IotDeviceDataRespVO.java | 3 -
.../dataobject/device/IotDeviceDataDO.java | 20 ++-
.../iot/dal/dataobject/tdengine/SelectDO.java | 6 -
.../dataobject/tdengine/SelectVisualDO.java | 3 +
.../dal/dataobject/tdengine/TableManager.java | 159 ------------------
...ableMapper.java => TdEngineDDLMapper.java} | 60 +++++--
.../iot/dal/tdengine/TdEngineDMLMapper.java | 103 ++++++++++++
.../tdengine/TdEngineDataWriterMapper.java | 25 ---
.../dal/tdengine/TdEngineDatabaseMapper.java | 24 ---
.../iot/dal/tdengine/TdEngineQueryMapper.java | 86 ----------
.../iot/dal/tdengine/TdEngineTableMapper.java | 41 -----
.../service/device/IotDeviceDataService.java | 6 +-
.../device/IotDeviceDataServiceImpl.java | 22 +--
.../service/device/IotDeviceServiceImpl.java | 45 ++---
.../tdengine/IotSuperTableService.java | 2 +-
.../tdengine/IotSuperTableServiceImpl.java | 59 ++++---
.../IotThingModelMessageServiceImpl.java | 130 +++++++-------
.../tdengine/TdEngineDataWriterService.java | 19 ---
.../TdEngineDataWriterServiceImpl.java | 21 ---
.../tdengine/TdEngineDatabaseService.java | 14 --
.../tdengine/TdEngineDatabaseServiceImpl.java | 22 ---
.../tdengine/TdEngineQueryService.java | 28 ---
.../tdengine/TdEngineQueryServiceImpl.java | 26 ---
.../tdengine/TdEngineSuperTableService.java | 123 --------------
.../TdEngineSuperTableServiceImpl.java | 90 ----------
.../tdengine/TdEngineTableService.java | 21 ---
.../tdengine/TdEngineTableServiceImpl.java | 23 ---
...rTableMapper.xml => TdEngineDDLMapper.xml} | 34 +++-
...eQueryMapper.xml => TdEngineDMLMapper.xml} | 32 +++-
.../tdengine/TdEngineDataWriterMapper.xml | 21 ---
.../tdengine/TdEngineDatabaseMapper.xml | 12 --
.../mapper/tdengine/TdEngineTableMapper.xml | 32 ----
35 files changed, 416 insertions(+), 953 deletions(-)
create mode 100644 yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/IotConstants.java
rename yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/{IotDeviceDataReqVO.java => IotDeviceDataPageReqVO.java} (92%)
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableManager.java
rename yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/{TdEngineSuperTableMapper.java => TdEngineDDLMapper.java} (68%)
create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDMLMapper.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDataWriterMapper.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDatabaseMapper.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineTableMapper.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterService.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterServiceImpl.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseService.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseServiceImpl.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryService.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryServiceImpl.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableService.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableServiceImpl.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableService.java
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableServiceImpl.java
rename yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/{TdEngineSuperTableMapper.xml => TdEngineDDLMapper.xml} (70%)
rename yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/{TdEngineQueryMapper.xml => TdEngineDMLMapper.xml} (68%)
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml
diff --git a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/IotConstants.java b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/IotConstants.java
new file mode 100644
index 0000000000..5927f44b96
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/IotConstants.java
@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.iot.enums;
+
+/**
+ * Iot 常量
+ *
+ * @author 芋道源码
+ */
+public interface IotConstants {
+
+ /**
+ * 获取设备表名
+ *
+ * 格式为 device_{productKey}_{deviceName}
+ */
+ String DEVICE_TABLE_NAME_FORMAT = "device_%s_%s";
+
+ /**
+ * 获取产品属性超级表名 - 网关子设备
+ *
+ * 格式为 gateway_sub_{productKey}
+ */
+ String GATEWAY_SUB_STABLE_NAME_FORMAT = "gateway_sub_%s";
+
+ /**
+ * 获取产品属性超级表名 - 网关
+ *
+ * 格式为 gateway_{productKey}
+ */
+ String GATEWAY_STABLE_NAME_FORMAT = "gateway_%s";
+
+ /**
+ * 获取产品属性超级表名 - 设备
+ *
+ * 格式为 device_{productKey}
+ */
+ String DEVICE_STABLE_NAME_FORMAT = "device_%s";
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java
index ac2ec5cf78..72fdda8c83 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.iot.controller.admin.device;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData.IotDeviceDataReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData.IotDeviceDataPageReqVO;
import cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData.IotDeviceDataRespVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDataDO;
import cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData.IotTimeDataRespVO;
@@ -31,19 +31,17 @@ public class IotDeviceDataController {
@Resource
private IotDeviceDataService deviceDataService;
- // TODO @haohao：是不是叫 get-latest 就好了。因为 data 已经在 url 里了哈
- @GetMapping("/latest-data")
+ @GetMapping("/latest")
@Operation(summary = "获取设备属性最新数据")
- public CommonResult> getDevicePropertiesLatestData(@Valid IotDeviceDataReqVO deviceDataReqVO) {
- List list = deviceDataService.getDevicePropertiesLatestData(deviceDataReqVO);
+ public CommonResult> getLatestDeviceProperties(@Valid IotDeviceDataPageReqVO deviceDataReqVO) {
+ List list = deviceDataService.getLatestDeviceProperties(deviceDataReqVO);
return success(BeanUtils.toBean(list, IotDeviceDataRespVO.class));
}
- // TODO @haohao：是不是叫 /history-data => page
- @GetMapping("/history-data")
+ @GetMapping("/history")
@Operation(summary = "获取设备属性历史数据")
- public CommonResult> getDevicePropertiesHistoryData(@Valid IotDeviceDataReqVO deviceDataReqVO) {
- PageResult> list = deviceDataService.getDevicePropertiesHistoryData(deviceDataReqVO);
+ public CommonResult> getHistoryDeviceProperties(@Valid IotDeviceDataPageReqVO deviceDataReqVO) {
+ PageResult> list = deviceDataService.getHistoryDeviceProperties(deviceDataReqVO);
return success(BeanUtils.toBean(list, IotTimeDataRespVO.class));
}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataPageReqVO.java
similarity index 92%
rename from yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataReqVO.java
rename to yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataPageReqVO.java
index 21e53aff81..da41299d8e 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataReqVO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataPageReqVO.java
@@ -10,10 +10,9 @@ import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-// TODO @haohao：IotDeviceDataPageReqVO
@Schema(description = "管理后台 - IoT 设备数据 Request VO")
@Data
-public class IotDeviceDataReqVO extends PageParam {
+public class IotDeviceDataPageReqVO extends PageParam {
@Schema(description = "设备编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "177")
private Long deviceId;
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataRespVO.java
index 256bf84faa..ad32fb5f9d 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataRespVO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/deviceData/IotDeviceDataRespVO.java
@@ -1,9 +1,6 @@
package cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Builder;
import lombok.Data;
import java.time.LocalDateTime;
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDataDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDataDO.java
index 68370d7312..892a6b8b76 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDataDO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/IotDeviceDataDO.java
@@ -1,15 +1,12 @@
package cn.iocoder.yudao.module.iot.dal.dataobject.device;
import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
-import cn.iocoder.yudao.module.iot.enums.device.IotDeviceStatusEnum;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodelfunction.IotThinkModelFunctionDO;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -23,39 +20,52 @@ import java.time.LocalDateTime;
@AllArgsConstructor
public class IotDeviceDataDO {
- // TODO @haohao：每个字段的关联关系，可以 @ 下哈。
/**
* 设备编号
+ *
+ * 关联 {@link IotDeviceDO#getId()}
*/
private Long deviceId;
/**
* 物模型编号
+ *
+ * 关联 {@link IotThinkModelFunctionDO#getId()}
*/
private Long thinkModelFunctionId;
/**
* 产品标识
+ *
+ * 关联 {@link IotProductDO#getProductKey()}
*/
private String productKey;
/**
* 设备名称
+ *
+ * 冗余 {@link IotDeviceDO#getDeviceName()}
*/
private String deviceName;
/**
* 属性标识符
+ *
+ * 关联 {@link IotThinkModelFunctionDO#getIdentifier()}
*/
private String identifier;
/**
* 属性名称
+ *
+ * 关联 {@link IotThinkModelFunctionDO#getName()}
*/
private String name;
/**
* 数据类型
+ *
+ * 关联 {@link IotThinkModelFunctionDO#getProperty()#getDataType()}
*/
private String dataType;
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectDO.java
index 652c3aee6c..542dd1e7b7 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectDO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectDO.java
@@ -42,12 +42,6 @@ public class SelectDO {
*/
private String type;
- // TODO @haohao：这个字段，是啥哈？
- /**
- * 查询条件
- */
- private Set orgIds;
-
/**
* 设备ID
*/
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectVisualDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectVisualDO.java
index d4c35d66df..44acc3ac54 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectVisualDO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/SelectVisualDO.java
@@ -27,14 +27,17 @@ public class SelectVisualDO {
* 查询类型，0历史数据，1实时数据，2聚合数据
*/
private int type;
+
/**
* 查询的数据量
*/
private int num;
+
/**
* 聚合函数
*/
private String aggregate;
+
/**
* 统计间隔数字+s/m/h/d
* 比如1s,1m,1h,1d代表1秒，1分钟，1小时，1天
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableManager.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableManager.java
deleted file mode 100644
index e11db58e7d..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableManager.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine;
-
-import java.util.List;
-
-// TODO @haohao：这个还有用哇？
-/**
- * TableManager 类用于管理 TDengine 表的创建、删除和结构信息获取
- */
-public class TableManager {
-
- /**
- * 创建超级表模板（含存在判断）
- */
- private static final String CREATE_STABLE_INE_TPL = "CREATE STABLE IF NOT EXISTS %s (%s) TAGS (%s);";
-
- /**
- * 删除超级表
- */
- private static final String DROP_STABLE_TPL = "DROP STABLE IF EXISTS %s;";
-
- /**
- * 获取表的结构信息
- */
- private static final String DESC_TB_TPL = "DESCRIBE %s;";
-
- /**
- * 超级表增加列
- */
- private static final String ALTER_STABLE_ADD_COL_TPL = "ALTER STABLE %s ADD COLUMN %s;";
-
- /**
- * 超级表修改列
- */
- private static final String ALTER_STABLE_MODIFY_COL_TPL = "ALTER STABLE %s MODIFY COLUMN %s;";
-
- /**
- * 超级表删除列
- */
- private static final String ALTER_STABLE_DROP_COL_TPL = "ALTER STABLE %s DROP COLUMN %s;";
-
- /**
- * 创建普通表模板（含存在判断）
- */
- private static final String CREATE_CTABLE_INE_TPL = "CREATE TABLE IF NOT EXISTS %s (%s)";
-
- /**
- * 获取创建表sql
- */
- public static String getCreateSTableSql(String tbName, List fields, TdFieldDO... tags) {
- if (fields.isEmpty()) {
- return null;
- }
-
- // 生成字段片段
- StringBuilder sbField = new StringBuilder("time TIMESTAMP,");
-
- for (TdFieldDO field : fields) {
- sbField.append(FieldParser.getFieldDefine(field));
- sbField.append(",");
- }
- sbField.deleteCharAt(sbField.length() - 1);
-
- String fieldFrag = sbField.toString();
-
- // 生成tag
- StringBuilder sbTag = new StringBuilder();
- for (TdFieldDO tag : tags) {
- sbTag.append(FieldParser.getFieldDefine(tag))
- .append(",");
- }
- sbTag.deleteCharAt(sbTag.length() - 1);
-
- return String.format(CREATE_STABLE_INE_TPL, tbName, fieldFrag, sbTag);
-
- }
-
- /**
- * 获取创建普通表sql
- */
- public static String getCreateCTableSql(String tbName, List fields) {
- if (fields.size() == 0) {
- return null;
- }
-
- //生成字段片段
- StringBuilder sbField = new StringBuilder("time timestamp,");
-
- for (TdFieldDO field : fields) {
- sbField.append(FieldParser.getFieldDefine(field));
- sbField.append(",");
- }
- sbField.deleteCharAt(sbField.length() - 1);
-
- String fieldFrag = sbField.toString();
-
- return String.format(CREATE_CTABLE_INE_TPL, tbName, fieldFrag);
-
- }
-
-
- /**
- * 取正确的表名
- *
- * @param name 表象
- */
- public static String rightTbName(String name) {
- return name.toLowerCase().replace("-" , "_");
- }
-
- /**
- * 获取表详情的sql
- */
- public static String getDescTableSql(String tbName) {
- return String.format(DESC_TB_TPL, tbName);
- }
-
- /**
- * 获取添加字段sql
- */
- public static String getAddSTableColumnSql(String tbName, List fields) {
- StringBuilder sbAdd = new StringBuilder();
- for (TdFieldDO field : fields) {
- sbAdd.append(String.format(ALTER_STABLE_ADD_COL_TPL,
- tbName,
- FieldParser.getFieldDefine(field)
- ));
- }
- return sbAdd.toString();
- }
-
- /**
- * 获取修改字段sql
- */
- public static String getModifySTableColumnSql(String tbName, List fields) {
- StringBuilder sbModify = new StringBuilder();
- for (TdFieldDO field : fields) {
- sbModify.append(String.format(ALTER_STABLE_MODIFY_COL_TPL,
- tbName,
- FieldParser.getFieldDefine(field)
- ));
- }
- return sbModify.toString();
- }
-
- /**
- * 获取删除字段sql
- */
- public static String getDropSTableColumnSql(String tbName, List fields) {
- StringBuilder sbDrop = new StringBuilder();
- for (TdFieldDO field : fields) {
- sbDrop.append(String.format(ALTER_STABLE_DROP_COL_TPL,
- tbName,
- field.getFieldName()
- ));
- }
- return sbDrop.toString();
- }
-
-}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineSuperTableMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDDLMapper.java
similarity index 68%
rename from yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineSuperTableMapper.java
rename to yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDDLMapper.java
index e688563d5f..640255940d 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineSuperTableMapper.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDDLMapper.java
@@ -1,19 +1,30 @@
package cn.iocoder.yudao.module.iot.dal.tdengine;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
- * TD 引擎的超级表 Mapper
+ * 专门处理 DDL（数据定义语言）操作，包含所有的数据库和表的定义操作，例如创建数据库、创建超级表、创建子表等
*/
@Mapper
@DS("tdengine")
-public interface TdEngineSuperTableMapper {
+public interface TdEngineDDLMapper {
+
+ /**
+ * 创建数据库
+ * SQL：CREATE DATABASE [IF NOT EXISTS] db_name [database_options];
+ *
+ * @param dataBaseName 数据库名称
+ */
+ @TenantIgnore
+ void createDatabase(@Param("dataBaseName") String dataBaseName);
/**
* 创建超级表
@@ -25,7 +36,7 @@ public interface TdEngineSuperTableMapper {
* columns 列信息
* tags 标签信息
*/
- @InterceptorIgnore(tenantLine = "true")
+ @TenantIgnore
void createSuperTable(TdTableDO superTable);
/**
@@ -36,7 +47,7 @@ public interface TdEngineSuperTableMapper {
* dataBaseName 数据库名称
* superTableName 超级表名称
*/
- @InterceptorIgnore(tenantLine = "true")
+ @TenantIgnore
List> showSuperTables(TdTableDO superTable);
/**
@@ -47,7 +58,7 @@ public interface TdEngineSuperTableMapper {
* dataBaseName 数据库名称
* superTableName 超级表名称
*/
- @InterceptorIgnore(tenantLine = "true")
+ @TenantIgnore
List> describeSuperTable(TdTableDO superTable);
/**
@@ -59,7 +70,7 @@ public interface TdEngineSuperTableMapper {
* superTableName 超级表名称
* column 列信息
*/
- @InterceptorIgnore(tenantLine = "true")
+ @TenantIgnore
void addColumnForSuperTable(TdTableDO superTable);
/**
@@ -71,7 +82,7 @@ public interface TdEngineSuperTableMapper {
* superTableName 超级表名称
* column 列信息
*/
- @InterceptorIgnore(tenantLine = "true")
+ @TenantIgnore
void dropColumnForSuperTable(TdTableDO superTable);
/**
@@ -83,7 +94,7 @@ public interface TdEngineSuperTableMapper {
* superTableName 超级表名称
* column 列信息
*/
- @InterceptorIgnore(tenantLine = "true")
+ @TenantIgnore
void modifyColumnWidthForSuperTable(TdTableDO superTable);
@@ -95,7 +106,7 @@ public interface TdEngineSuperTableMapper {
* superTableName 超级表名称
* tag 标签信息
*/
- @InterceptorIgnore(tenantLine = "true")
+ @TenantIgnore
void addTagForSuperTable(TdTableDO superTable);
/**
@@ -106,6 +117,33 @@ public interface TdEngineSuperTableMapper {
* superTableName 超级表名称
* tag 标签信息
*/
- @InterceptorIgnore(tenantLine = "true")
+ @TenantIgnore
void dropTagForSuperTable(TdTableDO superTable);
-}
\ No newline at end of file
+
+ /**
+ * 创建子表 - 创建子表
+ * SQL：CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name TAGS (tag_value1, ...);
+ *
+ * @param table 表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * tableName 子表名称
+ * tags TAG 字段
+ */
+ @TenantIgnore
+ void createTable(TdTableDO table);
+
+ /**
+ * 创建子表 - 创建子表并指定标签的值
+ * SQL：CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name (tag_name1, ...) TAGS (tag_value1, ...);
+ *
+ * @param table 表信息
+ * dataBaseName 数据库名称
+ * superTableName 超级表名称
+ * tableName 子表名称
+ * tags TAG 字段
+ */
+ @TenantIgnore
+ void createTableWithTags(TdTableDO table);
+
+}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDMLMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDMLMapper.java
new file mode 100644
index 0000000000..12b2c232c3
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDMLMapper.java
@@ -0,0 +1,103 @@
+package cn.iocoder.yudao.module.iot.dal.tdengine;
+
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TagsSelectDO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 专门处理 TD Engine 的 DML（数据操作语言）操作，处理所有的数据查询和写入操作，如插入数据、查询数据等
+ */
+@Mapper
+@DS("tdengine")
+public interface TdEngineDMLMapper {
+
+ /**
+ * 插入数据 - 指定列插入数据
+ *
+ * @param table 数据
+ * dataBaseName 数据库名
+ * tableName 表名
+ * columns 列
+ */
+ @TenantIgnore
+ void insertData(TdTableDO table);
+
+ /**
+ * 根据时间戳查询数据
+ *
+ * @param selectDO 查询条件
+ * @return 查询结果列表
+ */
+ @TenantIgnore
+ List> selectByTimestamp(SelectDO selectDO);
+
+ /**
+ * 根据时间戳获取数据条数
+ *
+ * @param selectDO 查询条件
+ * @return 数据条数
+ */
+ @TenantIgnore
+ Map selectCountByTimestamp(SelectDO selectDO);
+
+ /**
+ * 获取最新数据
+ *
+ * @param selectDO 查询条件
+ * @return 最新数据
+ */
+ @TenantIgnore
+ Map selectOneLastData(SelectDO selectDO);
+
+ /**
+ * 获取历史数据列表
+ *
+ * @param selectVisualDO 查询条件
+ * @return 历史数据列表
+ */
+ @TenantIgnore
+ List> selectHistoryDataList(SelectVisualDO selectVisualDO);
+
+ /**
+ * 获取实时数据列表
+ *
+ * @param selectVisualDO 查询条件
+ * @return 实时数据列表
+ */
+ @TenantIgnore
+ List> selectRealtimeDataList(SelectVisualDO selectVisualDO);
+
+ /**
+ * 获取聚合数据列表
+ *
+ * @param selectVisualDO 查询条件
+ * @return 聚合数据列表
+ */
+ @TenantIgnore
+ List> selectAggregateDataList(SelectVisualDO selectVisualDO);
+
+ /**
+ * 根据标签获取最新数据列表
+ *
+ * @param tagsSelectDO 查询条件
+ * @return 最新数据列表
+ */
+ @TenantIgnore
+ List> selectLastDataListByTags(TagsSelectDO tagsSelectDO);
+
+ /**
+ * 获取历史数据条数
+ *
+ * @param selectVisualDO 查询条件
+ * @return 数据条数
+ */
+ @TenantIgnore
+ Long selectHistoryCount(SelectVisualDO selectVisualDO);
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDataWriterMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDataWriterMapper.java
deleted file mode 100644
index 51f4229a0f..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDataWriterMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.iocoder.yudao.module.iot.dal.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * TD 引擎的数据写入 Mapper
- */
-@Mapper
-@DS("tdengine")
-public interface TdEngineDataWriterMapper {
-
- /**
- * 插入数据 - 指定列插入数据
- *
- * @param table 数据
- * dataBaseName 数据库名
- * tableName 表名
- * columns 列
- */
- @InterceptorIgnore(tenantLine = "true")
- void insertData(TdTableDO table);
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDatabaseMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDatabaseMapper.java
deleted file mode 100644
index cd3eaa8b93..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDatabaseMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.iocoder.yudao.module.iot.dal.tdengine;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-// TODO @haohao：InterceptorIgnore 忽略租户，可以在每个方法上，添加 @TenantIgnore 哈。
-/**
- * TD 引擎的数据库 Mapper
- */
-@Mapper
-@DS("tdengine")
-public interface TdEngineDatabaseMapper {
-
- /**
- * 创建数据库
- * SQL：CREATE DATABASE [IF NOT EXISTS] db_name [database_options];
- *
- * @param dataBaseName 数据库名称
- */
- @InterceptorIgnore(tenantLine = "true")
- void createDatabase(@Param("dataBaseName") String dataBaseName);
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java
deleted file mode 100644
index a2408e3355..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineQueryMapper.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package cn.iocoder.yudao.module.iot.dal.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TagsSelectDO;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * TD 引擎的查询 Mapper
- */
-@Mapper
-@DS("tdengine")
-public interface TdEngineQueryMapper {
-
- /**
- * 根据时间戳查询数据
- *
- * @param selectDO 查询条件
- * @return 查询结果
- */
- List> selectByTimestamp(SelectDO selectDO);
-
- // TODO @haohao：最好方法的命名，和数据库操作的保持一直。get => select。然后 selectList or selectOne
- /**
- * 根据时间戳获取数据条数
- *
- * @param selectDO 查询条件
- * @return 数据条数
- */
- Map getCountByTimestamp(SelectDO selectDO);
-
- /**
- * 获取最新数据
- *
- * @param selectDO 查询条件
- * @return 最新数据
- */
- Map getLastData(SelectDO selectDO);
-
- /**
- * 获取历史数据
- *
- * @param selectVisualDO 查询条件
- * @return 历史数据列表
- */
- @InterceptorIgnore(tenantLine = "true")
- List> getHistoryData(SelectVisualDO selectVisualDO);
-
- /**
- * 获取实时数据
- *
- * @param selectVisualDO 查询条件
- * @return 实时数据列表
- */
- List> getRealtimeData(SelectVisualDO selectVisualDO);
-
- /**
- * 获取聚合数据
- *
- * @param selectVisualDO 查询条件
- * @return 聚合数据列表
- */
- List> getAggregateData(SelectVisualDO selectVisualDO);
-
- /**
- * 根据标签获取最新数据
- *
- * @param tagsSelectDO 查询条件
- * @return 最新数据列表
- */
- List> getLastDataByTags(TagsSelectDO tagsSelectDO);
-
- /**
- * 获取历史数据条数
- *
- * @param selectVisualDO 查询条件
- * @return 数据条数
- */
- @InterceptorIgnore(tenantLine = "true")
- Long getHistoryCount(SelectVisualDO selectVisualDO);
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineTableMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineTableMapper.java
deleted file mode 100644
index 72517bcaba..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineTableMapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cn.iocoder.yudao.module.iot.dal.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * TD 引擎的表 Mapper
- */
-@Mapper
-@DS("tdengine")
-public interface TdEngineTableMapper {
-
- /**
- * 创建子表 - 创建子表
- * SQL：CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name TAGS (tag_value1, ...);
- *
- * @param table 表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * tableName 子表名称
- * tags TAG 字段
- */
- @InterceptorIgnore(tenantLine = "true")
- void createTable(TdTableDO table);
-
- /**
- * 创建子表 - 创建子表并指定标签的值
- * SQL：CREATE TABLE [IF NOT EXISTS] tb_name USING stb_name (tag_name1, ...) TAGS (tag_value1, ...);
- *
- * @param table 表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * tableName 子表名称
- * tags TAG 字段
- */
- @InterceptorIgnore(tenantLine = "true")
- void createTableWithTags(TdTableDO table);
-
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataService.java
index 96181fd263..4f390ca3be 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataService.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataService.java
@@ -1,7 +1,7 @@
package cn.iocoder.yudao.module.iot.service.device;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData.IotDeviceDataReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData.IotDeviceDataPageReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDataDO;
import jakarta.validation.Valid;
@@ -31,7 +31,7 @@ public interface IotDeviceDataService {
* @param deviceId 设备编号
* @return 设备属性最新数据
*/
- List getDevicePropertiesLatestData(@Valid IotDeviceDataReqVO deviceId);
+ List getLatestDeviceProperties(@Valid IotDeviceDataPageReqVO deviceId);
/**
* 获得设备属性历史数据
@@ -39,5 +39,5 @@ public interface IotDeviceDataService {
* @param deviceDataReqVO 设备属性历史数据 Request VO
* @return 设备属性历史数据
*/
- PageResult> getDevicePropertiesHistoryData(@Valid IotDeviceDataReqVO deviceDataReqVO);
+ PageResult> getHistoryDeviceProperties(@Valid IotDeviceDataPageReqVO deviceDataReqVO);
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
index 8f68989c94..7d10977f90 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
@@ -1,18 +1,20 @@
package cn.iocoder.yudao.module.iot.service.device;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData.IotDeviceDataReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.device.vo.deviceData.IotDeviceDataPageReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDataDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.ThingModelMessage;
import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodelfunction.IotThinkModelFunctionDO;
import cn.iocoder.yudao.module.iot.dal.redis.deviceData.DeviceDataRedisDAO;
+import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDMLMapper;
+import cn.iocoder.yudao.module.iot.enums.IotConstants;
import cn.iocoder.yudao.module.iot.enums.product.IotProductFunctionTypeEnum;
import cn.iocoder.yudao.module.iot.service.tdengine.IotThingModelMessageService;
-import cn.iocoder.yudao.module.iot.service.tdengine.TdEngineQueryService;
import cn.iocoder.yudao.module.iot.service.thinkmodelfunction.IotThinkModelFunctionService;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
@@ -40,7 +42,7 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
@Resource
private IotThinkModelFunctionService thinkModelFunctionService;
@Resource
- private TdEngineQueryService tdEngineQueryService;
+ private TdEngineDMLMapper tdEngineDMLMapper;
@Resource
private DeviceDataRedisDAO deviceDataRedisDAO;
@@ -66,7 +68,7 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
}
@Override
- public List getDevicePropertiesLatestData(@Valid IotDeviceDataReqVO deviceDataReqVO) {
+ public List getLatestDeviceProperties(@Valid IotDeviceDataPageReqVO deviceDataReqVO) {
List list = new ArrayList<>();
// 1. 获取设备信息
IotDeviceDO device = deviceService.getDevice(deviceDataReqVO.getDeviceId());
@@ -106,7 +108,7 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
}
@Override
- public PageResult> getDevicePropertiesHistoryData(IotDeviceDataReqVO deviceDataReqVO) {
+ public PageResult> getHistoryDeviceProperties(IotDeviceDataPageReqVO deviceDataReqVO) {
PageResult> pageResult = new PageResult<>();
// 1. 获取设备信息
IotDeviceDO device = deviceService.getDevice(deviceDataReqVO.getDeviceId());
@@ -121,17 +123,17 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
params.put("rows", deviceDataReqVO.getPageSize());
params.put("page", (deviceDataReqVO.getPageNo() - 1) * deviceDataReqVO.getPageSize());
selectVisualDO.setParams(params);
- pageResult.setList(tdEngineQueryService.getHistoryData(selectVisualDO));
- pageResult.setTotal(tdEngineQueryService.getHistoryCount(selectVisualDO));
+ pageResult.setList(tdEngineDMLMapper.selectHistoryDataList(selectVisualDO));
+ pageResult.setTotal(tdEngineDMLMapper.selectHistoryCount(selectVisualDO));
return pageResult;
}
private String getDatabaseName() {
- return url.substring(url.lastIndexOf("/") + 1);
+ return StrUtil.subAfter(url, "/", true);
}
private static String getDeviceTableName(String productKey, String deviceName) {
- return String.format("device_%s_%s", productKey.toLowerCase(), deviceName.toLowerCase());
+ return String.format(IotConstants.DEVICE_TABLE_NAME_FORMAT, productKey, deviceName);
}
-}
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
index 0ec737a30e..58918c1307 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
@@ -19,7 +19,9 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.security.SecureRandom;
import java.time.LocalDateTime;
+import java.util.Base64;
import java.util.Objects;
import java.util.UUID;
@@ -137,10 +139,13 @@ public class IotDeviceServiceImpl implements IotDeviceService {
* @return 生成的 MQTT Password
*/
private String generateMqttPassword() {
- // TODO @haohao：【后续优化】在实际应用中，建议使用更安全的方法生成 MQTT Password，如加密或哈希
- return UUID.randomUUID().toString();
+ SecureRandom secureRandom = new SecureRandom();
+ byte[] passwordBytes = new byte[32]; // 256 位的随机数
+ secureRandom.nextBytes(passwordBytes);
+ return Base64.getUrlEncoder().withoutPadding().encodeToString(passwordBytes);
}
+
/**
* 生成唯一的 DeviceName
*
@@ -214,30 +219,28 @@ public class IotDeviceServiceImpl implements IotDeviceService {
@Override
public void updateDeviceStatus(IotDeviceStatusUpdateReqVO updateReqVO) {
// 1. 校验存在
- // TODO @haohao：这里的 iotDeviceDO => device。一个是去掉 iot，一个是去掉 DO 后缀。这样，简洁一点。
- IotDeviceDO iotDeviceDO = validateDeviceExists(updateReqVO.getId());
+ IotDeviceDO device = validateDeviceExists(updateReqVO.getId());
// 2.1 更新状态和更新时间
- IotDeviceDO updateObj = BeanUtils.toBean(updateReqVO, IotDeviceDO.class);
- // TODO @haohao：下面几个状态的处理，可以考虑 if else if。这样，看起来会有层次感哈
- // 2.2.1 以前是未激活，现在是上线，设置设备激活时间
- // TODO @haohao：这里可以使用 ObjectUtils.equalsAny 类似这种哈。
- if (Objects.equals(iotDeviceDO.getStatus(), IotDeviceStatusEnum.INACTIVE.getStatus())
- && Objects.equals(updateObj.getStatus(), IotDeviceStatusEnum.ONLINE.getStatus())) {
- updateObj.setActiveTime(LocalDateTime.now());
- }
- // 2.2.2 如果是上线，设置上线时间
- if (Objects.equals(updateObj.getStatus(), IotDeviceStatusEnum.ONLINE.getStatus())) {
- updateObj.setLastOnlineTime(LocalDateTime.now());
- }
- // 2.2.3 如果是离线，设置离线时间
- if (Objects.equals(updateObj.getStatus(), IotDeviceStatusEnum.OFFLINE.getStatus())) {
- updateObj.setLastOfflineTime(LocalDateTime.now());
+ IotDeviceDO updateDevice = BeanUtils.toBean(updateReqVO, IotDeviceDO.class);
+ // 2.2 更新状态相关时间
+ if (Objects.equals(device.getStatus(), IotDeviceStatusEnum.INACTIVE.getStatus())
+ && Objects.equals(updateDevice.getStatus(), IotDeviceStatusEnum.ONLINE.getStatus())) {
+ // 从未激活到在线，设置激活时间和最后上线时间
+ updateDevice.setActiveTime(LocalDateTime.now());
+ updateDevice.setLastOnlineTime(LocalDateTime.now());
+ } else if (Objects.equals(updateDevice.getStatus(), IotDeviceStatusEnum.ONLINE.getStatus())) {
+ // 如果是上线，设置最后上线时间
+ updateDevice.setLastOnlineTime(LocalDateTime.now());
+ } else if (Objects.equals(updateDevice.getStatus(), IotDeviceStatusEnum.OFFLINE.getStatus())) {
+ // 如果是离线，设置最后离线时间
+ updateDevice.setLastOfflineTime(LocalDateTime.now());
}
+
// 2.3 设置状态更新时间
- updateObj.setStatusLastUpdateTime(LocalDateTime.now());
+ updateDevice.setStatusLastUpdateTime(LocalDateTime.now());
// 2.4 更新到数据库
- deviceMapper.updateById(updateObj);
+ deviceMapper.updateById(updateDevice);
}
@Override
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableService.java
index 7c88b83aa5..8aec32f323 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableService.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableService.java
@@ -15,4 +15,4 @@ public interface IotSuperTableService {
* 创建超级表数据模型
*/
void createSuperTableDataModel(IotProductDO product, List functionList);
-}
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableServiceImpl.java
index 3be324c4e6..20989181ea 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotSuperTableServiceImpl.java
@@ -9,6 +9,8 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.FieldParser;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdFieldDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodelfunction.IotThinkModelFunctionDO;
+import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDDLMapper;
+import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDMLMapper;
import cn.iocoder.yudao.module.iot.enums.product.IotProductFunctionTypeEnum;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@@ -26,7 +28,7 @@ import java.util.stream.Collectors;
public class IotSuperTableServiceImpl implements IotSuperTableService {
@Resource
- private TdEngineSuperTableService tdEngineSuperTableService;
+ private TdEngineDDLMapper tdEngineDDLMapper;
@Value("${spring.datasource.dynamic.datasource.tdengine.url}")
private String url;
@@ -42,9 +44,10 @@ public class IotSuperTableServiceImpl implements IotSuperTableService {
String superTableName = getSuperTableName(product.getDeviceType(), product.getProductKey());
String databaseName = getDatabaseName();
- Integer tableExists = tdEngineSuperTableService.checkSuperTableExists(new TdTableDO(databaseName, superTableName));
- if (tableExists != null && tableExists > 0) {
+ List> results = tdEngineDDLMapper.showSuperTables(new TdTableDO(databaseName, superTableName));
+ int tableExists = results == null || results.isEmpty() ? 0 : results.size();
+ if (tableExists > 0) {
updateSuperTable(thingModel, product.getDeviceType());
} else {
createSuperTable(thingModel, product.getDeviceType());
@@ -76,7 +79,7 @@ public class IotSuperTableServiceImpl implements IotSuperTableService {
String databaseName = getDatabaseName();
// 创建超级表
- tdEngineSuperTableService.createSuperTable(new TdTableDO(databaseName, superTableName, schemaFields, tagsFields));
+ tdEngineDDLMapper.createSuperTable(new TdTableDO(databaseName, superTableName, schemaFields, tagsFields));
}
/**
@@ -98,7 +101,7 @@ public class IotSuperTableServiceImpl implements IotSuperTableService {
* 获取表的字段信息
*/
private List getTableFields(String tableName) {
- List> tableDescription = tdEngineSuperTableService.describeSuperTable(new TdTableDO(getDatabaseName(), tableName));
+ List> tableDescription = tdEngineDDLMapper.describeSuperTable(new TdTableDO(getDatabaseName(), tableName));
if (CollUtil.isEmpty(tableDescription)) {
return Collections.emptyList();
}
@@ -127,32 +130,38 @@ public class IotSuperTableServiceImpl implements IotSuperTableService {
// 添加新增字段
if (CollUtil.isNotEmpty(addFields)) {
- tdEngineSuperTableService.addColumnsForSuperTable(TdTableDO.builder()
- .dataBaseName(databaseName)
- .superTableName(tableName)
- .columns(addFields)
- .build());
+ for (TdFieldDO addField : addFields) {
+ tdEngineDDLMapper.addColumnForSuperTable(TdTableDO.builder()
+ .dataBaseName(databaseName)
+ .superTableName(tableName)
+ .column(addField)
+ .build());
+ }
}
// 删除旧字段
if (CollUtil.isNotEmpty(dropFields)) {
- tdEngineSuperTableService.dropColumnsForSuperTable(TdTableDO.builder()
- .dataBaseName(databaseName)
- .superTableName(tableName)
- .columns(dropFields)
- .build());
+ for (TdFieldDO dropField : dropFields) {
+ tdEngineDDLMapper.dropColumnForSuperTable(TdTableDO.builder()
+ .dataBaseName(databaseName)
+ .superTableName(tableName)
+ .column(dropField)
+ .build());
+ }
}
// 修改字段（先删除再添加）
if (CollUtil.isNotEmpty(modifyFields)) {
- tdEngineSuperTableService.dropColumnsForSuperTable(TdTableDO.builder()
- .dataBaseName(databaseName)
- .superTableName(tableName)
- .columns(modifyFields)
- .build());
- tdEngineSuperTableService.addColumnsForSuperTable(TdTableDO.builder()
- .dataBaseName(databaseName)
- .superTableName(tableName)
- .columns(addFields)
- .build());
+ for (TdFieldDO modifyField : modifyFields) {
+ tdEngineDDLMapper.dropColumnForSuperTable(TdTableDO.builder()
+ .dataBaseName(databaseName)
+ .superTableName(tableName)
+ .column(modifyField)
+ .build());
+ tdEngineDDLMapper.addColumnForSuperTable(TdTableDO.builder()
+ .dataBaseName(databaseName)
+ .superTableName(tableName)
+ .column(modifyField)
+ .build());
+ }
}
}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
index 280b32d9a4..92a30ebb0d 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.iot.service.tdengine;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.iot.controller.admin.device.vo.device.IotDeviceStatusUpdateReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO;
@@ -11,6 +13,9 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.ThingModelMessage;
import cn.iocoder.yudao.module.iot.dal.dataobject.thinkmodelfunction.IotThinkModelFunctionDO;
import cn.iocoder.yudao.module.iot.dal.redis.deviceData.DeviceDataRedisDAO;
+import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDDLMapper;
+import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDMLMapper;
+import cn.iocoder.yudao.module.iot.enums.IotConstants;
import cn.iocoder.yudao.module.iot.enums.device.IotDeviceStatusEnum;
import cn.iocoder.yudao.module.iot.enums.product.IotProductFunctionTypeEnum;
import cn.iocoder.yudao.module.iot.service.device.IotDeviceService;
@@ -30,6 +35,14 @@ import java.util.stream.Collectors;
@Service
public class IotThingModelMessageServiceImpl implements IotThingModelMessageService {
+ private static final String TAG_NOTE = "TAG";
+ private static final String NOTE = "note";
+ private static final String TIME = "time";
+ private static final String DEVICE_KEY = "device_key";
+ private static final String DEVICE_NAME = "device_name";
+ private static final String PRODUCT_KEY = "product_key";
+ private static final String DEVICE_TYPE = "device_type";
+
@Value("${spring.datasource.dynamic.datasource.tdengine.url}")
private String url;
@@ -38,11 +51,9 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
@Resource
private IotDeviceService iotDeviceService;
@Resource
- private TdEngineTableService tdEngineTableService;
+ private TdEngineDDLMapper tdEngineDDLMapper;
@Resource
- private TdEngineSuperTableService tdEngineSuperTableService;
- @Resource
- private TdEngineDataWriterService tdEngineDataWriterService;
+ private TdEngineDMLMapper tdEngineDMLMapper;
@Resource
private DeviceDataRedisDAO deviceDataRedisDAO;
@@ -51,62 +62,64 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
@Override
@TenantIgnore
public void saveThingModelMessage(IotDeviceDO device, ThingModelMessage thingModelMessage) {
- // 判断设备状态，如果为未激活状态，创建数据表
+ // 1. 判断设备状态，如果为未激活状态，创建数据表并更新设备状态
if (IotDeviceStatusEnum.INACTIVE.getStatus().equals(device.getStatus())) {
- // 创建设备数据表
createDeviceTable(device.getDeviceType(), device.getProductKey(), device.getDeviceName(), device.getDeviceKey());
- // 更新设备状态
- // TODO @haohao：下面可以考虑，链式调用。iotDeviceService.updateDeviceStatus(new IotDeviceStatusUpdateReqVO().setid().setstatus())
- IotDeviceStatusUpdateReqVO updateReqVO = new IotDeviceStatusUpdateReqVO();
- updateReqVO.setId(device.getId());
- updateReqVO.setStatus(IotDeviceStatusEnum.ONLINE.getStatus());
- iotDeviceService.updateDeviceStatus(updateReqVO);
+ iotDeviceService.updateDeviceStatus(new IotDeviceStatusUpdateReqVO()
+ .setId(device.getId())
+ .setStatus(IotDeviceStatusEnum.ONLINE.getStatus()));
}
- // TODO @haohao：这个变量，可以和 “过滤并收集有效的属性字段” 那块，因为关联度高一点。
- // 获取设备属性
+ // 2. 获取设备属性并进行物模型校验，过滤非物模型属性
Map params = thingModelMessage.dataToMap();
-
- // 物模型校验，过滤非物模型属性
- List functionList = iotThinkModelFunctionService
- .getThinkModelFunctionListByProductKey(thingModelMessage.getProductKey())
- .stream()
- .filter(function -> IotProductFunctionTypeEnum.PROPERTY.getType().equals(function.getType()))
- .toList();
+ List functionList = getValidFunctionList(thingModelMessage.getProductKey());
if (functionList.isEmpty()) {
return;
}
- // 获取属性标识符集合
- // TODO @haohao：这个变量，可以和 “过滤并收集有效的属性字段” 那块，因为关联度高一点。另外，可以使用 CollectionUtils。convertSet
- Set propertyIdentifiers = functionList.stream()
- .map(IotThinkModelFunctionDO::getIdentifier)
- .collect(Collectors.toSet());
+ // 3. 过滤并收集有效的属性字段，缓存设备属性
+ List schemaFieldValues = filterAndCollectValidFields(params, functionList, device, thingModelMessage.getTime());
+ if (schemaFieldValues.size() == 1) { // 仅有时间字段，无需保存
+ return;
+ }
+
+ // 4. 构建并保存设备属性数据
+ tdEngineDMLMapper.insertData(TdTableDO.builder()
+ .dataBaseName(getDatabaseName())
+ .tableName(getDeviceTableName(device.getProductKey(), device.getDeviceName()))
+ .columns(schemaFieldValues)
+ .build());
+ }
+
+ private List getValidFunctionList(String productKey) {
+ return iotThinkModelFunctionService
+ .getThinkModelFunctionListByProductKey(productKey)
+ .stream()
+ .filter(function -> IotProductFunctionTypeEnum.PROPERTY.getType().equals(function.getType()))
+ .toList();
+ }
+
+ private List filterAndCollectValidFields(Map params, List functionList, IotDeviceDO device, Long time) {
+ // 1. 获取属性标识符集合
+ Set propertyIdentifiers = CollectionUtils.convertSet(functionList, IotThinkModelFunctionDO::getIdentifier);
+
+ // 2. 构建属性标识符和属性的映射
Map functionMap = functionList.stream()
.collect(Collectors.toMap(IotThinkModelFunctionDO::getIdentifier, function -> function));
- // 过滤并收集有效的属性字段
+ // 3. 过滤并收集有效的属性字段
List schemaFieldValues = new ArrayList<>();
- schemaFieldValues.add(new TdFieldDO("time", thingModelMessage.getTime()));
+ schemaFieldValues.add(new TdFieldDO(TIME, time));
params.forEach((key, val) -> {
if (propertyIdentifiers.contains(key)) {
schemaFieldValues.add(new TdFieldDO(key.toLowerCase(), val));
// 缓存设备属性
// TODO @haohao：这个缓存的写入，可以使用的时候 cache 么？被动读
- setDeviceDataCache(device, functionMap.get(key), val, thingModelMessage.getTime());
+ setDeviceDataCache(device, functionMap.get(key), val, time);
}
});
- // TODO @haohao：疑问，为什么 1 不继续哈？
- if (schemaFieldValues.size() == 1) {
- return;
- }
-
- // 构建并保存设备属性数据
- tdEngineDataWriterService.insertData(TdTableDO.builder().build()
- .setDataBaseName(getDatabaseName())
- .setTableName(getDeviceTableName(device.getProductKey(), device.getDeviceName()))
- .setColumns(schemaFieldValues));
+ return schemaFieldValues;
}
/**
@@ -132,7 +145,6 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
deviceDataRedisDAO.set(deviceData);
}
- // TODO @haohao：实现没问题哈。这个方法的空行有点多，逻辑分块上没这么明显。看看能不能改下。
/**
* 创建设备数据表
*
@@ -142,36 +154,37 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
* @param deviceKey 设备 Key
*/
private void createDeviceTable(Integer deviceType, String productKey, String deviceName, String deviceKey) {
+ // 1. 获取超级表名和数据库名
String superTableName = getProductPropertySTableName(deviceType, productKey);
String dataBaseName = getDatabaseName();
- List> maps = tdEngineSuperTableService.describeSuperTable(new TdTableDO(dataBaseName, superTableName));
+ // 2. 获取超级表的结构信息
+ List> maps = tdEngineDDLMapper.describeSuperTable(new TdTableDO(dataBaseName, superTableName));
List tagsFieldValues = new ArrayList<>();
-
if (maps != null) {
- // TODO @haohao：一些字符串，是不是可以枚举起来哈。
- // TODO @haohao：这种过滤的，常用的，可以考虑用 CollectionUtils.filterList。一些常用的 stream 操作，适合封装哈
- List> taggedNotesList = maps.stream()
- .filter(map -> "TAG".equals(map.get("note")))
- .toList();
+ // 2.1 过滤出 TAG 类型的字段
+ List> taggedNotesList = CollectionUtils.filterList(maps, map -> TAG_NOTE.equals(map.get(NOTE)));
+
+ // 2.2 解析字段信息
tagsFieldValues = FieldParser.parse(taggedNotesList.stream()
.map(map -> List.of(map.get("field"), map.get("type"), map.get("length")))
.collect(Collectors.toList()));
+ // 2.3 设置 TAG 字段的值
for (TdFieldDO tagsFieldValue : tagsFieldValues) {
switch (tagsFieldValue.getFieldName()) {
- case "product_key" -> tagsFieldValue.setFieldValue(productKey);
- case "device_key" -> tagsFieldValue.setFieldValue(deviceKey);
- case "device_name" -> tagsFieldValue.setFieldValue(deviceName);
- case "device_type" -> tagsFieldValue.setFieldValue(deviceType);
+ case PRODUCT_KEY -> tagsFieldValue.setFieldValue(productKey);
+ case DEVICE_KEY -> tagsFieldValue.setFieldValue(deviceKey);
+ case DEVICE_NAME -> tagsFieldValue.setFieldValue(deviceName);
+ case DEVICE_TYPE -> tagsFieldValue.setFieldValue(deviceType);
}
}
}
- // 创建设备数据表
+ // 3. 创建设备数据表
String tableName = getDeviceTableName(productKey, deviceName);
- tdEngineTableService.createTable(TdTableDO.builder().build()
+ tdEngineDDLMapper.createTable(TdTableDO.builder().build()
.setDataBaseName(dataBaseName)
.setSuperTableName(superTableName)
.setTableName(tableName)
@@ -184,8 +197,7 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
* @return 数据库名称
*/
private String getDatabaseName() {
- // TODO @haohao：可以使用 StrUtil.subAftetLast 这种方法
- return url.substring(url.lastIndexOf("/") + 1);
+ return StrUtil.subAfter(url, "/", true);
}
/**
@@ -198,9 +210,9 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
private static String getProductPropertySTableName(Integer deviceType, String productKey) {
// TODO @haohao：枚举下，会好点哈。
return switch (deviceType) {
- case 1 -> String.format("gateway_sub_%s", productKey).toLowerCase();
- case 2 -> String.format("gateway_%s", productKey).toLowerCase();
- default -> String.format("device_%s", productKey).toLowerCase();
+ case 1 -> String.format(IotConstants.GATEWAY_SUB_STABLE_NAME_FORMAT, productKey).toLowerCase();
+ case 2 -> String.format(IotConstants.GATEWAY_STABLE_NAME_FORMAT, productKey).toLowerCase();
+ default -> String.format(IotConstants.DEVICE_STABLE_NAME_FORMAT, productKey).toLowerCase();
};
}
@@ -212,7 +224,7 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
* @return 设备表名
*/
private static String getDeviceTableName(String productKey, String deviceName) {
- return String.format("device_%s_%s", productKey.toLowerCase(), deviceName.toLowerCase());
+ return String.format(IotConstants.DEVICE_TABLE_NAME_FORMAT, productKey.toLowerCase(), deviceName.toLowerCase());
}
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterService.java
deleted file mode 100644
index 0995b07977..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
-
-/**
- * TD 引擎的数据写入 Service 接口
- */
-public interface TdEngineDataWriterService {
-
- /**
- * 插入数据 - 指定列插入数据
- *
- * @param table 数据
- * dataBaseName 数据库名
- * tableName 表名
- * columns 列
- */
- void insertData(TdTableDO table);
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterServiceImpl.java
deleted file mode 100644
index f4dd2c8fd7..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDataWriterServiceImpl.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
-import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDataWriterMapper;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-
-/**
- * TD 引擎的数据写入 Service 实现类
- */
-@Service
-public class TdEngineDataWriterServiceImpl implements TdEngineDataWriterService {
-
- @Resource
- private TdEngineDataWriterMapper tdEngineDataWriterMapper;
-
- @Override
- public void insertData(TdTableDO table) {
- tdEngineDataWriterMapper.insertData(table);
- }
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseService.java
deleted file mode 100644
index d895262cca..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-/**
- * TD 引擎的数据库 Service 接口
- */
-public interface TdEngineDatabaseService {
-
- /**
- * 创建数据库
- *
- * @param dataBaseName 数据库名称
- */
- void createDatabase(String dataBaseName);
-}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseServiceImpl.java
deleted file mode 100644
index c880db8a93..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineDatabaseServiceImpl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineDatabaseMapper;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * TD 引擎的数据库 Service 实现类
- */
-@Service
-@Slf4j
-public class TdEngineDatabaseServiceImpl implements TdEngineDatabaseService {
-
- @Resource
- private TdEngineDatabaseMapper tdEngineDatabaseMapper;
-
- @Override
- public void createDatabase(String dataBaseName) {
- tdEngineDatabaseMapper.createDatabase(dataBaseName);
- }
-}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryService.java
deleted file mode 100644
index 8d07b43344..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * TD 引擎的查询 Service 接口
- */
-public interface TdEngineQueryService {
-
- /**
- * 获取历史数据
- *
- * @param selectVisualDO 查询条件
- * @return 历史数据列表
- */
- List> getHistoryData(SelectVisualDO selectVisualDO);
-
- /**
- * 获取历史数据条数
- *
- * @param selectVisualDO 查询条件
- * @return 数据条数
- */
- Long getHistoryCount(SelectVisualDO selectVisualDO);
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryServiceImpl.java
deleted file mode 100644
index 672a58640a..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineQueryServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.SelectVisualDO;
-import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineQueryMapper;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class TdEngineQueryServiceImpl implements TdEngineQueryService {
-
- @Resource
- private TdEngineQueryMapper tdEngineQueryMapper;
-
- @Override
- public List> getHistoryData(SelectVisualDO selectVisualDO) {
- return tdEngineQueryMapper.getHistoryData(selectVisualDO);
- }
-
- @Override
- public Long getHistoryCount(SelectVisualDO selectVisualDO) {
- return tdEngineQueryMapper.getHistoryCount(selectVisualDO);
- }
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableService.java
deleted file mode 100644
index df6290a983..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableService.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * TD 引擎的超级表 Service 接口
- */
-public interface TdEngineSuperTableService {
-
- /**
- * 创建超级表
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * columns 列信息
- * tags 标签信息
- */
- void createSuperTable(TdTableDO superTable);
-
- /**
- * 查看超级表 - 显示当前数据库下的所有超级表信息
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- */
-
- List> showSuperTables(TdTableDO superTable);
-
- /**
- * 查看超级表 - 获取超级表的结构信息
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- */
- List> describeSuperTable(TdTableDO superTable);
-
- /**
- * 修改超级表 - 增加列
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * column 列信息
- */
- void addColumnForSuperTable(TdTableDO superTable);
-
- /**
- * 修改超级表 - 删除列
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * column 列信息
- */
- void dropColumnForSuperTable(TdTableDO superTable);
-
- /**
- * 修改超级表 - 修改列宽
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * column 列信息
- */
- void modifyColumnWidthForSuperTable(TdTableDO superTable);
-
-
- /**
- * 修改超级表 - 为超级表添加标签
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * tag 标签信息
- */
- void addTagForSuperTable(TdTableDO superTable);
-
- /**
- * 修改超级表 - 为超级表删除标签
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * tag 标签信息
- */
- void dropTagForSuperTable(TdTableDO superTable);
-
- /**
- * 检查超级表是否存在
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * @return 超级表数量
- */
- Integer checkSuperTableExists(TdTableDO superTable);
-
- /**
- * 为超级表添加列
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * columns 列信息
- */
- void addColumnsForSuperTable(TdTableDO superTable);
-
- /**
- * 为超级表删除列
- *
- * @param superTable 超级表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * columns 列信息
- */
- void dropColumnsForSuperTable(TdTableDO superTable);
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableServiceImpl.java
deleted file mode 100644
index 60436e7bd1..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineSuperTableServiceImpl.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdFieldDO;
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
-import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineSuperTableMapper;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * TD 引擎的超级表 Service 实现类
- */
-@Slf4j
-@Service
-public class TdEngineSuperTableServiceImpl implements TdEngineSuperTableService {
-
- @Resource
- private TdEngineSuperTableMapper tdEngineSuperTableMapper;
-
- @Override
- public void createSuperTable(TdTableDO superTable) {
- tdEngineSuperTableMapper.createSuperTable(superTable);
- }
-
- @Override
- public List> showSuperTables(TdTableDO superTable) {
- return tdEngineSuperTableMapper.showSuperTables(superTable);
- }
-
- @Override
- public List> describeSuperTable(TdTableDO superTable) {
- return tdEngineSuperTableMapper.describeSuperTable(superTable);
- }
-
- @Override
- public void addColumnForSuperTable(TdTableDO superTable) {
- tdEngineSuperTableMapper.addColumnForSuperTable(superTable);
- }
-
- @Override
- public void dropColumnForSuperTable(TdTableDO superTable) {
- tdEngineSuperTableMapper.dropColumnForSuperTable(superTable);
- }
-
- @Override
- public void modifyColumnWidthForSuperTable(TdTableDO superTable) {
- tdEngineSuperTableMapper.modifyColumnWidthForSuperTable(superTable);
- }
-
- @Override
- public void addTagForSuperTable(TdTableDO superTable) {
- tdEngineSuperTableMapper.addTagForSuperTable(superTable);
- }
-
- @Override
- public void dropTagForSuperTable(TdTableDO superTable) {
- tdEngineSuperTableMapper.dropTagForSuperTable(superTable);
- }
-
- @Override
- public Integer checkSuperTableExists(TdTableDO superTable) {
- List> results = tdEngineSuperTableMapper.showSuperTables(superTable);
- return results == null || results.isEmpty() ? 0 : results.size();
- }
-
- @Override
- public void addColumnsForSuperTable(TdTableDO superTable) {
- for (TdFieldDO column : superTable.getColumns()) {
- tdEngineSuperTableMapper.addColumnForSuperTable(TdTableDO.builder()
- .dataBaseName(superTable.getDataBaseName())
- .superTableName(superTable.getSuperTableName())
- .column(column)
- .build());
- }
- }
-
- @Override
- public void dropColumnsForSuperTable(TdTableDO superTable) {
- for (TdFieldDO column : superTable.getColumns()) {
- tdEngineSuperTableMapper.dropColumnForSuperTable(TdTableDO.builder()
- .dataBaseName(superTable.getDataBaseName())
- .superTableName(superTable.getSuperTableName())
- .column(column)
- .build());
- }
- }
-}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableService.java
deleted file mode 100644
index 0781597848..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
-
-/**
- * TD 引擎的表 Service 接口
- */
-public interface TdEngineTableService {
-
- /**
- * 创建表 - 创建超级表的子表
- *
- * @param table 表信息
- * dataBaseName 数据库名称
- * superTableName 超级表名称
- * tableName 子表名称
- * tags TAG 字段
- */
- void createTable(TdTableDO table);
-
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableServiceImpl.java
deleted file mode 100644
index cdca47888a..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/TdEngineTableServiceImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.iocoder.yudao.module.iot.service.tdengine;
-
-import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
-import cn.iocoder.yudao.module.iot.dal.tdengine.TdEngineTableMapper;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * TD 引擎的表 Service 实现类
- */
-@Slf4j
-@Service
-public class TdEngineTableServiceImpl implements TdEngineTableService {
-
- @Resource
- private TdEngineTableMapper tdEngineTableMapper;
-
- @Override
- public void createTable(TdTableDO table) {
- tdEngineTableMapper.createTable(table);
- }
-}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineSuperTableMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDDLMapper.xml
similarity index 70%
rename from yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineSuperTableMapper.xml
rename to yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDDLMapper.xml
index 37cf719101..091b77f642 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineSuperTableMapper.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDDLMapper.xml
@@ -2,7 +2,12 @@
-
+
+
+
+
+ CREATE DATABASE IF NOT EXISTS ${dataBaseName}
+
@@ -68,4 +73,29 @@
ALTER STABLE ${dataBaseName}.${superTableName} DROP TAG ${tag.fieldName}
-
+
+
+ CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
+ USING ${dataBaseName}.${superTableName}
+ TAGS
+
+ #{item.fieldValue}
+
+
+
+
+
+ CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
+ USING ${dataBaseName}.${superTableName}
+
+ #{item.fieldName}
+
+ TAGS
+
+ #{item.fieldValue}
+
+
+
+
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineQueryMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDMLMapper.xml
similarity index 68%
rename from yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineQueryMapper.xml
rename to yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDMLMapper.xml
index f4361bc67f..0443a826b2 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineQueryMapper.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDMLMapper.xml
@@ -2,7 +2,21 @@
-
+
+
+
+
+ INSERT INTO ${dataBaseName}.${tableName}
+
+ ${item.fieldName}
+
+ VALUES
+
+ #{item.fieldValue}
+
+
+
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml
deleted file mode 100644
index dd38cd08ec..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDataWriterMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
- INSERT INTO ${dataBaseName}.${tableName}
-
- ${item.fieldName}
-
- VALUES
-
- #{item.fieldValue}
-
-
-
-
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml
deleted file mode 100644
index 919c301f73..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineDatabaseMapper.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
- CREATE DATABASE IF NOT EXISTS ${dataBaseName}
-
-
-
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml
deleted file mode 100644
index 867ef8f437..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/tdengine/TdEngineTableMapper.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
- CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
- USING ${dataBaseName}.${superTableName}
- TAGS
-
- #{item.fieldValue}
-
-
-
-
-
- CREATE TABLE IF NOT EXISTS ${dataBaseName}.${tableName}
- USING ${dataBaseName}.${superTableName}
-
- #{item.fieldName}
-
- TAGS
-
- #{item.fieldValue}
-
-
-
-
\ No newline at end of file
From ce919d12d1b079ace85c70004bd6553053b76667 Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Thu, 5 Dec 2024 21:45:48 +0800
Subject: [PATCH 013/309] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E8=AF=84?=
=?UTF-8?q?=E5=AE=A1=E3=80=91IoT=EF=BC=9Atdengine=20=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../iot/controller/admin/device/IotDeviceDataController.java | 2 ++
.../yudao/module/iot/dal/tdengine/TdEngineDDLMapper.java | 1 -
.../module/iot/service/device/IotDeviceDataServiceImpl.java | 2 +-
.../module/iot/service/device/IotDeviceServiceImpl.java | 2 +-
.../service/tdengine/IotThingModelMessageServiceImpl.java | 5 +----
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java
index 72fdda8c83..77bc78c665 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceDataController.java
@@ -31,6 +31,7 @@ public class IotDeviceDataController {
@Resource
private IotDeviceDataService deviceDataService;
+ // TODO @浩浩：这里的 /latest-list，包括方法名。
@GetMapping("/latest")
@Operation(summary = "获取设备属性最新数据")
public CommonResult> getLatestDeviceProperties(@Valid IotDeviceDataPageReqVO deviceDataReqVO) {
@@ -38,6 +39,7 @@ public class IotDeviceDataController {
return success(BeanUtils.toBean(list, IotDeviceDataRespVO.class));
}
+ // TODO @浩浩：这里的 /history-page 包括方法名。
@GetMapping("/history")
@Operation(summary = "获取设备属性历史数据")
public CommonResult> getHistoryDeviceProperties(@Valid IotDeviceDataPageReqVO deviceDataReqVO) {
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDDLMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDDLMapper.java
index 640255940d..3d7aa84ddd 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDDLMapper.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/tdengine/TdEngineDDLMapper.java
@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.iot.dal.tdengine;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.iot.dal.dataobject.tdengine.TdTableDO;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
index 7d10977f90..d68287cd4b 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceDataServiceImpl.java
@@ -133,7 +133,7 @@ public class IotDeviceDataServiceImpl implements IotDeviceDataService {
}
private static String getDeviceTableName(String productKey, String deviceName) {
- return String.format(IotConstants.DEVICE_TABLE_NAME_FORMAT, productKey, deviceName);
+ return String.format(IotConstants.DEVICE_TABLE_NAME_FORMAT, productKey, deviceName);
}
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
index 58918c1307..bb302a22f7 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/IotDeviceServiceImpl.java
@@ -139,13 +139,13 @@ public class IotDeviceServiceImpl implements IotDeviceService {
* @return 生成的 MQTT Password
*/
private String generateMqttPassword() {
+ // TODO @浩浩：这里的 StrUtil 随机字符串？
SecureRandom secureRandom = new SecureRandom();
byte[] passwordBytes = new byte[32]; // 256 位的随机数
secureRandom.nextBytes(passwordBytes);
return Base64.getUrlEncoder().withoutPadding().encodeToString(passwordBytes);
}
-
/**
* 生成唯一的 DeviceName
*
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
index 92a30ebb0d..9ffb477150 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/tdengine/IotThingModelMessageServiceImpl.java
@@ -66,8 +66,7 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
if (IotDeviceStatusEnum.INACTIVE.getStatus().equals(device.getStatus())) {
createDeviceTable(device.getDeviceType(), device.getProductKey(), device.getDeviceName(), device.getDeviceKey());
iotDeviceService.updateDeviceStatus(new IotDeviceStatusUpdateReqVO()
- .setId(device.getId())
- .setStatus(IotDeviceStatusEnum.ONLINE.getStatus()));
+ .setId(device.getId()).setStatus(IotDeviceStatusEnum.ONLINE.getStatus()));
}
// 2. 获取设备属性并进行物模型校验，过滤非物模型属性
@@ -77,7 +76,6 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
return;
}
-
// 3. 过滤并收集有效的属性字段，缓存设备属性
List schemaFieldValues = filterAndCollectValidFields(params, functionList, device, thingModelMessage.getTime());
if (schemaFieldValues.size() == 1) { // 仅有时间字段，无需保存
@@ -165,7 +163,6 @@ public class IotThingModelMessageServiceImpl implements IotThingModelMessageServ
// 2.1 过滤出 TAG 类型的字段
List> taggedNotesList = CollectionUtils.filterList(maps, map -> TAG_NOTE.equals(map.get(NOTE)));
-
// 2.2 解析字段信息
tagsFieldValues = FieldParser.parse(taggedNotesList.stream()
.map(map -> List.of(map.get("field"), map.get("type"), map.get("length")))
From 3a2c691af085c4e649373961e827627b8fcfaf9a Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Sat, 7 Dec 2024 16:42:56 +0800
Subject: [PATCH 014/309] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E3=80=91IoT=EF=BC=9A=E4=BA=A7=E5=93=81=E5=88=86?=
=?UTF-8?q?=E7=B1=BB=E7=9A=84=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module/iot/enums/ErrorCodeConstants.java | 9 ++-
.../product/IotProductCategoryController.java | 72 +++++++++++++++++++
.../admin/product/vo/IotProductSaveReqVO.java | 6 +-
.../category/IotProductCategoryPageReqVO.java | 27 +++++++
.../vo/category/IotProductCategoryRespVO.java | 33 +++++++++
.../category/IotProductCategorySaveReqVO.java | 29 ++++++++
.../product/IotProductCategoryDO.java | 48 +++++++++++++
.../product/IotProductCategoryMapper.java | 25 +++++++
.../product/IotProductCategoryService.java | 54 ++++++++++++++
.../IotProductCategoryServiceImpl.java | 70 ++++++++++++++++++
10 files changed, 369 insertions(+), 4 deletions(-)
create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java
create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategoryPageReqVO.java
create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategoryRespVO.java
create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategorySaveReqVO.java
create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/product/IotProductCategoryDO.java
create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductCategoryMapper.java
create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryService.java
create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryServiceImpl.java
diff --git a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java
index be9d28ecb0..1e947e6332 100644
--- a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java
+++ b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java
@@ -9,20 +9,20 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
*/
public interface ErrorCodeConstants {
- // ========== IoT 产品相关 1-050-001-000 ============
+ // ========== 产品相关 1-050-001-000 ============
ErrorCode PRODUCT_NOT_EXISTS = new ErrorCode(1_050_001_000, "产品不存在");
ErrorCode PRODUCT_IDENTIFICATION_EXISTS = new ErrorCode(1_050_001_001, "产品标识已经存在");
ErrorCode PRODUCT_STATUS_NOT_DELETE = new ErrorCode(1_050_001_002, "产品状是发布状态，不允许删除");
ErrorCode PRODUCT_STATUS_NOT_ALLOW_FUNCTION = new ErrorCode(1_050_001_003, "产品状是发布状态，不允许操作物模型");
- // ========== IoT 产品物模型 1-050-002-000 ============
+ // ========== 产品物模型 1-050-002-000 ============
ErrorCode THINK_MODEL_FUNCTION_NOT_EXISTS = new ErrorCode(1_050_002_000, "产品物模型不存在");
ErrorCode THINK_MODEL_FUNCTION_EXISTS_BY_PRODUCT_KEY = new ErrorCode(1_050_002_001, "ProductKey 对应的产品物模型已存在");
ErrorCode THINK_MODEL_FUNCTION_IDENTIFIER_EXISTS = new ErrorCode(1_050_002_002, "存在重复的功能标识符。");
ErrorCode THINK_MODEL_FUNCTION_NAME_EXISTS = new ErrorCode(1_050_002_003, "存在重复的功能名称。");
ErrorCode THINK_MODEL_FUNCTION_IDENTIFIER_INVALID = new ErrorCode(1_050_002_003, "产品物模型标识无效");
- // ========== IoT 设备 1-050-003-000 ============
+ // ========== 设备 1-050-003-000 ============
ErrorCode DEVICE_NOT_EXISTS = new ErrorCode(1_050_003_000, "设备不存在");
ErrorCode DEVICE_NAME_EXISTS = new ErrorCode(1_050_003_001, "设备名称在同一产品下必须唯一");
ErrorCode DEVICE_HAS_CHILDREN = new ErrorCode(1_050_003_002, "有子设备，不允许删除");
@@ -30,4 +30,7 @@ public interface ErrorCodeConstants {
ErrorCode DEVICE_PRODUCT_CANNOT_BE_MODIFIED = new ErrorCode(1_050_003_004, "产品不能修改");
ErrorCode DEVICE_INVALID_DEVICE_STATUS = new ErrorCode(1_050_003_005, "无效的设备状态");
+ // ========== 产品分类 1-050-004-000 ==========
+ ErrorCode PRODUCT_CATEGORY_NOT_EXISTS = new ErrorCode(1_050_004_000, "产品分类不存在");
+
}
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java
new file mode 100644
index 0000000000..b365ddea10
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java
@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.iot.controller.admin.product;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategoryPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategoryRespVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategorySaveReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductCategoryDO;
+import cn.iocoder.yudao.module.iot.service.product.IotProductCategoryService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - IoT 产品分类")
+@RestController
+@RequestMapping("/iot/product-category")
+@Validated
+public class IotProductCategoryController {
+
+ @Resource
+ private IotProductCategoryService productCategoryService;
+
+ @PostMapping("/create")
+ @Operation(summary = "创建IoT 产品分类")
+ @PreAuthorize("@ss.hasPermission('iot:product-category:create')")
+ public CommonResult createProductCategory(@Valid @RequestBody IotProductCategorySaveReqVO createReqVO) {
+ return success(productCategoryService.createProductCategory(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "更新IoT 产品分类")
+ @PreAuthorize("@ss.hasPermission('iot:product-category:update')")
+ public CommonResult updateProductCategory(@Valid @RequestBody IotProductCategorySaveReqVO updateReqVO) {
+ productCategoryService.updateProductCategory(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "删除IoT 产品分类")
+ @Parameter(name = "id", description = "编号", required = true)
+ @PreAuthorize("@ss.hasPermission('iot:product-category:delete')")
+ public CommonResult deleteProductCategory(@RequestParam("id") Long id) {
+ productCategoryService.deleteProductCategory(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "获得IoT 产品分类")
+ @Parameter(name = "id", description = "编号", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('iot:product-category:query')")
+ public CommonResult getProductCategory(@RequestParam("id") Long id) {
+ IotProductCategoryDO productCategory = productCategoryService.getProductCategory(id);
+ return success(BeanUtils.toBean(productCategory, IotProductCategoryRespVO.class));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "获得IoT 产品分类分页")
+ @PreAuthorize("@ss.hasPermission('iot:product-category:query')")
+ public CommonResult> getProductCategoryPage(@Valid IotProductCategoryPageReqVO pageReqVO) {
+ PageResult pageResult = productCategoryService.getProductCategoryPage(pageReqVO);
+ return success(BeanUtils.toBean(pageResult, IotProductCategoryRespVO.class));
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSaveReqVO.java
index 254b6b9da2..7577505443 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSaveReqVO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSaveReqVO.java
@@ -14,9 +14,13 @@ public class IotProductSaveReqVO {
@Schema(description = "产品编号", requiredMode = Schema.RequiredMode.AUTO, example = "1")
private Long id;
- @Schema(description = "产品Key", requiredMode = Schema.RequiredMode.AUTO, example = "12345abc")
+ @Schema(description = "产品 Key", requiredMode = Schema.RequiredMode.AUTO, example = "12345abc")
private String productKey;
+ // TODO 芋艿：品类
+
+ // TODO 芋艿：【待确定】保活时长、产品图标、产品图片
+
@Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "温湿度")
@NotEmpty(message = "产品名称不能为空")
private String name;
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategoryPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategoryPageReqVO.java
new file mode 100644
index 0000000000..90d338a898
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategoryPageReqVO.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.iot.controller.admin.product.vo.category;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - IoT 产品分类分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class IotProductCategoryPageReqVO extends PageParam {
+
+ @Schema(description = "分类名字", example = "王五")
+ private String name;
+
+ @Schema(description = "创建时间")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] createTime;
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategoryRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategoryRespVO.java
new file mode 100644
index 0000000000..d684b0215a
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategoryRespVO.java
@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.iot.controller.admin.product.vo.category;
+
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - IoT 产品分类 Response VO")
+@Data
+public class IotProductCategoryRespVO {
+
+ @Schema(description = "分类 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25284")
+ private Long id;
+
+ @Schema(description = "分类名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+ private String name;
+
+ @Schema(description = "分类排序")
+ private Integer sort;
+
+ @Schema(description = "分类状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @DictFormat(DictTypeConstants.COMMON_STATUS)
+ private Integer status;
+
+ @Schema(description = "分类描述", example = "随便")
+ private String description;
+
+ @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+ private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategorySaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategorySaveReqVO.java
new file mode 100644
index 0000000000..a7b2fe4271
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/category/IotProductCategorySaveReqVO.java
@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.iot.controller.admin.product.vo.category;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Schema(description = "管理后台 - IoT 产品分类新增/修改 Request VO")
+@Data
+public class IotProductCategorySaveReqVO {
+
+ @Schema(description = "分类 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25284")
+ private Long id;
+
+ @Schema(description = "分类名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+ @NotEmpty(message = "分类名字不能为空")
+ private String name;
+
+ @Schema(description = "分类排序")
+ private Integer sort;
+
+ @Schema(description = "分类状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "分类状态不能为空")
+ private Integer status;
+
+ @Schema(description = "分类描述", example = "随便")
+ private String description;
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/product/IotProductCategoryDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/product/IotProductCategoryDO.java
new file mode 100644
index 0000000000..a6510488ce
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/product/IotProductCategoryDO.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.module.iot.dal.dataobject.product;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * IoT 产品分类 DO
+ *
+ * @author 芋道源码
+ */
+@TableName("iot_product_category")
+@KeySequence("iot_product_category_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class IotProductCategoryDO extends BaseDO {
+
+ /**
+ * 分类 ID
+ */
+ @TableId
+ private Long id;
+ /**
+ * 分类名字
+ */
+ private String name;
+ /**
+ * 分类排序
+ */
+ private Integer sort;
+ /**
+ * 分类状态
+ *
+ * 枚举 {@link cn.iocoder.yudao.framework.common.enums.CommonStatusEnum}
+ */
+ private Integer status;
+ /**
+ * 分类描述
+ */
+ private String description;
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductCategoryMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductCategoryMapper.java
new file mode 100644
index 0000000000..845eded142
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductCategoryMapper.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.iot.dal.mysql.product;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategoryPageReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductCategoryDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * IoT 产品分类 Mapper
+ *
+ * @author 芋道源码
+ */
+@Mapper
+public interface IotProductCategoryMapper extends BaseMapperX {
+
+ default PageResult selectPage(IotProductCategoryPageReqVO reqVO) {
+ return selectPage(reqVO, new LambdaQueryWrapperX()
+ .likeIfPresent(IotProductCategoryDO::getName, reqVO.getName())
+ .betweenIfPresent(IotProductCategoryDO::getCreateTime, reqVO.getCreateTime())
+ .orderByDesc(IotProductCategoryDO::getId));
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryService.java
new file mode 100644
index 0000000000..9830ec8b9f
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryService.java
@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.iot.service.product;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategoryPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategorySaveReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductCategoryDO;
+import jakarta.validation.Valid;
+
+/**
+ * IoT 产品分类 Service 接口
+ *
+ * @author 芋道源码
+ */
+public interface IotProductCategoryService {
+
+ /**
+ * 创建IoT 产品分类
+ *
+ * @param createReqVO 创建信息
+ * @return 编号
+ */
+ Long createProductCategory(@Valid IotProductCategorySaveReqVO createReqVO);
+
+ /**
+ * 更新IoT 产品分类
+ *
+ * @param updateReqVO 更新信息
+ */
+ void updateProductCategory(@Valid IotProductCategorySaveReqVO updateReqVO);
+
+ /**
+ * 删除IoT 产品分类
+ *
+ * @param id 编号
+ */
+ void deleteProductCategory(Long id);
+
+ /**
+ * 获得IoT 产品分类
+ *
+ * @param id 编号
+ * @return IoT 产品分类
+ */
+ IotProductCategoryDO getProductCategory(Long id);
+
+ /**
+ * 获得IoT 产品分类分页
+ *
+ * @param pageReqVO 分页查询
+ * @return IoT 产品分类分页
+ */
+ PageResult getProductCategoryPage(IotProductCategoryPageReqVO pageReqVO);
+
+}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryServiceImpl.java
new file mode 100644
index 0000000000..579d27cfbf
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductCategoryServiceImpl.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.iot.service.product;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategoryPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.category.IotProductCategorySaveReqVO;
+import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductCategoryDO;
+import cn.iocoder.yudao.module.iot.dal.mysql.product.IotProductCategoryMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.PRODUCT_CATEGORY_NOT_EXISTS;
+
+/**
+ * IoT 产品分类 Service 实现类
+ *
+ * @author 芋道源码
+ */
+@Service
+@Validated
+public class IotProductCategoryServiceImpl implements IotProductCategoryService {
+
+ @Resource
+ private IotProductCategoryMapper productCategoryMapper;
+
+ @Override
+ public Long createProductCategory(IotProductCategorySaveReqVO createReqVO) {
+ // 插入
+ IotProductCategoryDO productCategory = BeanUtils.toBean(createReqVO, IotProductCategoryDO.class);
+ productCategoryMapper.insert(productCategory);
+ // 返回
+ return productCategory.getId();
+ }
+
+ @Override
+ public void updateProductCategory(IotProductCategorySaveReqVO updateReqVO) {
+ // 校验存在
+ validateProductCategoryExists(updateReqVO.getId());
+ // 更新
+ IotProductCategoryDO updateObj = BeanUtils.toBean(updateReqVO, IotProductCategoryDO.class);
+ productCategoryMapper.updateById(updateObj);
+ }
+
+ @Override
+ public void deleteProductCategory(Long id) {
+ // 校验存在
+ validateProductCategoryExists(id);
+ // 删除
+ productCategoryMapper.deleteById(id);
+ }
+
+ private void validateProductCategoryExists(Long id) {
+ if (productCategoryMapper.selectById(id) == null) {
+ throw exception(PRODUCT_CATEGORY_NOT_EXISTS);
+ }
+ }
+
+ @Override
+ public IotProductCategoryDO getProductCategory(Long id) {
+ return productCategoryMapper.selectById(id);
+ }
+
+ @Override
+ public PageResult getProductCategoryPage(IotProductCategoryPageReqVO pageReqVO) {
+ return productCategoryMapper.selectPage(pageReqVO);
+ }
+
+}
\ No newline at end of file
From 9b9fd30c90bfb88d1ad61ef314ffab73e18264ea Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Sat, 7 Dec 2024 18:50:31 +0800
Subject: [PATCH 015/309] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E9=87=8D?=
=?UTF-8?q?=E6=9E=84=E3=80=91IoT=EF=BC=9A=E4=BA=A7=E5=93=81=E6=94=BE?=
=?UTF-8?q?=E5=88=B0=20product=20=E5=AD=90=E7=9B=AE=E5=BD=95=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/product/IotProductController.java | 13 +++---
.../product/vo/IotProductSimpleRespVO.java | 16 -------
.../vo/{ => product}/IotProductPageReqVO.java | 2 +-
.../vo/{ => product}/IotProductRespVO.java | 43 +++++++++++--------
.../vo/{ => product}/IotProductSaveReqVO.java | 28 +++++++-----
.../dal/dataobject/product/IotProductDO.java | 15 +++++--
.../dal/mysql/product/IotProductMapper.java | 2 +-
.../service/product/IotProductService.java | 4 +-
.../product/IotProductServiceImpl.java | 5 +--
.../dal/dataobject/notify/PayNotifyLogDO.java | 2 +-
.../dataobject/notify/PayNotifyTaskDO.java | 4 +-
11 files changed, 68 insertions(+), 66 deletions(-)
delete mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSimpleRespVO.java
rename yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/{ => product}/IotProductPageReqVO.java (88%)
rename yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/{ => product}/IotProductRespVO.java (85%)
rename yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/{ => product}/IotProductSaveReqVO.java (82%)
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java
index e7f41d91dc..a4d111a99e 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductController.java
@@ -3,10 +3,9 @@ package cn.iocoder.yudao.module.iot.controller.admin.product;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.iot.controller.admin.product.vo.IotProductPageReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.product.vo.IotProductRespVO;
-import cn.iocoder.yudao.module.iot.controller.admin.product.vo.IotProductSaveReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.product.vo.IotProductSimpleRespVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductRespVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductSaveReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
import cn.iocoder.yudao.module.iot.service.product.IotProductService;
import io.swagger.v3.oas.annotations.Operation;
@@ -21,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@Tag(name = "管理后台 - IoT 产品")
@RestController
@@ -86,9 +86,10 @@ public class IotProductController {
@GetMapping("/simple-list")
@Operation(summary = "获得所有产品列表")
@PreAuthorize("@ss.hasPermission('iot:product:query')")
- public CommonResult> getSimpleProductList() {
+ public CommonResult> getSimpleProductList() {
List list = productService.getProductList();
- return success(BeanUtils.toBean(list, IotProductSimpleRespVO.class));
+ return success(convertList(list, product -> // 只返回 id、name 字段
+ new IotProductRespVO().setId(product.getId()).setName(product.getName())));
}
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSimpleRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSimpleRespVO.java
deleted file mode 100644
index 83855eaaf8..0000000000
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSimpleRespVO.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.iocoder.yudao.module.iot.controller.admin.product.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - IoT 产品 Response VO")
-@Data
-public class IotProductSimpleRespVO {
-
- @Schema(description = "产品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "26087")
- private Long id;
-
- @Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
- private String name;
-
-}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductPageReqVO.java
similarity index 88%
rename from yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductPageReqVO.java
rename to yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductPageReqVO.java
index 3437f563fd..d54adec484 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductPageReqVO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductPageReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.controller.admin.product.vo;
+package cn.iocoder.yudao.module.iot.controller.admin.product.vo.product;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductRespVO.java
similarity index 85%
rename from yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductRespVO.java
rename to yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductRespVO.java
index 0958b3e844..65d26ff5b0 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductRespVO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductRespVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.controller.admin.product.vo;
+package cn.iocoder.yudao.module.iot.controller.admin.product.vo.product;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -20,34 +20,23 @@ public class IotProductRespVO {
@ExcelProperty("产品名称")
private String name;
- @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("创建时间")
- private LocalDateTime createTime;
-
@Schema(description = "产品标识", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("产品标识")
private String productKey;
- @Schema(description = "接入网关协议", example = "2")
- @ExcelProperty("接入网关协议")
- private Integer protocolType;
-
- @Schema(description = "协议编号（脚本解析 id）", requiredMode = Schema.RequiredMode.REQUIRED, example = "13177")
- @ExcelProperty("协议编号（脚本解析 id）")
- private Long protocolId;
-
- @Schema(description = "产品所属品类标识符", example = "14237")
- @ExcelProperty("产品所属品类标识符")
+ @Schema(description = "产品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long categoryId;
+ @Schema(description = "产品图标", example = "https://iocoder.cn/1.svg")
+ private String icon;
+
+ @Schema(description = "产品图标", example = "https://iocoder.cn/1.png")
+ private String picUrl;
+
@Schema(description = "产品描述", example = "你猜")
@ExcelProperty("产品描述")
private String description;
- @Schema(description = "数据校验级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @ExcelProperty("数据校验级别")
- private Integer validateType;
-
@Schema(description = "产品状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("产品状态")
private Integer status;
@@ -60,8 +49,24 @@ public class IotProductRespVO {
@ExcelProperty("联网方式")
private Integer netType;
+ @Schema(description = "接入网关协议", example = "2")
+ @ExcelProperty("接入网关协议")
+ private Integer protocolType;
+
+ @Schema(description = "协议编号（脚本解析 id）", requiredMode = Schema.RequiredMode.REQUIRED, example = "13177")
+ @ExcelProperty("协议编号（脚本解析 id）")
+ private Long protocolId;
+
@Schema(description = "数据格式")
@ExcelProperty("数据格式")
private Integer dataFormat;
+ @Schema(description = "数据校验级别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @ExcelProperty("数据校验级别")
+ private Integer validateType;
+
+ @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("创建时间")
+ private LocalDateTime createTime;
+
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductSaveReqVO.java
similarity index 82%
rename from yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSaveReqVO.java
rename to yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductSaveReqVO.java
index 7577505443..31890beb7d 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/IotProductSaveReqVO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/vo/product/IotProductSaveReqVO.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.iot.controller.admin.product.vo;
+package cn.iocoder.yudao.module.iot.controller.admin.product.vo.product;
import cn.iocoder.yudao.framework.common.validation.InEnum;
import cn.iocoder.yudao.module.iot.enums.product.*;
@@ -14,17 +14,26 @@ public class IotProductSaveReqVO {
@Schema(description = "产品编号", requiredMode = Schema.RequiredMode.AUTO, example = "1")
private Long id;
- @Schema(description = "产品 Key", requiredMode = Schema.RequiredMode.AUTO, example = "12345abc")
- private String productKey;
-
- // TODO 芋艿：品类
-
- // TODO 芋艿：【待确定】保活时长、产品图标、产品图片
-
@Schema(description = "产品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "温湿度")
@NotEmpty(message = "产品名称不能为空")
private String name;
+ @Schema(description = "产品 Key", requiredMode = Schema.RequiredMode.AUTO, example = "12345abc")
+ private String productKey;
+
+ @Schema(description = "产品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "产品分类编号不能为空")
+ private Long categoryId;
+
+ @Schema(description = "产品图标", example = "https://iocoder.cn/1.svg")
+ private String icon;
+
+ @Schema(description = "产品图标", example = "https://iocoder.cn/1.png")
+ private String picUrl;
+
+ @Schema(description = "产品描述", example = "描述")
+ private String description;
+
@Schema(description = "设备类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
@InEnum(value = IotProductDeviceTypeEnum.class, message = "设备类型必须是 {value}")
@NotNull(message = "设备类型不能为空")
@@ -48,7 +57,4 @@ public class IotProductSaveReqVO {
@NotNull(message = "数据校验级别不能为空")
private Integer validateType;
- @Schema(description = "产品描述", example = "描述")
- private String description;
-
}
\ No newline at end of file
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/product/IotProductDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/product/IotProductDO.java
index eef466edad..34fd35706b 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/product/IotProductDO.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/product/IotProductDO.java
@@ -22,7 +22,7 @@ import lombok.*;
public class IotProductDO extends BaseDO {
/**
- * 产品ID
+ * 产品 ID
*/
@TableId
private Long id;
@@ -30,17 +30,24 @@ public class IotProductDO extends BaseDO {
* 产品名称
*/
private String name;
- // TODO @haohao：这个字段，要不改成 identifier，和阿里云更统一些
/**
* 产品标识
*/
private String productKey;
/**
- * 产品所属品类编号
+ * 产品分类编号
*
- * TODO 外键：后续加
+ * 关联 {@link IotProductCategoryDO#getId()}
*/
private Long categoryId;
+ /**
+ * 产品图标
+ */
+ private String icon;
+ /**
+ * 产品图片
+ */
+ private String picUrl;
/**
* 产品描述
*/
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductMapper.java
index 0341e24921..eac1d29e8b 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductMapper.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/product/IotProductMapper.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.iot.dal.mysql.product;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.iot.controller.admin.product.vo.IotProductPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductPageReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
import org.apache.ibatis.annotations.Mapper;
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductService.java
index 3fff94fd9d..bcbf13ef45 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductService.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductService.java
@@ -1,8 +1,8 @@
package cn.iocoder.yudao.module.iot.service.product;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.iot.controller.admin.product.vo.IotProductPageReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.product.vo.IotProductSaveReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductSaveReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
import jakarta.validation.Valid;
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
index d0ca092889..259bcaa1f6 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/product/IotProductServiceImpl.java
@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.iot.service.product;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.iot.controller.admin.product.vo.IotProductPageReqVO;
-import cn.iocoder.yudao.module.iot.controller.admin.product.vo.IotProductSaveReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductPageReqVO;
+import cn.iocoder.yudao.module.iot.controller.admin.product.vo.product.IotProductSaveReqVO;
import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO;
import cn.iocoder.yudao.module.iot.dal.mysql.product.IotProductMapper;
import cn.iocoder.yudao.module.iot.enums.product.IotProductStatusEnum;
@@ -14,7 +14,6 @@ import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.util.List;
diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/notify/PayNotifyLogDO.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/notify/PayNotifyLogDO.java
index a482605d52..384628370c 100644
--- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/notify/PayNotifyLogDO.java
+++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/notify/PayNotifyLogDO.java
@@ -44,7 +44,7 @@ public class PayNotifyLogDO extends BaseDO {
/**
* 支付通知状态
*
- * 外键 {@link PayNotifyStatusEnum}
+ * 枚举 {@link PayNotifyStatusEnum}
*/
private Integer status;
diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/notify/PayNotifyTaskDO.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/notify/PayNotifyTaskDO.java
index 7bfabad3ff..9f9ee7fefb 100644
--- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/notify/PayNotifyTaskDO.java
+++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/notify/PayNotifyTaskDO.java
@@ -52,7 +52,7 @@ public class PayNotifyTaskDO extends TenantBaseDO {
/**
* 通知类型
*
- * 外键 {@link PayNotifyTypeEnum}
+ * 枚举 {@link PayNotifyTypeEnum}
*/
private Integer type;
/**
@@ -73,7 +73,7 @@ public class PayNotifyTaskDO extends TenantBaseDO {
/**
* 通知状态
*
- * 外键 {@link PayNotifyStatusEnum}
+ * 枚举 {@link PayNotifyStatusEnum}
*/
private Integer status;
/**
From a8c87d168accd14f5b266be9815046b1b45ff9db Mon Sep 17 00:00:00 2001
From: YunaiV
Date: Sat, 7 Dec 2024 19:50:07 +0800
Subject: [PATCH 016/309] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E3=80=91IoT=EF=BC=9A=E4=BA=A7=E5=93=81=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=97=B6=EF=BC=8CproductKey=20=E7=94=B1=E5=89=8D?=
=?UTF-8?q?=E7=AB=AF=E7=94=9F=E6=88=90=EF=BC=9B=E5=90=8C=E6=97=B6=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=20icon=E3=80=81picUrl=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../module/iot/enums/ErrorCodeConstants.java | 2 +-
.../enums/product/IotProductStatusEnum.java | 4 +--
.../product/IotProductCategoryController.java | 24 +++++++++++---
.../product/IotProductCategoryMapper.java | 6 ++++
.../product/IotProductCategoryService.java | 24 ++++++++++----
.../IotProductCategoryServiceImpl.java | 7 ++++
.../product/IotProductServiceImpl.java | 32 ++++---------------
.../IotThinkModelFunctionServiceImpl.java | 2 +-
8 files changed, 60 insertions(+), 41 deletions(-)
diff --git a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java
index 1e947e6332..d1d350d5eb 100644
--- a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java
+++ b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java
@@ -11,7 +11,7 @@ public interface ErrorCodeConstants {
// ========== 产品相关 1-050-001-000 ============
ErrorCode PRODUCT_NOT_EXISTS = new ErrorCode(1_050_001_000, "产品不存在");
- ErrorCode PRODUCT_IDENTIFICATION_EXISTS = new ErrorCode(1_050_001_001, "产品标识已经存在");
+ ErrorCode PRODUCT_KEY_EXISTS = new ErrorCode(1_050_001_001, "产品标识已经存在");
ErrorCode PRODUCT_STATUS_NOT_DELETE = new ErrorCode(1_050_001_002, "产品状是发布状态，不允许删除");
ErrorCode PRODUCT_STATUS_NOT_ALLOW_FUNCTION = new ErrorCode(1_050_001_003, "产品状是发布状态，不允许操作物模型");
diff --git a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotProductStatusEnum.java b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotProductStatusEnum.java
index e64a3d6789..7b4d90a5a4 100644
--- a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotProductStatusEnum.java
+++ b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/product/IotProductStatusEnum.java
@@ -18,12 +18,12 @@ public enum IotProductStatusEnum implements IntArrayValuable {
UNPUBLISHED(0, "开发中"),
PUBLISHED(1, "已发布");
- public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(IotProductStatusEnum::getType).toArray();
+ public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(IotProductStatusEnum::getStatus).toArray();
/**
* 类型
*/
- private final Integer type;
+ private final Integer status;
/**
* 描述
*/
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java
index b365ddea10..bc1c1fbf2b 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/product/IotProductCategoryController.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.iot.controller.admin.product;
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -17,7 +18,10 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
@Tag(name = "管理后台 - IoT 产品分类")
@RestController
@@ -29,14 +33,14 @@ public class IotProductCategoryController {
private IotProductCategoryService productCategoryService;
@PostMapping("/create")
- @Operation(summary = "创建IoT 产品分类")
+ @Operation(summary = "创建产品分类")
@PreAuthorize("@ss.hasPermission('iot:product-category:create')")
public CommonResult