BJ_ZTEITS-Developers / parking-cloud-yudao

Commit ea8dd67e9ecc34e7e8af3402f00c819d53f5130a

Authored by 安浩浩
1 parent 61a0c052

【代码优化】增加注解

Inline Side-by-side
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
  View file @ea8dd67
... ... @@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode;
10 10 import lombok.ToString;
11 11 import org.springframework.format.annotation.DateTimeFormat;
12 12  
13   -import java.math.BigDecimal;
14 13 import java.time.LocalDateTime;
15 14  
16 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
  View file @ea8dd67
... ... @@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
5 5 import io.swagger.v3.oas.annotations.media.Schema;
6 6 import lombok.Data;
7 7  
8   -import java.math.BigDecimal;
9 8 import java.time.LocalDateTime;
10 9  
11 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
  View file @ea8dd67
... ... @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingMod
3 3 import lombok.*;
4 4  
5 5 import java.util.List;
6   -import java.util.Map;
7 6  
8 7 @Data
9 8 @Builder
... ...
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/vo/IotThinkModelFunctionRespVO.java
  View file @ea8dd67
... ... @@ -9,7 +9,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
9 9 import lombok.Data;
10 10  
11 11 import java.time.LocalDateTime;
12   -import java.util.List;
13 12  
14 13 @Schema(description = "管理后台 - IoT 产品物模型 Response VO")
15 14 @Data
... ...
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/FieldParser.java
  View file @ea8dd67
1 1 package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine;
2 2  
3   -
4 3 import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelProperty;
5 4 import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelRespVO;
6 5 import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.dataType.ThingModelDataType;
... ... @@ -9,21 +8,26 @@ import java.util.HashMap;
9 8 import java.util.List;
10 9 import java.util.stream.Collectors;
11 10  
  11 +/**
  12 + * FieldParser 类用于解析和转换物模型字段到 TDengine 字段
  13 + *
  14 + */
12 15 public class FieldParser {
13 16  
14 17 /**
15 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 33 * 将物模型字段转换为td字段
... ... @@ -57,9 +61,8 @@ public class FieldParser {
57 61 /**
58 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 66 String type = row.get(1).toString().toUpperCase();
64 67 return new TdField(
65 68 row.get(0).toString(),
... ... @@ -72,9 +75,9 @@ public class FieldParser {
72 75 * 获取字段字义
73 76 */
74 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
  View file @ea8dd67
... ... @@ -4,6 +4,9 @@ import lombok.Data;
4 4  
5 5 import java.util.List;
6 6  
  7 +/**
  8 + * TableData 类用于存储和操作 TDengine 表数据
  9 + */
7 10 @Data
8 11 public class TableData {
9 12  
... ...
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/tdengine/TableManager.java
  View file @ea8dd67
... ... @@ -2,6 +2,9 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine;
2 2  
3 3 import java.util.List;
4 4  
  5 +/**
  6 + * TableManager 类用于管理 TDengine 表的创建、删除和结构信息获取
  7 + */
5 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
  View file @ea8dd67
... ... @@ -6,6 +6,9 @@ import lombok.NoArgsConstructor;
6 6  
7 7 import java.util.List;
8 8  
  9 +/**
  10 + * TdResponse 类用于处理 TDengine 的响应
  11 + */
9 12 @Data
10 13 @NoArgsConstructor
11 14 @AllArgsConstructor
... ... @@ -21,6 +24,6 @@ public class TdResponse {
21 24 private String desc;
22 25  
23 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
  View file @ea8dd67
... ... @@ -7,6 +7,9 @@ import lombok.extern.slf4j.Slf4j;
7 7 import org.springframework.beans.factory.annotation.Value;
8 8 import org.springframework.stereotype.Service;
9 9  
  10 +/**
  11 + * TdRestApi 类用于处理 TDengine 的 REST API 请求
  12 + */
10 13 @Slf4j
11 14 @Service
12 15 public class TdRestApi {
... ...