From e4a029429f0da7edd45c7c2d2bdd5d9579ef78db Mon Sep 17 00:00:00 2001 From: huguanghan Date: Tue, 19 Nov 2024 16:07:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=96=B0=E5=A2=9Elevel=E5=91=8A=E8=AD=A6=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/equipment/domain/dto/SysIotModelFieldDto.java | 2 ++ .../equipment/domain/excel/SysIotModelFieldExcel.java | 1 + .../das/modules/equipment/domain/vo/SysIotModelFieldVo.java | 2 ++ .../com/das/modules/equipment/entity/SysIotModelField.java | 6 ++++++ .../equipment/service/impl/SysIotModelServiceImpl.java | 2 ++ 5 files changed, 13 insertions(+) diff --git a/das/src/main/java/com/das/modules/equipment/domain/dto/SysIotModelFieldDto.java b/das/src/main/java/com/das/modules/equipment/domain/dto/SysIotModelFieldDto.java index a800f88d..93db7246 100644 --- a/das/src/main/java/com/das/modules/equipment/domain/dto/SysIotModelFieldDto.java +++ b/das/src/main/java/com/das/modules/equipment/domain/dto/SysIotModelFieldDto.java @@ -73,5 +73,7 @@ public class SysIotModelFieldDto implements Serializable { */ private String unit; + private Integer level; + } diff --git a/das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelFieldExcel.java b/das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelFieldExcel.java index 86717758..3d272ef7 100644 --- a/das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelFieldExcel.java +++ b/das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelFieldExcel.java @@ -65,5 +65,6 @@ public class SysIotModelFieldExcel { */ private String unit; + private Integer level; } diff --git a/das/src/main/java/com/das/modules/equipment/domain/vo/SysIotModelFieldVo.java b/das/src/main/java/com/das/modules/equipment/domain/vo/SysIotModelFieldVo.java index 56c4ca55..9f72e637 100644 --- a/das/src/main/java/com/das/modules/equipment/domain/vo/SysIotModelFieldVo.java +++ b/das/src/main/java/com/das/modules/equipment/domain/vo/SysIotModelFieldVo.java @@ -66,4 +66,6 @@ public class SysIotModelFieldVo { */ private String unit; + private Integer level; + } diff --git a/das/src/main/java/com/das/modules/equipment/entity/SysIotModelField.java b/das/src/main/java/com/das/modules/equipment/entity/SysIotModelField.java index 58e87492..3180601c 100644 --- a/das/src/main/java/com/das/modules/equipment/entity/SysIotModelField.java +++ b/das/src/main/java/com/das/modules/equipment/entity/SysIotModelField.java @@ -99,4 +99,10 @@ public class SysIotModelField extends BaseEntity { */ @TableField("unit") private String unit; + + /** + * 离散量级别。0 提示;1告警;2 故障 + */ + @TableField("level") + private Integer level; } diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java index 0476b8c3..b9ffc771 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java @@ -304,6 +304,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { map.put("dataType", "*数据类型"); map.put("visible", "是否可见（0：不可见，1：可见）"); map.put("highSpeed", "*属性频度（0低频属性，1高频属性）"); + map.put("level","离散量级别:0提示;1告警;2故障"); sheetDTO.setSheetName("物模型属性"); sheetDTO.setFieldAndAlias(map); sheetDTO.setCollection(sysIotModelFieldVoList); @@ -517,6 +518,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { field.setDataType(row.get(9).toString()); field.setVisible(ObjectUtil.isEmpty(row.get(10)) ? null : Integer.valueOf(row.get(10).toString())); field.setHighSpeed(Integer.valueOf(row.get(11).toString())); + field.setLevel(ObjectUtil.isEmpty(row.get(12)) ? null : Integer.valueOf(row.get(12).toString())); field.setIotModelId(Long.valueOf(iotModelId)); }