From 4ab63d9ad3094643b2f098dbb523315fff43dd83 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期三, 04 九月 2024 08:16:40 +0800
Subject: [PATCH] 修改1P1S
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 2 ++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 8 ++++----
jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java | 8 ++++----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java b/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
index 4ea37d3..6516f4a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
@@ -62,10 +62,10 @@
public static final Integer INT_THREE= 3;
public static final Integer INT_FOUR= 4;
public static final Integer INT_ZERO= 0;
- public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/";
- public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface/";
-/* public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/";
- public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/interface/";*/
+/* public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/";
+ public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface/";*/
+ public static final String FACTORY_EMS_UAT_GET_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/aMesSysIntegration/";
+ public static final String FACTORY_EMS_UAT_POST_RUL = "https://imes-group.geelycv.com/api/mom-open/restful/interface/";
public static final String FACTORY_EMS_SITE_CODE = "3983";
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 66f6003..55c439e 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
@@ -84,6 +84,8 @@
Constants.ModuleList.add(Constants.OP210);
Constants.ModuleList.add(Constants.OP220);
+ getDate();//灏嗘棩鏈熸斁鍏AP闆嗗悎锛�1P1S鐢�
+
OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
miloService,
daPassingStationCollectionService,
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index 0e7f9a8..3cdd3ae 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -166,7 +166,7 @@
result = 16;//鐢佃姱鎸′綅涓虹┖
}else{
String cellGear = cellGearObjcet.toString();
- /*List<String> cellCodeList = readCellCodeList(thoroughfare, device);
+ /* List<String> cellCodeList = readCellCodeList(thoroughfare, device);
result = checkCellGear(thoroughfare, device,cellCodeList,cellGear);//鏍￠獙鐢佃姱鎸′綅鍜岀粍鍒�*/
}
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(result).build());
@@ -879,12 +879,12 @@
cellStatus = 1;
}else {
cellStatus = 2;
- result = 17;//鎸′綅鏍￠獙涓嶅悎鏍�
+ result = 16;//鎸′綅鏍￠獙涓嶅悎鏍�
}
- }else {
+ }/*else {
cellStatus = 2;
result = 17;//鏌ヤ笉鍒拌鏍￠獙鐨勬尅浣�
- }
+ }*/
miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".CellStatus_"+(i+1)).value(cellStatus).build());
}
}
--
Gitblit v1.9.3