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 | 102 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 77 insertions(+), 25 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 604b00f..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,37 +54,64 @@
@Autowired
private IDaCellDataService daCellDataService;
+ @Autowired
+ private ISysDictDataService sysDictDataService;
+
@Override
public void run(ApplicationArguments args) throws Exception {
//PLC鍒癕ES鐗╂枡杞崲
- Constants.materialMap.put("1","9900199052A");
- Constants.materialMap.put("2","9900199053B");
+ 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");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
- //鍒嗘010-090娈� 鐢佃姱宸ヤ綅
- Constants.OP020_OP090.add(Constants.OP020);
- Constants.OP020_OP090.add(Constants.OP030);
- Constants.OP020_OP090.add(Constants.OP040);
- Constants.OP020_OP090.add(Constants.OP050);
- Constants.OP020_OP090.add(Constants.OP060);
- Constants.OP020_OP090.add(Constants.OP090);
+ //閫氶亾
+ Constants.thoroughfareMap.put(Constants.OP010,"JCDM035-1");
- //浜哄伐宸ヤ綅
- Constants.OP100_OP150.add(Constants.OP100_1);
- Constants.OP100_OP150.add(Constants.OP100_2);
- Constants.OP100_OP150.add(Constants.OP150);
+ Constants.thoroughfareMap.put(Constants.OP020,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP030,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP120_2,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP130,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP140,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP150,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP160,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP165,"JCDM035-2");
- //妯＄粍宸ヤ綅List
- Constants.ModuleList.add(Constants.OP110);
- Constants.ModuleList.add(Constants.OP120);
- Constants.ModuleList.add(Constants.OP130);
- Constants.ModuleList.add(Constants.OP140);
- //Constants.ModuleList.add(Constants.OP150);
- Constants.ModuleList.add(Constants.OP160);
- Constants.ModuleList.add(Constants.OP170);
- Constants.ModuleList.add(Constants.OP180);
- Constants.ModuleList.add(Constants.OP210);
- Constants.ModuleList.add(Constants.OP220);
+ Constants.thoroughfareMap.put(Constants.OP040,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP050,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP060,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP070,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP080,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP090,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP100,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP110,"JCDM035-3");
+
+ Constants.thoroughfareMap.put(Constants.OP170,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP180,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP190,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP200,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP210,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP220,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP230,"JCDM035-4");
+
+ //涓荤嚎浜哄伐宸ヤ綅
+ Constants.OP040_OP160.add(Constants.OP040);
+ Constants.OP040_OP160.add(Constants.OP080);
+ Constants.OP040_OP160.add(Constants.OP070);
+ Constants.OP040_OP160.add(Constants.OP100);
+ Constants.OP040_OP160.add(Constants.OP120_2);
+ Constants.OP040_OP160.add(Constants.OP165);
+
+ //鐜嚎浜哄伐宸ヤ綅
+ Constants.OP0170_OP220.add(Constants.OP170);
+ Constants.OP0170_OP220.add(Constants.OP180);
+ Constants.OP0170_OP220.add(Constants.OP190);
+ Constants.OP0170_OP220.add(Constants.OP200);
+ Constants.OP0170_OP220.add(Constants.OP210);
+ Constants.OP0170_OP220.add(Constants.OP220);
OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
miloService,
@@ -102,9 +133,30 @@
*/
public List<String> getSubList(){
List<String> lists = daOpcuaConfigService.list(new LambdaQueryWrapper<DaOpcuaConfig>()
- .eq(DaOpcuaConfig::getState, Constants.USE_ING))
+ .eq(DaOpcuaConfig::getState, Constants.USE_ING)
+ .eq(DaOpcuaConfig::getSubscribe,Constants.YES))
.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