Commit ea8dd67e9ecc34e7e8af3402f00c819d53f5130a
1 parent
61a0c052
【代码优化】增加注解
Showing
9 changed files
with
33 additions
and
22 deletions
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/IotDevicePageReqVO.java
| @@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode; | @@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode; | ||
| 10 | import lombok.ToString; | 10 | import lombok.ToString; |
| 11 | import org.springframework.format.annotation.DateTimeFormat; | 11 | import org.springframework.format.annotation.DateTimeFormat; |
| 12 | 12 | ||
| 13 | -import java.math.BigDecimal; | ||
| 14 | import java.time.LocalDateTime; | 13 | import java.time.LocalDateTime; |
| 15 | 14 | ||
| 16 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | 15 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/IotDeviceRespVO.java
| @@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty; | @@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty; | ||
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| 7 | 7 | ||
| 8 | -import java.math.BigDecimal; | ||
| 9 | import java.time.LocalDateTime; | 8 | import java.time.LocalDateTime; |
| 10 | 9 | ||
| 11 | @Schema(description = "管理后台 - IoT 设备 Response VO") | 10 | @Schema(description = "管理后台 - IoT 设备 Response VO") |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/thingModel/ThingModelRespVO.java
| @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingMod | @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingMod | ||
| 3 | import lombok.*; | 3 | import lombok.*; |
| 4 | 4 | ||
| 5 | import java.util.List; | 5 | import java.util.List; |
| 6 | -import java.util.Map; | ||
| 7 | 6 | ||
| 8 | @Data | 7 | @Data |
| 9 | @Builder | 8 | @Builder |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/vo/IotThinkModelFunctionRespVO.java
| @@ -9,7 +9,6 @@ import io.swagger.v3.oas.annotations.media.Schema; | @@ -9,7 +9,6 @@ import io.swagger.v3.oas.annotations.media.Schema; | ||
| 9 | import lombok.Data; | 9 | import lombok.Data; |
| 10 | 10 | ||
| 11 | import java.time.LocalDateTime; | 11 | import java.time.LocalDateTime; |
| 12 | -import java.util.List; | ||
| 13 | 12 | ||
| 14 | @Schema(description = "管理后台 - IoT 产品物模型 Response VO") | 13 | @Schema(description = "管理后台 - IoT 产品物模型 Response VO") |
| 15 | @Data | 14 | @Data |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/FieldParser.java
| 1 | package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine; | 1 | package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine; |
| 2 | 2 | ||
| 3 | - | ||
| 4 | import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelProperty; | 3 | import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelProperty; |
| 5 | import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelRespVO; | 4 | import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelRespVO; |
| 6 | import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.dataType.ThingModelDataType; | 5 | import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.dataType.ThingModelDataType; |
| @@ -9,21 +8,26 @@ import java.util.HashMap; | @@ -9,21 +8,26 @@ import java.util.HashMap; | ||
| 9 | import java.util.List; | 8 | import java.util.List; |
| 10 | import java.util.stream.Collectors; | 9 | import java.util.stream.Collectors; |
| 11 | 10 | ||
| 11 | +/** | ||
| 12 | + * FieldParser 类用于解析和转换物模型字段到 TDengine 字段 | ||
| 13 | + * | ||
| 14 | + */ | ||
| 12 | public class FieldParser { | 15 | public class FieldParser { |
| 13 | 16 | ||
| 14 | /** | 17 | /** |
| 15 | * 物模型到td数据类型映射 | 18 | * 物模型到td数据类型映射 |
| 16 | */ | 19 | */ |
| 17 | - private static final HashMap<String, String> TYPE_MAPPING = new HashMap<>() {{ | ||
| 18 | - put("INT", "INT"); | ||
| 19 | - put("FLOAT", "FLOAT"); | ||
| 20 | - put("DOUBLE", "DOUBLE"); | ||
| 21 | - put("BOOL", "BOOL"); | ||
| 22 | - put("ENUM", "NCHAR"); | ||
| 23 | - put("TEXT", "NCHAR"); | ||
| 24 | - put("DATE", "NCHAR"); | ||
| 25 | - }}; | ||
| 26 | - | 20 | + private static final HashMap<String, String> TYPE_MAPPING = new HashMap<>() { |
| 21 | + { | ||
| 22 | + put("INT", "INT"); | ||
| 23 | + put("FLOAT", "FLOAT"); | ||
| 24 | + put("DOUBLE", "DOUBLE"); | ||
| 25 | + put("BOOL", "BOOL"); | ||
| 26 | + put("ENUM", "NCHAR"); | ||
| 27 | + put("TEXT", "NCHAR"); | ||
| 28 | + put("DATE", "NCHAR"); | ||
| 29 | + } | ||
| 30 | + }; | ||
| 27 | 31 | ||
| 28 | /** | 32 | /** |
| 29 | * 将物模型字段转换为td字段 | 33 | * 将物模型字段转换为td字段 |
| @@ -57,9 +61,8 @@ public class FieldParser { | @@ -57,9 +61,8 @@ public class FieldParser { | ||
| 57 | /** | 61 | /** |
| 58 | * 将从库中查出来的字段信息转换为td字段对象 | 62 | * 将从库中查出来的字段信息转换为td字段对象 |
| 59 | */ | 63 | */ |
| 60 | - public static List<TdField> parse(List rows) { | ||
| 61 | - return (List<TdField>) rows.stream().map((r) -> { | ||
| 62 | - List row = (List) r; | 64 | + public static List<TdField> parse(List<List<Object>> rows) { |
| 65 | + return rows.stream().map(row -> { | ||
| 63 | String type = row.get(1).toString().toUpperCase(); | 66 | String type = row.get(1).toString().toUpperCase(); |
| 64 | return new TdField( | 67 | return new TdField( |
| 65 | row.get(0).toString(), | 68 | row.get(0).toString(), |
| @@ -72,9 +75,9 @@ public class FieldParser { | @@ -72,9 +75,9 @@ public class FieldParser { | ||
| 72 | * 获取字段字义 | 75 | * 获取字段字义 |
| 73 | */ | 76 | */ |
| 74 | public static String getFieldDefine(TdField field) { | 77 | public static String getFieldDefine(TdField field) { |
| 75 | - return "`" + field.getName() + "`" + " " + (field.getLength() > 0 ? | ||
| 76 | - String.format("%s(%d)", field.getType(), field.getLength()) | ||
| 77 | - : field.getType()); | 78 | + return "`" + field.getName() + "`" + " " |
| 79 | + + (field.getLength() > 0 ? String.format("%s(%d)", field.getType(), field.getLength()) | ||
| 80 | + : field.getType()); | ||
| 78 | } | 81 | } |
| 79 | 82 | ||
| 80 | } | 83 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableData.java
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableManager.java
| @@ -2,6 +2,9 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine; | @@ -2,6 +2,9 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine; | ||
| 2 | 2 | ||
| 3 | import java.util.List; | 3 | import java.util.List; |
| 4 | 4 | ||
| 5 | +/** | ||
| 6 | + * TableManager 类用于管理 TDengine 表的创建、删除和结构信息获取 | ||
| 7 | + */ | ||
| 5 | public class TableManager { | 8 | public class TableManager { |
| 6 | 9 | ||
| 7 | /** | 10 | /** |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TdResponse.java
| @@ -6,6 +6,9 @@ import lombok.NoArgsConstructor; | @@ -6,6 +6,9 @@ import lombok.NoArgsConstructor; | ||
| 6 | 6 | ||
| 7 | import java.util.List; | 7 | import java.util.List; |
| 8 | 8 | ||
| 9 | +/** | ||
| 10 | + * TdResponse 类用于处理 TDengine 的响应 | ||
| 11 | + */ | ||
| 9 | @Data | 12 | @Data |
| 10 | @NoArgsConstructor | 13 | @NoArgsConstructor |
| 11 | @AllArgsConstructor | 14 | @AllArgsConstructor |
| @@ -21,6 +24,6 @@ public class TdResponse { | @@ -21,6 +24,6 @@ public class TdResponse { | ||
| 21 | private String desc; | 24 | private String desc; |
| 22 | 25 | ||
| 23 | //[["time","TIMESTAMP",8,""],["powerstate","TINYINT",1,""],["brightness","INT",4,""],["deviceid","NCHAR",32,"TAG"]] | 26 | //[["time","TIMESTAMP",8,""],["powerstate","TINYINT",1,""],["brightness","INT",4,""],["deviceid","NCHAR",32,"TAG"]] |
| 24 | - private List data; | 27 | + private List<Object[]> data; |
| 25 | 28 | ||
| 26 | } | 29 | } |
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TdRestApi.java
| @@ -7,6 +7,9 @@ import lombok.extern.slf4j.Slf4j; | @@ -7,6 +7,9 @@ import lombok.extern.slf4j.Slf4j; | ||
| 7 | import org.springframework.beans.factory.annotation.Value; | 7 | import org.springframework.beans.factory.annotation.Value; |
| 8 | import org.springframework.stereotype.Service; | 8 | import org.springframework.stereotype.Service; |
| 9 | 9 | ||
| 10 | +/** | ||
| 11 | + * TdRestApi 类用于处理 TDengine 的 REST API 请求 | ||
| 12 | + */ | ||
| 10 | @Slf4j | 13 | @Slf4j |
| 11 | @Service | 14 | @Service |
| 12 | public class TdRestApi { | 15 | public class TdRestApi { |