UI-Project/src/views/Caching/cachingun.vue
@@ -13,8 +13,9 @@ const tableData = ref([]) const slot = ref('') const updatetable = async () => { request.get("/unLoadGlass/downStorage/selectStorageCage").then((res) => { 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); });
@@ -155,7 +155,7 @@ // 更新 tableData 的数据 tableData.splice(0, tableData.length, ...data.params[0]); // console.log("更新后数据", tableData); // console.log("更新后数据", data.params[0]); };
@@ -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") 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){ 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()); } } } } } 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); } }
