新增导入信息

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java

@@ -93,14 +93,17 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
                 mesEquipmentVariable.setEquipId(mesEquipment.getEquipId());
                 mesEquipmentVariable.setChannel(mesEquipmentChannel.getChannel());
                 mesEquipmentVariable.setEquipmentCode(mesEquipment.getEquipmentCode());
-                mesEquipmentVariable.setTagName(String.valueOf(objects.get(0)));
+                mesEquipmentVariable.setTagName(String.valueOf(objectMap.get("Tag Name")));
-                mesEquipmentVariable.setTagAddress(String.valueOf(objects.get(1)));
+                mesEquipmentVariable.setTagAddress(String.valueOf(objectMap.get("Address")));
-                mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.descriptionOfValue(String.valueOf(objects.get(2))));
+                mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.descriptionOfValue(String.valueOf(objectMap.get("Data Type"))));
-                mesEquipmentVariable.setVariableType(Integer.parseInt(objects.get(3) + ""));
+                if ("R/W".equals(objectMap.get("Client Access").toString())) {
-                mesEquipmentVariable.setReadWriteFlag(MesExtEnumUtil.READ_WRITE_FLAG.descriptionOfValue(String.valueOf(objects.get(4))));
+                    mesEquipmentVariable.setReadWriteFlag(MesExtEnumUtil.READ_WRITE_FLAG.READ_WRITE.getValue());
-                mesEquipmentVariable.setScanInterval(Integer.valueOf(String.valueOf(objects.get(5))));
+                } else if ("RO".equals(objectMap.get("Client Access").toString())) {
-                mesEquipmentVariable.setScanInterval(Integer.valueOf(String.valueOf(objects.get(5))));
+                    mesEquipmentVariable.setReadWriteFlag(MesExtEnumUtil.READ_WRITE_FLAG.READ.getValue());
-                mesEquipmentVariable.setDescription(String.valueOf(objects.get(15)));
+                }
+                mesEquipmentVariable.setVariableType(Integer.parseInt(String.valueOf(objectMap.get("Respect Data Type"))));
+                mesEquipmentVariable.setScanInterval(Integer.valueOf(String.valueOf(objectMap.get("Scan Rate"))));
+                mesEquipmentVariable.setDescription(String.valueOf(objectMap.get("Description")));
                 mesEquipmentVariable.setOrganizeCode(organizeCode);
                 ConvertBean.serviceModelInitialize(mesEquipmentVariable, userName);
                 mesEquipmentVariables.add(mesEquipmentVariable);