From 736ae7ebffc261e9a8e2d477975f6c144ca1810e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com>
Date: Mon, 29 Jul 2024 14:09:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java    | 2 ++
 1 file changed, 2 insertions(+)

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 33c6e8c..08e8a23 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
@@ -52,6 +52,8 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
     @Override
     protected void onInsertBean(MesEquipmentVariable item) {
         item.setClientHandle(Integer.parseInt(getClientHandleId(1, item.getOrganizeCode(), item.getCreateUser()).get(0).replace(MesCommonConstant.CLIENT_HANDLE_ID,"")));
+        MesEquipment mesEquipment = getMesEquipment(item.getOrganizeCode(),item.getEquipmentCode());
+        item.setEquipId(mesEquipment.getEquipId());
     }
 
     @Override

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

---
 .../base/MesEquipmentVariableService.java           | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

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 06a5039..63e0386 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
@@ -10,8 +10,10 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
+import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentChannel;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariable;
 import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
+import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentChannelRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentRepository;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -42,6 +44,9 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
     private MesEquipmentRepository equipmentRepository;
 
     @Autowired
+    private MesEquipmentChannelRepository equipmentChannelRepository;
+
+    @Autowired
     private ISyncFuncService syncFuncService;
 
     protected void setPackQueryBean(MesEquipmentVariable bean, DdlPackBean packBean) {
@@ -78,18 +83,24 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
     @Override
     public void addMesEquipmentVariable(List<Map<String, Object>> mapList,String equipmentCode, String userName, String organizeCode) {
         MesEquipment mesEquipment = getMesEquipment(organizeCode,equipmentCode);
+        MesEquipmentChannel mesEquipmentChannel = getMesEquipmentChannel(organizeCode,equipmentCode);
+
         List<MesEquipmentVariable> mesEquipmentVariables = new ArrayList<>();
         for (Map<String, Object> objectMap : mapList) {
             List<Object> objects = Arrays.asList(objectMap.values().toArray());
             try {
                 MesEquipmentVariable mesEquipmentVariable = new MesEquipmentVariable();
                 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.setOrganizeCode(organizeCode);
                 ConvertBean.serviceModelInitialize(mesEquipmentVariable, userName);
                 mesEquipmentVariables.add(mesEquipmentVariable);
@@ -139,5 +150,13 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
         }
         return mesEquipment;
     }
-
+    private MesEquipmentChannel getMesEquipmentChannel(String organizeCode,String equipmentCode) {
+        DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(equipmentCode, "equipmentCode", seriesPackBean);
+        MesEquipmentChannel mesEquipmentChannel = equipmentChannelRepository.getByProperty(seriesPackBean);
+        if(Objects.isNull(mesEquipmentChannel)){
+            MesException.throwMesBusiException("设备通道信息【%s】信息不存在",equipmentCode);
+        }
+        return mesEquipmentChannel;
+    }
 }