From a2731249a4adcfb61fdf1911ace3cf7baa93d29f Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Thu, 29 Aug 2024 15:53:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=85=A5=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/MesEquipmentVariableService.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java
index 63e0386..1b79acd 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java
+++ b/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.setTagAddress(String.valueOf(objects.get(1)));
-                mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.descriptionOfValue(String.valueOf(objects.get(2))));
-                mesEquipmentVariable.setVariableType(Integer.parseInt(objects.get(3) + ""));
-                mesEquipmentVariable.setReadWriteFlag(MesExtEnumUtil.READ_WRITE_FLAG.descriptionOfValue(String.valueOf(objects.get(4))));
-                mesEquipmentVariable.setScanInterval(Integer.valueOf(String.valueOf(objects.get(5))));
-                mesEquipmentVariable.setScanInterval(Integer.valueOf(String.valueOf(objects.get(5))));
-                mesEquipmentVariable.setDescription(String.valueOf(objects.get(15)));
+                mesEquipmentVariable.setTagName(String.valueOf(objectMap.get("Tag Name")));
+                mesEquipmentVariable.setTagAddress(String.valueOf(objectMap.get("Address")));
+                mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.descriptionOfValue(String.valueOf(objectMap.get("Data Type"))));
+                if ("R/W".equals(objectMap.get("Client Access").toString())) {
+                    mesEquipmentVariable.setReadWriteFlag(MesExtEnumUtil.READ_WRITE_FLAG.READ_WRITE.getValue());
+                } else if ("RO".equals(objectMap.get("Client Access").toString())) {
+                    mesEquipmentVariable.setReadWriteFlag(MesExtEnumUtil.READ_WRITE_FLAG.READ.getValue());
+                }
+                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);