fix modbus点位属性-顺序,处理公式
parent
bdee6f4653
commit
00c2f1ae30
|
@ -3518,28 +3518,6 @@
|
|||
"icon" : "",
|
||||
"remark" : null,
|
||||
"children" : [ ]
|
||||
} , {
|
||||
"createDept" : null,
|
||||
"createBy" : null,
|
||||
"createTime" : 1709365727999,
|
||||
"updateBy" : null,
|
||||
"updateTime" : 1709365772669,
|
||||
"id" : 521131319332933,
|
||||
"menuName" : "设备分组详情",
|
||||
"parentId" : 2200,
|
||||
"orderNum" : 17,
|
||||
"path" : "deviceGroupDetail/:id",
|
||||
"component" : "iot/equipment/devices/deviceGroupDetail",
|
||||
"queryParam" : null,
|
||||
"isFrame" : "1",
|
||||
"isCache" : "1",
|
||||
"menuType" : "C",
|
||||
"visible" : "1",
|
||||
"status" : "0",
|
||||
"perms" : "iot:device:query",
|
||||
"icon" : "",
|
||||
"remark" : null,
|
||||
"children" : [ ]
|
||||
} , {
|
||||
"createDept" : null,
|
||||
"createBy" : null,
|
||||
|
|
|
@ -79,8 +79,11 @@ public class ModbusThingModel extends TenantModel implements Id<Long>, Serializa
|
|||
private Integer regAddr;
|
||||
//寄存器数量
|
||||
private Integer regNum;
|
||||
// * 处理公式
|
||||
private String processor;
|
||||
//数据顺序
|
||||
/**
|
||||
* 处理公式
|
||||
|
||||
* [
|
||||
* { value: 'AB', },
|
||||
* { value: 'BA', },
|
||||
|
@ -90,9 +93,7 @@ public class ModbusThingModel extends TenantModel implements Id<Long>, Serializa
|
|||
* { value: 'BA DC', },
|
||||
* ]
|
||||
*/
|
||||
private String processor;
|
||||
//数据顺序
|
||||
private Integer sort;
|
||||
private String sort;
|
||||
|
||||
private ModbusThingModel.DataType dataType;
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ public class ModbusThingModelImportVo implements Serializable {
|
|||
private String unit;
|
||||
//数据顺序
|
||||
@ExcelProperty(value = "数据顺序")
|
||||
private Integer sort;
|
||||
private String sort;
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue