From 96cea9636e90a6f4b450e0a74562ff29db78ba0c Mon Sep 17 00:00:00 2001 From: yu Date: Thu, 24 Oct 2024 10:11:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E7=90=86=E6=A8=A1=E5=9E=8B=E5=B1=9E?= =?UTF-8?q?=E6=80=A7,=E5=A2=9E=E5=8A=A0(=E5=8D=95=E4=BD=8D)=E5=AD=97?= =?UTF-8?q?=E6=AE=B5;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/dto/SysIotModelFieldDto.java | 4 ++++ .../domain/excel/SysIotModelFieldExcel.java | 5 +++++ .../domain/vo/SysIotModelFieldVo.java | 21 +++++++++++++++---- .../equipment/entity/SysIotModelField.java | 6 ++++++ .../service/impl/SysIotModelServiceImpl.java | 12 ++++++----- .../mapper/SysIotModelFieldMapper.xml | 1 + .../resources/mapper/SysIotModelMapper.xml | 1 + 7 files changed, 41 insertions(+), 9 deletions(-) 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 9d081a3d..a800f88d 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 @@ -68,6 +68,10 @@ public class SysIotModelFieldDto implements Serializable { private String orderColumn; private String orderType; + /** + * 单位 + */ + private String unit; } 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 7cd599fe..86717758 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 @@ -60,5 +60,10 @@ public class SysIotModelFieldExcel { * 是否可见 */ private Integer visible; + /** + * 单位 + */ + private String unit; + } 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 cc510347..56c4ca55 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 @@ -44,13 +44,26 @@ public class SysIotModelFieldVo { private Integer porder; private Integer revision; - + /** + * 属性频度：0低频属性，1高频属性 + */ private Integer highSpeed; - + /** + * 子系统 + */ private String subSystem; - + /** + * 数据类型:int4,int8;float4;float8 + */ private String dataType; - + /** + * 是否可见：0不可见，1可见 + */ private Integer visible; + /** + * + * 单位 + */ + private String unit; } 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 6f5409ea..58e87492 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 @@ -93,4 +93,10 @@ public class SysIotModelField extends BaseEntity { */ @TableField("visible") private Integer visible; + + /** + * 单位 + */ + @TableField("unit") + private String unit; } 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 cddb1293..ba0b63e7 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 @@ -284,6 +284,7 @@ public class SysIotModelServiceImpl implements SysIotModelService { map.put("attributeCode", "*物模型属性编码"); map.put("attributeName", "*物模型属性名称"); map.put("attributeType", "*属性类型（138：模拟量，139：累积量，140：离散量）"); + map.put("unit", "单位"); map.put("porder", "*测点序号"); map.put("subSystem", "子系統"); map.put("dataType", "数据类型"); @@ -453,11 +454,12 @@ public class SysIotModelServiceImpl implements SysIotModelService { field.setAttributeCode(row.get(3).toString().toLowerCase()); field.setAttributeName(row.get(4).toString()); field.setAttributeType(Integer.valueOf(row.get(5).toString())); - field.setPorder(Integer.valueOf(row.get(6).toString())); - field.setSubSystem(row.get(7).toString()); - field.setDataType(row.get(8).toString()); - field.setVisible(Integer.valueOf(row.get(9).toString())); - field.setHighSpeed(Integer.valueOf(row.get(10).toString())); + field.setUnit(row.get(6).toString()); + field.setPorder(Integer.valueOf(row.get(7).toString())); + field.setSubSystem(row.get(8).toString()); + field.setDataType(row.get(9).toString()); + field.setVisible(Integer.valueOf(row.get(10).toString())); + field.setHighSpeed(Integer.valueOf(row.get(11).toString())); field.setIotModelId(Long.valueOf(iotModelId)); } diff --git a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml index 4f92fa5d..1468de4a 100644 --- a/das/src/main/resources/mapper/SysIotModelFieldMapper.xml +++ b/das/src/main/resources/mapper/SysIotModelFieldMapper.xml @@ -10,6 +10,7 @@ +