From 3581b1687306f77b7463c4c0a23d30ddfb6e9bb7 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 28 四月 2024 19:11:22 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java | 18 ++++++---
jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java | 18 +++++++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 14 ++++---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 2
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 36 +++++++++---------
5 files changed, 57 insertions(+), 31 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 b0ce95c..22f1bcf 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
@@ -48,6 +48,7 @@
omProductionOrdeInfoService);
List<String> lists = getSubList();
+ System.out.println("璁㈤槄鍐呭锛�"+lists);
miloService.subscriptionFromOpcUa(lists,opcUaSubscription);
}
@@ -68,12 +69,12 @@
lists.add(OPCElement.PACK_OP270_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP290_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP290_AngleResult);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP300_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP300_AngleResult);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP310_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP310_AngleResult);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP330_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP330_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP300A_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP300B_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP310A_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP310B_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP330A_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP330B_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP380_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP380_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP400_RecordData);//璇锋眰璁板綍鏁版嵁
@@ -97,6 +98,7 @@
lists.add(OPCElement.PACK_OP350A_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP350B_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP360_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP365_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP390_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP470_RecordData);//璇锋眰璁板綍鏁版嵁
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
index d039a7d..e222755 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -45,15 +45,17 @@
/**
* OP300
*/
- public static final String PACK_OP300_RecordData = "PACK.OP300.RecordData";//璇锋眰璁板綍鏁版嵁
+ public static final String PACK_OP300A_RecordData = "PACK.OP300A.RecordData";//璇锋眰璁板綍鏁版嵁
- public static final String PACK_OP300_AngleResult = "PACK.OP300.AngleResult";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP300B_RecordData = "PACK.OP300B.RecordData";//璇锋眰璁板綍鏁版嵁
+
/**
* OP310
*/
- public static final String PACK_OP310_RecordData = "PACK.OP310.RecordData";//璇锋眰璁板綍鏁版嵁
+ public static final String PACK_OP310A_RecordData = "PACK.OP310A.RecordData";//璇锋眰璁板綍鏁版嵁
- public static final String PACK_OP310_AngleResult = "PACK.OP310.AngleResult";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP310B_RecordData = "PACK.OP310B.RecordData";//璇锋眰璁板綍鏁版嵁
+
public static final String PACK_OP320A_RecordData = "PACK.OP320A.RecordData";//璇锋眰璁板綍鏁版嵁
@@ -62,9 +64,10 @@
/**
* OP330
*/
- public static final String PACK_OP330_RecordData = "PACK.OP330.RecordData";//璇锋眰璁板綍鏁版嵁
+ public static final String PACK_OP330A_RecordData = "PACK.OP330A.RecordData";//璇锋眰璁板綍鏁版嵁
- public static final String PACK_OP330_AngleResult = "PACK.OP330.AngleResult";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP330B_RecordData = "PACK.OP330B.RecordData";//璇锋眰璁板綍鏁版嵁
+
/**
* OP380
*/
@@ -134,6 +137,9 @@
* OP360
*/
public static final String PACK_OP360_RecordData = "PACK.OP360.RecordData";//璇锋眰璁板綍鏁版嵁
+
+ public static final String PACK_OP365_RecordData = "PACK.OP365.RecordData";//璇锋眰璁板綍鏁版嵁
+
/**
* OP370
*/
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 a261df7..2824bdc 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
@@ -35,10 +35,10 @@
public SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//鏂拌嚜鍔ㄥ伐绔�
- public List<String> automaticList = Arrays.asList("OP280", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
+ public List<String> automaticList = Arrays.asList("OP280", "OP300A","OP300B", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470");
//閲囬泦妯＄粍宸ヤ綅 ModuleCode
- public List<String> moduleCodeList = Arrays.asList("OP320A","OP320B","OP340A","OP340B","OP365", "OP350A", "OP350B", "OP330");
+ public List<String> moduleCodeList = Arrays.asList("OP300A","OP300B","OP320A","OP320B","OP340A","OP340B","OP365", "OP350A", "OP350B", "OP330");
//鍖哄垎妯＄粍鍨嬪彿宸ヤ綅
public List<String> distinguishingModules = Arrays.asList("OP300","OP310", "OP340", "OP350", "OP330");
@@ -116,22 +116,22 @@
//plc缁欐垜浠竴涓ā缁勭爜锛屾嬁妯＄粍鐮佹牎楠屽嚭鍨嬪彿
if(distinguishingModules.stream().anyMatch(s -> s.equals(device))) {
//璇绘ā缁勭爜
- String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString();
- String productTye = thoroughfare + "." + device + ".ProductType";
- if (null != moduleCode && moduleCode.length() == 24) {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7, 8))).build());
- //杩涚珯淇濆瓨鏁版嵁
-// inSaveDate(thoroughfare,device)
- //璁板綍鏁版嵁瀹屾垚
- String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
-
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
-
-
- //璇锋眰宸ュ崟
- } else {
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
- }
+// String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString();
+// String productTye = thoroughfare + "." + device + ".ProductType";
+// if (null != moduleCode && moduleCode.length() == 24) {
+// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(productTye).value(Integer.valueOf(moduleCode.substring(7, 8))).build());
+// //杩涚珯淇濆瓨鏁版嵁
+//// inSaveDate(thoroughfare,device)
+// //璁板綍鏁版嵁瀹屾垚
+// String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
+//
+// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build());
+//
+//
+// //璇锋眰宸ュ崟
+// } else {
+// miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build());
+// }
}else {
//pack 濡傛灉鍖哄垎鍨嬪彿鐨勮瘽灏辫澶勭悊
//璁板綍鏁版嵁瀹屾垚
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
index f90542d..029001d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/qingYan/service/ExternalInterface.java
@@ -1,18 +1,24 @@
package com.jcdm.main.restful.qingYan.service;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.JsonObject;
import com.jcdm.common.annotation.Log;
+import com.jcdm.common.core.domain.AjaxResult;
import com.jcdm.common.enums.BusinessType;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.main.da.paramCollection.domain.DaParamCollection;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
+import com.jcdm.main.restful.qingYan.doman.ParentVO;
import com.jcdm.main.restful.qingYan.doman.PostEntity;
import com.jcdm.main.rm.repairData.domain.RmRepairData;
+import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +39,18 @@
@Autowired
private IOmProductionOrdeInfoService productionOrdeInfoService;
+ String url = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration/deviceResultFeedback";
+
+ /**
+ * 瀵煎嚭鐐规浠诲姟鍒楄〃
+ */
+ @PostMapping("/deviceResultFeedback")
+ public AjaxResult hdy(@RequestBody ParentVO parentVO)
+ {
+ HttpResponse execute = HttpRequest.post(url).body(JSONUtil.toJsonStr(parentVO)).execute();
+ return AjaxResult.success(execute.body());
+ }
+
@PostMapping("/pushParamData")
public void receivingData(@RequestBody PostEntity postEntity) throws JsonProcessingException {
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index bed610d..1f17669 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -372,7 +372,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.1.103:8080/websocket/message/",
+ url: "ws://192.168.2.76:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
--
Gitblit v1.9.3