From 7930cd4734ca99902760fcd6c035dd6217db31c0 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Fri, 30 Aug 2024 14:34:46 +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

---
 .../mes/api/base/IMesEquipmentVariableService.java |  2 +-
 .../mes/apiservice/aspect/MesRepositoryAspect.java |  2 +-
 .../base/MesEquipmentVariableController.java       |  4 +--
 .../base/MesEquipmentVariableService.java          | 37 ++++++++++++++++++++--
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquipmentVariableService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquipmentVariableService.java
index deac71b..efde2cb 100644
--- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquipmentVariableService.java
+++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquipmentVariableService.java
@@ -16,6 +16,6 @@ import java.util.Map;
 public interface IMesEquipmentVariableService extends IBaseMesService<MesEquipmentVariable> {
 
     @ApiModelProperty("设备变量导入")
-    void addMesEquipmentVariable(List<Map<String, Object>> mapList, String equipmentCode, String userName, String organizeCode);
+    void addMesEquipmentVariable(List<Map<String, Object>> mapList, String equipmentCode, String userName, String organizeCode, String device);
 
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java
index ba27a9e..8985545 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java
@@ -24,7 +24,7 @@ import java.util.List;
  * @CreateDate 2024/6/27 10:10
  * @Modify:
  **/
-@ConditionalOnExpression("'${mes.aspect.repository:false}' == 'true'")
+@ConditionalOnExpression("'${mes.aspect.repository:true}' == 'true'")
 @Aspect
 @Configuration
 public class MesRepositoryAspect {
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentVariableController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentVariableController.java
index 6532802..0a62003 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentVariableController.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentVariableController.java
@@ -33,7 +33,7 @@ public class MesEquipmentVariableController extends BaseMesController<MesEquipme
 
     @PostMapping(value = "/import-csv")
     @ApiOperation(value = "导入数据CSV")
-    public ResultBean importMesWorkOrderExcel(@RequestParam("file") MultipartFile file, @RequestParam("equipmentCode") String equipmentCode) {
+    public ResultBean importMesWorkOrderExcel(@RequestParam("file") MultipartFile file, @RequestParam("equipmentCode") String equipmentCode,@RequestParam("device") String device) {
         try {
             //导入csv文件
             List<Map<String, Object>> mapList = CsvImportUtil.csvImports(file);
@@ -42,7 +42,7 @@ public class MesEquipmentVariableController extends BaseMesController<MesEquipme
             }
             String userName = AuthUtil.getSessionUser().getUserName();
             String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
-            mesEquipmentVariableService.addMesEquipmentVariable(mapList, equipmentCode, userName, organizeCode);
+            mesEquipmentVariableService.addMesEquipmentVariable(mapList, equipmentCode, userName, organizeCode, device);
 
             return ResultBean.success("导入成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException e) {
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 1b79acd..f851067 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
@@ -81,7 +81,7 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
     }
 
     @Override
-    public void addMesEquipmentVariable(List<Map<String, Object>> mapList,String equipmentCode, String userName, String organizeCode) {
+    public void addMesEquipmentVariable(List<Map<String, Object>> mapList,String equipmentCode, String userName, String organizeCode, String device) {
         MesEquipment mesEquipment = getMesEquipment(organizeCode,equipmentCode);
         MesEquipmentChannel mesEquipmentChannel = getMesEquipmentChannel(organizeCode,equipmentCode);
 
@@ -95,16 +95,49 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
                 mesEquipmentVariable.setEquipmentCode(mesEquipment.getEquipmentCode());
                 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());
                 }
+                String dataType = String.valueOf(objectMap.get("Data Type"));
+                if ("Boolean".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_40.getValue());
+                } else if ("Byte".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_30.getValue());
+                } else if ("Byte".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_30.getValue());
+                } else if ("Byte Array".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_30.getValue());
+                } else if ("Double".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_70.getValue());
+                } else if ("Double Array".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_70.getValue());
+                } else if ("DWord".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_50.getValue());
+                } else if ("Float".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_60.getValue());
+                } else if ("Float Array".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_60.getValue());
+                } else if ("Long".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_15.getValue());
+                } else if ("Long Array".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_15.getValue());
+                } else if ("Short".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_10.getValue());
+                } else if ("Short Array".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_10.getValue());
+                } else if ("String".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_50.getValue());
+                } else if ("Word".equals(dataType)) {
+                    mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_50.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);
+                mesEquipmentVariable.setDevice(device);
                 ConvertBean.serviceModelInitialize(mesEquipmentVariable, userName);
                 mesEquipmentVariables.add(mesEquipmentVariable);
             } catch (NumberFormatException e) {