From 9a0334b6e46d9503246d99be0a3a79945dee7919 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 09 四月 2025 09:29:40 +0800
Subject: [PATCH] 优化
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 3b31588..cd2acb8 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jcdm.common.core.domain.entity.SysDictData;
import com.jcdm.main.constant.Constants;
import com.jcdm.main.da.cellData.service.IDaCellDataService;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
@@ -12,13 +13,16 @@
import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
+import com.jcdm.system.service.ISysDictDataService;
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@Component
@@ -50,15 +54,19 @@
@Autowired
private IDaCellDataService daCellDataService;
+ @Autowired
+ private ISysDictDataService sysDictDataService;
+
@Override
public void run(ApplicationArguments args) throws Exception {
//PLC鍒癕ES鐗╂枡杞崲
- Constants.materialMap.put("1","9900200461");//寰崱鐢甸┍鍔ㄧ郴缁熸�绘垚(9999276636)//9900200461
- Constants.materialMap.put("2","9900207783");//寰潰鐢甸┍鍔ㄧ郴缁熸�绘垚(9999276639)//9900207783
-
- Constants.facMaterialMap.put("9900200461","9999276636");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
- Constants.facMaterialMap.put("9900207783","9999276639");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
+ materialInit();
+// Constants.materialMap.put("1","9900200461");//寰崱鐢甸┍鍔ㄧ郴缁熸�绘垚(9999276636)//9900200461
+// Constants.materialMap.put("2","9900207783");//寰潰鐢甸┍鍔ㄧ郴缁熸�绘垚(9999276639)//9900207783
+//
+// Constants.facMaterialMap.put("9900200461","9999276636");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
+// Constants.facMaterialMap.put("9900207783","9999276639");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
//閫氶亾
Constants.thoroughfareMap.put(Constants.OP010,"JCDM035-1");
@@ -130,5 +138,25 @@
.stream().map(DaOpcuaConfig::getNode).collect(Collectors.toList());
return lists;
}
+
+ public void materialInit(){
+ SysDictData plcMesData = new SysDictData();
+ plcMesData.setDictType("plc_mes");
+
+ SysDictData imesGeelyMesData = new SysDictData();
+ imesGeelyMesData.setDictType("imes_geely_mes");
+
+ List<SysDictData> plcMesList = sysDictDataService.selectDictDataList(plcMesData);
+ List<SysDictData> imesGeelyMesList = sysDictDataService.selectDictDataList(imesGeelyMesData);
+
+ for (SysDictData sysDictData : plcMesList) {
+ Constants.materialMap.put(sysDictData.getDictLabel(),sysDictData.getDictValue());
+ }
+
+ for (SysDictData sysDictData : imesGeelyMesList) {
+ Constants.facMaterialMap.put(sysDictData.getDictLabel(),sysDictData.getDictValue());
+ }
+ System.out.println("鐗╂枡鍒濆鍖�"+Constants.materialMap+"---"+Constants.facMaterialMap);
+ }
}
--
Gitblit v1.9.3