【代码优化】增加注解
This commit is contained in:
parent
61a0c05279
commit
ea8dd67e9e
|
@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||||
|
|
|
@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Schema(description = "管理后台 - IoT 设备 Response VO")
|
@Schema(description = "管理后台 - IoT 设备 Response VO")
|
||||||
|
|
|
@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingMod
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Builder
|
@Builder
|
||||||
|
|
|
@ -9,7 +9,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Schema(description = "管理后台 - IoT 产品物模型 Response VO")
|
@Schema(description = "管理后台 - IoT 产品物模型 Response VO")
|
||||||
@Data
|
@Data
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine;
|
package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine;
|
||||||
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelProperty;
|
import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelProperty;
|
||||||
import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelRespVO;
|
import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.ThingModelRespVO;
|
||||||
import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.dataType.ThingModelDataType;
|
import cn.iocoder.yudao.module.iot.controller.admin.thinkmodelfunction.thingModel.dataType.ThingModelDataType;
|
||||||
|
@ -9,21 +8,26 @@ import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* FieldParser 类用于解析和转换物模型字段到 TDengine 字段
|
||||||
|
*
|
||||||
|
*/
|
||||||
public class FieldParser {
|
public class FieldParser {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 物模型到td数据类型映射
|
* 物模型到td数据类型映射
|
||||||
*/
|
*/
|
||||||
private static final HashMap<String, String> TYPE_MAPPING = new HashMap<>() {{
|
private static final HashMap<String, String> TYPE_MAPPING = new HashMap<>() {
|
||||||
put("INT", "INT");
|
{
|
||||||
put("FLOAT", "FLOAT");
|
put("INT", "INT");
|
||||||
put("DOUBLE", "DOUBLE");
|
put("FLOAT", "FLOAT");
|
||||||
put("BOOL", "BOOL");
|
put("DOUBLE", "DOUBLE");
|
||||||
put("ENUM", "NCHAR");
|
put("BOOL", "BOOL");
|
||||||
put("TEXT", "NCHAR");
|
put("ENUM", "NCHAR");
|
||||||
put("DATE", "NCHAR");
|
put("TEXT", "NCHAR");
|
||||||
}};
|
put("DATE", "NCHAR");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 将物模型字段转换为td字段
|
* 将物模型字段转换为td字段
|
||||||
|
@ -57,9 +61,8 @@ public class FieldParser {
|
||||||
/**
|
/**
|
||||||
* 将从库中查出来的字段信息转换为td字段对象
|
* 将从库中查出来的字段信息转换为td字段对象
|
||||||
*/
|
*/
|
||||||
public static List<TdField> parse(List rows) {
|
public static List<TdField> parse(List<List<Object>> rows) {
|
||||||
return (List<TdField>) rows.stream().map((r) -> {
|
return rows.stream().map(row -> {
|
||||||
List row = (List) r;
|
|
||||||
String type = row.get(1).toString().toUpperCase();
|
String type = row.get(1).toString().toUpperCase();
|
||||||
return new TdField(
|
return new TdField(
|
||||||
row.get(0).toString(),
|
row.get(0).toString(),
|
||||||
|
@ -72,9 +75,9 @@ public class FieldParser {
|
||||||
* 获取字段字义
|
* 获取字段字义
|
||||||
*/
|
*/
|
||||||
public static String getFieldDefine(TdField field) {
|
public static String getFieldDefine(TdField field) {
|
||||||
return "`" + field.getName() + "`" + " " + (field.getLength() > 0 ?
|
return "`" + field.getName() + "`" + " "
|
||||||
String.format("%s(%d)", field.getType(), field.getLength())
|
+ (field.getLength() > 0 ? String.format("%s(%d)", field.getType(), field.getLength())
|
||||||
: field.getType());
|
: field.getType());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,9 @@ import lombok.Data;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TableData 类用于存储和操作 TDengine 表数据
|
||||||
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class TableData {
|
public class TableData {
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,9 @@ package cn.iocoder.yudao.module.iot.dal.dataobject.tdengine;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TableManager 类用于管理 TDengine 表的创建、删除和结构信息获取
|
||||||
|
*/
|
||||||
public class TableManager {
|
public class TableManager {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -6,6 +6,9 @@ import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TdResponse 类用于处理 TDengine 的响应
|
||||||
|
*/
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
@ -21,6 +24,6 @@ public class TdResponse {
|
||||||
private String desc;
|
private String desc;
|
||||||
|
|
||||||
//[["time","TIMESTAMP",8,""],["powerstate","TINYINT",1,""],["brightness","INT",4,""],["deviceid","NCHAR",32,"TAG"]]
|
//[["time","TIMESTAMP",8,""],["powerstate","TINYINT",1,""],["brightness","INT",4,""],["deviceid","NCHAR",32,"TAG"]]
|
||||||
private List data;
|
private List<Object[]> data;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,9 @@ import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TdRestApi 类用于处理 TDengine 的 REST API 请求
|
||||||
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
public class TdRestApi {
|
public class TdRestApi {
|
||||||
|
|
Loading…
Reference in New Issue