物理模型属性,增加(单位)字段;

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;
 
 
 }

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;
+
 
 }

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;
 
 }

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;
 }

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.setUnit(row.get(6).toString());
-        field.setSubSystem(row.get(7).toString());
+        field.setPorder(Integer.valueOf(row.get(7).toString()));
-        field.setDataType(row.get(8).toString());
+        field.setSubSystem(row.get(8).toString());
-        field.setVisible(Integer.valueOf(row.get(9).toString()));
+        field.setDataType(row.get(9).toString());
-        field.setHighSpeed(Integer.valueOf(row.get(10).toString()));
+        field.setVisible(Integer.valueOf(row.get(10).toString()));
+        field.setHighSpeed(Integer.valueOf(row.get(11).toString()));
         field.setIotModelId(Long.valueOf(iotModelId));
     }
 

das/src/main/resources/mapper/SysIotModelFieldMapper.xml

@@ -10,6 +10,7 @@
         <result property="revision" column="revision" jdbcType="INTEGER"/>
         <result property="id" column="id" jdbcType="BIGINT"/>
         <result property="iotModelId" column="iot_model_id" jdbcType="BIGINT"/>
+        <result property="unit" column="unit" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="querySysIotModelFieldList" resultMap="SysIotModelFieldMap">

das/src/main/resources/mapper/SysIotModelMapper.xml

@@ -23,6 +23,7 @@
         <result property="subSystem" column="subsystem" jdbcType="VARCHAR"/>
         <result property="dataType" column="datatype" jdbcType="VARCHAR"/>
         <result property="visible" column="visible" jdbcType="INTEGER"/>
+        <result property="unit" column="unit" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap type="com.das.modules.equipment.domain.vo.SysIotModelVo" id="SysIotModelMap">