From c401fc71cd643f1d83a22537244b8d11e2f4c08d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 04 六月 2024 16:56:25 +0800
Subject: [PATCH] 修改推送数据单独方法，修改启用禁用接口
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 2
UI-Project/src/views/Caching/cachingun.vue | 18 +++++---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java | 2 -
hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java | 18 +++++++++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java | 4 +-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 59 +++++++++++++++++++++--------
6 files changed, 75 insertions(+), 28 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index acd7647..a291137 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -13,8 +13,9 @@
const tableData = ref([])
const slot = ref('')
-
-request.get("/unLoadGlass/downStorage/selectStorageCage").then((res) => {
+const updatetable = async () => {
+
+ await request.get("/unLoadGlass/downStorage/selectStorageCage").then((res) => {
if (res.code == 200) {
console.log(res.data);
@@ -25,6 +26,9 @@
}
});
+
+
+ }
const open = async(row) => {
try {
@@ -58,20 +62,20 @@
}
};
-const socketUrl = `ws://${WebSocketHost}:88/api/unLoadGlass/api/talk/unloadglass`;
+const socketUrl = `ws://${WebSocketHost}:88/api/unLoadGlass/api/talk/downcache`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
-
- tableData.splice(0, tableData.length, ...data.params[0]);
- // console.log("鏇存柊鍚庢暟鎹�", tableData);
+ // tableData.splice(0, tableData.length, ...data.params2[0]);
+ tableData.value = data.params2[0]
+ console.log("鏇存柊鍚庢暟鎹�", data.params2[0]);
};
onMounted(() => {
-
+ updatetable()
initializeWebSocket(socketUrl, handleMessage);
});
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 9f5ce9c..1d931d9 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -155,7 +155,7 @@
// 鏇存柊 tableData 鐨勬暟鎹�
tableData.splice(0, tableData.length, ...data.params[0]);
- // console.log("鏇存柊鍚庢暟鎹�", tableData);
+// console.log("鏇存柊鍚庢暟鎹�", data.params[0]);
};
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
index 5737bd6..2f56341 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -21,7 +21,7 @@
private DownStorageCageDetailsService downStorageCageDetailsService;
@Autowired
private DownStorageCageService downStorageCageService;
-
+ @ApiOperation("娣诲姞鐜荤拑")
@PostMapping("/add")
public String addDownStorageCageDetails(@RequestBody DownStorageCageDetails details) {
downStorageCageDetailsService.addDownStorageCageDetails(details);
@@ -56,7 +56,7 @@
@ResponseBody
public Result updateDownStorageCage(@RequestBody DownStorageCage downStorageCage) {
boolean isSucess=downStorageCageService.updateDownStorageCage(downStorageCage);
- return Result.build(200,"鏇存崲鎴愬姛",1);
+ return Result.build(200,"鏇存崲鎴愬姛",isSucess);
}
@ApiOperation("鍒犻櫎缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄ゃ��")
@PostMapping("/deleteDownStorageCage")
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
index 8be3a8d..e858451 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
@@ -146,8 +146,6 @@
}else{
log.info("4銆佸鏋滀笉灞炰簬鐗堝浘id鍜岀墖搴忕殑椤哄簭鎵ц杩涚墖浠诲姟");
-
-
//娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
List<DownStorageCageDetails> list = downStorageCageService.selectCacheEmpty();
if(list.size()>0){
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
index 308599c..c933a8c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -1,6 +1,7 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
+import com.mes.downstorage.service.DownStorageCageService;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.tools.WebSocketServer;
@@ -17,52 +18,78 @@
@Component
public class Downpush {
-
@Autowired
private DownWorkstationService downWorkstationService;
+ @Autowired
+ private DownStorageCageService downStorageCageService;
+
@Scheduled(fixedDelay = 1000)
- public void Downpush() {
-
-
+ public void sendDownWorkstations() {
+ log.info("鍙戦�佸伐浣嶇幓鐠冧俊鎭�");
JSONObject jsonObject = new JSONObject();
- JSONObject jsonObject2 = new JSONObject();
- JSONObject jsonObject3 = new JSONObject();
List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,6);
- List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3);
- List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4,6);
jsonObject.append("params",data);
- jsonObject2.append("glassinfo",glassinfodata);
- jsonObject3.append("glassinfo2",glassinfodata2);
log.info(jsonObject.toString());
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("unloadglass");
- ArrayList<WebSocketServer> sendwServer2 = WebSocketServer.sessionMap.get("unloadglass2");
- ArrayList<WebSocketServer> sendwServer3 = WebSocketServer.sessionMap.get("unloadglass3");
- // log.info(sendwServer.toString());
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
-
if (webserver != null&&webserver.session.isOpen()) {
+ log.info("宸插彂閫�");
webserver.sendMessage(jsonObject.toString());
}
}
}
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void sendGlassInfoData() {
+ log.info("鍙戦�佸伐浣嶆樉绀哄浘淇℃伅1");
+ JSONObject jsonObject2 = new JSONObject();
+ List<Map<String, Object>> glassinfodata = downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3);
+ jsonObject2.append("glassinfo",glassinfodata);
+ log.info(jsonObject2.toString());
+ ArrayList<WebSocketServer> sendwServer2 = WebSocketServer.sessionMap.get("unloadglass2");
if (sendwServer2 != null) {
for (WebSocketServer webserver : sendwServer2) {
-
if (webserver != null&&webserver.session.isOpen()) {
webserver.sendMessage(jsonObject2.toString());
}
}
}
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void sendGlassInfoData2() {
+ log.info("鍙戦�佸伐浣嶆樉绀哄浘淇℃伅2");
+ JSONObject jsonObject3 = new JSONObject();
+ List<Map<String, Object>> glassinfodata2 = downWorkstationService.getTotalGlassDimensionsByWorkstation(4,6);
+ jsonObject3.append("glassinfo2",glassinfodata2);
+ log.info(jsonObject3.toString());
+ ArrayList<WebSocketServer> sendwServer3 = WebSocketServer.sessionMap.get("unloadglass3");
if (sendwServer3 != null) {
for (WebSocketServer webserver : sendwServer3) {
-
if (webserver != null&&webserver.session.isOpen()) {
webserver.sendMessage(jsonObject3.toString());
}
}
}
+ }
+ @Scheduled(fixedDelay = 1000)
+ public void sendDownStorageCages() {
+ log.info("鍙戦�佺紦瀛樼幓鐠冧俊鎭�");
+ JSONObject jsonObject4 = new JSONObject();
+ List<Map<String, Object>> list=downStorageCageService.selectDownStorageCages();
+ jsonObject4.append("params2",list);
+ log.info(jsonObject4.toString());
+ ArrayList<WebSocketServer> sendwServer4 = WebSocketServer.sessionMap.get("downcache");
+ if (sendwServer4 != null) {
+ for (WebSocketServer webserver : sendwServer4) {
+ if (webserver != null&&webserver.session.isOpen()) {
+ webserver.sendMessage(jsonObject4.toString());
+ }
+ }
+ }
}
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
index 1f25bca..e363838 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -3,14 +3,17 @@
import com.mes.UnLoadGlassApplication;
import com.mes.downglassinfo.service.impl.DownGlassInfoServiceImpl;
import com.mes.downglassinfo.service.impl.DownGlassTaskServiceImpl;
+import com.mes.downstorage.entity.DownStorageCage;
import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.service.DownStorageCageDetailsService;
+import com.mes.downstorage.service.DownStorageCageService;
import com.mes.downstorage.service.impl.DownStorageCageDetailsServiceImpl;
import com.mes.downstorage.service.impl.DownStorageCageServiceImpl;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.downworkstation.service.impl.DownWorkstationServiceImpl;
import com.mes.glassinfo.service.impl.GlassInfoServiceImpl;
+import com.mes.utils.Result;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -18,6 +21,9 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
import java.util.Arrays;
import java.util.List;
@@ -50,6 +56,8 @@
GlassInfoServiceImpl glassInfoServiceImpl;
@Autowired
DownWorkstationService downWorkstationService;
+ @Autowired
+ DownStorageCageService downStorageCageService;
@@ -167,6 +175,16 @@
glassInfoServiceImpl.getFlowCardId();
}
+ @Test
+ public void updateDownStorageCage() {
+
+
+ DownStorageCage downStorageCage= new DownStorageCage();
+ downStorageCage.setEnableState("0");
+ downStorageCage.setId(1);
+ downStorageCageService.updateDownStorageCage(downStorageCage);
+
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0