From 70cc2652993f8231593b93a6faa154c2cb2f31b0 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期三, 24 四月 2024 18:30:44 +0800
Subject: [PATCH] -
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java | 3 +++
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 21 +++++++++++----------
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 7 ++++---
jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java | 6 ++++++
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 4 ++--
5 files changed, 26 insertions(+), 15 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 d67d6d9..c9c9d3d 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
@@ -58,9 +58,10 @@
public List<String> getSubList(){
List<String> lists = new ArrayList<>();
lists.add(OPCElement.PACK_OP230_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP230_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP240_RecordData);//璇锋眰璁板綍鏁版嵁.
lists.add(OPCElement.PACK_OP240_AngleResult);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP2502_RecordData);//璇锋眰璁板綍鏁版嵁.
+ lists.add(OPCElement.PACK_OP2502_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP260_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP260_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP270_RecordData);//璇锋眰璁板綍鏁版嵁
@@ -87,15 +88,15 @@
lists.add(OPCElement.PACK_OP460_AngleResult);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP500_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP500_AngleResult);//璇锋眰璁板綍鏁版嵁
-
- lists.add(OPCElement.PACK_OP280_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP320_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP340_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP350_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP360_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP390_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP470_RecordData);//璇锋眰璁板綍鏁版嵁
+//
+// lists.add(OPCElement.PACK_OP280_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP320_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP340_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP350_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP360_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP390_RecordData);//璇锋眰璁板綍鏁版嵁
+// lists.add(OPCElement.PACK_OP470_RecordData);//璇锋眰璁板綍鏁版嵁
return lists;
}
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 03ef00d..686581f 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
@@ -19,6 +19,9 @@
public static final String PACK_OP240_RecordData = "PACK.OP240.RecordData";//璇锋眰璁板綍鏁版嵁
public static final String PACK_OP240_AngleResult = "PACK.OP240.AngleResult";//璇锋眰鎷х揣鏁版嵁
+ public static final String PACK_OP2502_RecordData = "PACK.OP250-2.RecordData";//璇锋眰璁板綍鏁版嵁
+ public static final String PACK_OP2502_AngleResult = "PACK.OP2502-2.AngleResult";//璇锋眰鎷х揣鏁版嵁
+
/**
* OP260
*/
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 5dd407c..57e3805 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
@@ -73,7 +73,7 @@
public void onSubscribe(String identifier, Object value) {
try {
- if(null != value) {
+ if(null != value && Integer.valueOf(value.toString())!= 0) {
String[] nodes = identifier.split("[.]");
String thoroughfare = nodes[0];//閫氶亾
String device = nodes[1];//璁惧
@@ -143,7 +143,7 @@
recordDataDoneValue = outSaveDate(thoroughfare,device);
//璁板綍鏁版嵁瀹屾垚
String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
- miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(RecordDataDoneAddress)).build());
+ miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(Integer.valueOf(recordDataDoneValue)).build());
}else {
//鎵嬪姩宸ヤ綅
WebSocketUsers.sendMessageToUserByText(map.get(device), "END");
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
index bff26e2..b548f5a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
@@ -6,6 +6,11 @@
import org.springframework.web.bind.annotation.RequestParam;
public class RestfulService {
+ public static void main(String[] args) {
+ String str = "uuuuuu11uuuuuuuuuuuuuuu";
+ System.out.println(str.length());
+ }
+
public static final String getRealmName = "https://imes-test-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration";
public static final String postRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface";
@@ -77,4 +82,5 @@
.execute();
return response.body();
}
+ //HttpResponse response = HttpRequest.post(url).body(JSONUtil.toJsonStr(vo)).execute();
}
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index b4cd486..cfc464f 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -95,11 +95,11 @@
<!-- </el-col>-->
<!-- </el-row>-->
- <el-row style="margin-top: 20px">
+ <el-row v-show="showInput" style="margin-top: 20px">
<el-col></el-col>
<span style="width: 130px;" class="head-font">棰勮鎬绘垚鍙� : {{headContent.yzSfcCode}}</span>
</el-row>
- <el-row style="margin-top: 20px">
+ <el-row v-show="showInput" style="margin-top: 20px">
<!-- <el-button @click="Release" type="primary">缁戝畾</el-button>-->
<el-button @click="bindYzSfc" type="primary">缁戝畾</el-button>
@@ -322,6 +322,7 @@
name: "stationTerminal",
data() {
return {
+ showInput: true,
serialPortContent: '',
// 鏌ヨ鍙傛暟
formulaChildParams: {
@@ -369,7 +370,7 @@
},
content: '',
activeName: 'first',
- url: "ws://192.168.1.101:8080/websocket/message/",
+ url: "ws://192.168.1.103:8080/websocket/message/",
message: "",
text_content: "",
ws: null,
--
Gitblit v1.9.3