From 5a05af737f226fffa248e8fdb27546688af19100 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期四, 25 四月 2024 21:02:09 +0800
Subject: [PATCH] change model2
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 11 +++++++++++
jcdm-ui/src/views/main/kb/engineCheck/index.vue | 21 +++++++++++++++++----
jcdm-admin/src/main/resources/application.yml | 4 +++-
jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js | 6 ++++++
4 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/jcdm-admin/src/main/resources/application.yml b/jcdm-admin/src/main/resources/application.yml
index 33f46ba..eb0dcef 100644
--- a/jcdm-admin/src/main/resources/application.yml
+++ b/jcdm-admin/src/main/resources/application.yml
@@ -137,4 +137,6 @@
config:
default:
endpoint: opc.tcp://127.0.0.1:49320
- security-policy: none
\ No newline at end of file
+ security-policy: none
+websocketUrl: 'ws://10.10.12.100:8081/websocket/111122'
+#websocketUrl: 'ws://127.0.0.1:8086/websocket/111122'
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index b9d4839..e263ecb 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -25,6 +25,7 @@
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -56,11 +57,21 @@
@Autowired
MiloService miloService;
+ @Value("${websocketUrl}")
+ private String websocketUrl;
+
@GetMapping("/forceUpload")
public void forceUpload() throws Exception {
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP121_ZZ_CODE_CHECK, 1);
miloService.writeToOpcByte(entity);
}
+
+ @GetMapping("/websocketUrl")
+ public String websocketName() {
+ return websocketUrl;
+ }
+
+
/**
* 鏌ヨ璁㈠崟鎺掍骇鍒楄〃
*/
diff --git a/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js b/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
index 5a51761..a6a3172 100644
--- a/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
+++ b/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
@@ -14,6 +14,12 @@
method: 'get',
})
}
+export function getUrl() {
+ return request({
+ url: '/bs/orderScheduling/websocketUrl',
+ method: 'get',
+ })
+}
//鏌ヨ杩芥函鎶ヨ〃
export function getFollowReport(query) {
return request({
diff --git a/jcdm-ui/src/views/main/kb/engineCheck/index.vue b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
index 28dc346..58975a8 100644
--- a/jcdm-ui/src/views/main/kb/engineCheck/index.vue
+++ b/jcdm-ui/src/views/main/kb/engineCheck/index.vue
@@ -74,7 +74,7 @@
</template>
<script>
-import { listOrderScheduling, forceUploadMethod, getOrderScheduling, delOrderScheduling, addOrderScheduling, updateOrderScheduling } from "@/api/main/bs/orderScheduling/orderScheduling";
+import { listOrderScheduling, forceUploadMethod, getUrl, getOrderScheduling, delOrderScheduling, addOrderScheduling, updateOrderScheduling } from "@/api/main/bs/orderScheduling/orderScheduling";
import { listPassingStationCollection, getPassingStationCollection, delPassingStationCollection, addPassingStationCollection, updatePassingStationCollection } from "@/api/main/da/passingStationCollection/passingStationCollection";
import {listLineInfo} from "@/api/main/bs/lineInfo/lineInfo";
import WebSocketReconnect from "@/utils/WebsocketTool";
@@ -119,6 +119,7 @@
props: [],
data() {
return {
+ websocketUrl: '',
websocket: null,
result: {},
transEngineNo: '',
@@ -166,11 +167,22 @@
// immediate:true
// }
},
- created() {},
+ created() {
+
+ },
mounted() {
- this.initWebSocket()
+ this.getWebUrl()
+
},
methods: {
+ getWebUrl(){
+ console.log("1111")
+ getUrl().then(res=>{
+ console.log("res",res)
+ this.websocketUrl = res
+ this.initWebSocket()
+ })
+ },
forceUpload() {
console.log('0000', this.form.engineNo)
if (this.form.engineNo !== null) {
@@ -189,7 +201,8 @@
//鍒ゆ柇褰撳墠娴忚鍣ㄦ槸鍚︽敮鎸乄ebSocket
if ('WebSocket' in window) {
//杩炴帴WebSocket鑺傜偣
- this.websocket = new WebSocketReconnect('ws://127.0.0.1:8086/websocket/111122')
+ console.log("9999",this.websocketUrl)
+ this.websocket = new WebSocketReconnect(this.websocketUrl)
//鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
this.websocket.socket.onmessage = (event) => {
--
Gitblit v1.9.3