diff --git a/data/init/sys_menu.json b/data/init/sys_menu.json index 891ff825..33036705 100644 --- a/data/init/sys_menu.json +++ b/data/init/sys_menu.json @@ -3518,29 +3518,7 @@ "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, "createTime" : 1709365727999, diff --git a/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/modbus/ModbusThingModel.java b/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/modbus/ModbusThingModel.java index ee7eda86..e66f221d 100644 --- a/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/modbus/ModbusThingModel.java +++ b/iot-dao/iot-data-model/src/main/java/cc/iotkit/model/modbus/ModbusThingModel.java @@ -79,8 +79,11 @@ public class ModbusThingModel extends TenantModel implements Id, 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, Serializa * { value: 'BA DC', }, * ] */ - private String processor; - //数据顺序 - private Integer sort; + private String sort; private ModbusThingModel.DataType dataType; diff --git a/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/dto/vo/modbus/ModbusThingModelImportVo.java b/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/dto/vo/modbus/ModbusThingModelImportVo.java index 46772c23..bd020ff8 100644 --- a/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/dto/vo/modbus/ModbusThingModelImportVo.java +++ b/iot-module/iot-modbus/src/main/java/cc/iotkit/modbus/dto/vo/modbus/ModbusThingModelImportVo.java @@ -54,7 +54,7 @@ public class ModbusThingModelImportVo implements Serializable { private String unit; //数据顺序 @ExcelProperty(value = "数据顺序") - private Integer sort; + private String sort; }