sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
fengrong 2024-11-19 16:18:33 +08:00
commit 34508835da
5 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
das/src/main/java/com/das/modules/equipment/domain/dto/SysIotModelFieldDto.java
View File

@ -73,5 +73,7 @@ public class SysIotModelFieldDto implements Serializable {
*/ */
private String unit; private String unit;
private Integer level;
} }

1
das/src/main/java/com/das/modules/equipment/domain/excel/SysIotModelFieldExcel.java
View File

@ -65,5 +65,6 @@ public class SysIotModelFieldExcel {
*/ */
private String unit; private String unit;
private Integer level;
} }

2
das/src/main/java/com/das/modules/equipment/domain/vo/SysIotModelFieldVo.java
View File

@ -66,4 +66,6 @@ public class SysIotModelFieldVo {
*/ */
private String unit; private String unit;
private Integer level;
} }

6
das/src/main/java/com/das/modules/equipment/entity/SysIotModelField.java
View File

@ -99,4 +99,10 @@ public class SysIotModelField extends BaseEntity {
*/ */
@TableField("unit") @TableField("unit")
private String unit; private String unit;
/**
* 离散量级别。0 提示;1告警;2 故障
*/
@TableField("level")
private Integer level;
} }

2
das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
View File

@ -304,6 +304,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
map.put("dataType", "*数据类型"); map.put("dataType", "*数据类型");
map.put("visible", "是否可见（0：不可见，1：可见）"); map.put("visible", "是否可见（0：不可见，1：可见）");
map.put("highSpeed", "*属性频度（0低频属性，1高频属性）"); map.put("highSpeed", "*属性频度（0低频属性，1高频属性）");
map.put("level","离散量级别:0提示;1告警;2故障");
sheetDTO.setSheetName("物模型属性"); sheetDTO.setSheetName("物模型属性");
sheetDTO.setFieldAndAlias(map); sheetDTO.setFieldAndAlias(map);
sheetDTO.setCollection(sysIotModelFieldVoList); sheetDTO.setCollection(sysIotModelFieldVoList);
@ -517,6 +518,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
field.setDataType(row.get(9).toString()); field.setDataType(row.get(9).toString());
field.setVisible(ObjectUtil.isEmpty(row.get(10)) ? null : Integer.valueOf(row.get(10).toString())); field.setVisible(ObjectUtil.isEmpty(row.get(10)) ? null : Integer.valueOf(row.get(10).toString()));
field.setHighSpeed(Integer.valueOf(row.get(11).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)); field.setIotModelId(Long.valueOf(iotModelId));
} }