Преглед изворни кода

feat(equipmentParam, equipment): 优化导入导出

wangpx пре 7 месеци
родитељ
комит
904cda7cbd

+ 3 - 3
admin/src/main/java/com/dcs/hnyz/domain/EquipmentParam.java

@@ -67,7 +67,7 @@ public class EquipmentParam extends BaseEntity {
     /**
      * 设备数据类型(布尔型,浮点型,整型)
      */
-    @Excel(name = "设备数据类型(布尔型,浮点型,整型)")
+    @Excel(name = "设备数据类型(1布尔型,2浮点型,3整型)")
     @ApiModelProperty(value = "设备数据类型(1布尔型,2浮点型,3整型)")
     private String dataType;
 
@@ -82,8 +82,8 @@ public class EquipmentParam extends BaseEntity {
      * 寄存器类型(只读,保持,线圈)
      * 对应 OPCUA namespaceIndex 命名空间索引
      */
-    @Excel(name = "寄存器类型(只读,保持,线圈)")
-    @ApiModelProperty(value = "寄存器类型(3只读,4保持,1线圈)")
+    @Excel(name = "modbus寄存器类型(3只读,4保持,1线圈) OPCUA namespaceIndex 命名空间索引")
+    @ApiModelProperty(value = "modbus寄存器类型(3只读,4保持,1线圈) OPCUA namespaceIndex 命名空间索引")
     private String registerCode;
 
     /**

+ 0 - 2
admin/src/main/java/com/dcs/hnyz/service/impl/EquipmentServiceImpl.java

@@ -473,8 +473,6 @@ public class EquipmentServiceImpl implements IEquipmentService {
                 Equipment e = equipmentMapper.selectOne(new QueryWrapper<Equipment>().eq("code", equipmentFormVO.getCode()));
                 Equipment equipment = new Equipment();
                 BeanUtils.copyProperties(equipmentFormVO, equipment);
-                // TODO 获取设备类型字符串查询设备类型库 填充相应的设备类型 id
-                // TODO 模糊查询设备流程和页面 填充相应的流程和页面 id 没有命中需返回消息提示无页面
                 // 识别设备的PLC
                 if (equipmentFormVO.getIpAddress() != null && equipmentFormVO.getPort() != null) {
                     Long plcInfoId = plcMap.get(equipmentFormVO.getIpAddress() + ":" + equipmentFormVO.getPort());