diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index afb78a1f..8fe8c07e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -526,6 +526,7 @@ public class PageController { } else { mv.addObject("display", "none"); } + mv.addObject("number",userToken.getNumber()); return mv; } @@ -763,6 +764,7 @@ public class PageController { } else { mv.addObject("display", "none"); } + mv.addObject("number",userToken.getNumber()); return mv; } @@ -952,9 +954,15 @@ public class PageController { } @GetMapping("/table_stock") - public ModelAndView table_stock() { + public ModelAndView table_stock(HttpServletRequest request) { + String token = request.getHeader("user-token"); + if (token == null) { + token = (String) request.getSession().getAttribute("userToken"); + } + UserByPort userToken = AuthenticationTokenPool.getUserToken(token); ModelAndView mv = new ModelAndView(); mv.setViewName("pages/depository/table-stock"); + mv.addObject("number",userToken.getNumber()); return mv; } diff --git a/src/main/resources/templates/pages/depository/table-stock.html b/src/main/resources/templates/pages/depository/table-stock.html index 70ab7478..3b3cdeb3 100644 --- a/src/main/resources/templates/pages/depository/table-stock.html +++ b/src/main/resources/templates/pages/depository/table-stock.html @@ -16,6 +16,7 @@
搜索信息
+
@@ -505,7 +506,8 @@ } if ("WebSocket" in window) { - socket = new WebSocket('ws://127.0.0.1:11111/webSocket/300450'); + let number = $("#number").val(); + socket = new WebSocket('ws://127.0.0.1:11111/webSocket/'+number); switch (socket.readyState) { case WebSocket.CONNECTING: // 连接中 diff --git a/src/main/resources/templates/pages/material/material-out.html b/src/main/resources/templates/pages/material/material-out.html index 96cd9982..80ebda2d 100644 --- a/src/main/resources/templates/pages/material/material-out.html +++ b/src/main/resources/templates/pages/material/material-out.html @@ -17,6 +17,7 @@
+
搜索信息 @@ -284,7 +285,8 @@ } if ("WebSocket" in window) { - socket = new WebSocket('ws://127.0.0.1:11111/webSocket/300450'); + let number = $("#number").val(); + socket = new WebSocket('ws://127.0.0.1:11111/webSocket/'+number); switch (socket.readyState) { case WebSocket.CONNECTING: // 连接中 diff --git a/src/main/resources/templates/pages/materialtype/materialType_view.html b/src/main/resources/templates/pages/materialtype/materialType_view.html index 03405edb..dd6f34dd 100644 --- a/src/main/resources/templates/pages/materialtype/materialType_view.html +++ b/src/main/resources/templates/pages/materialtype/materialType_view.html @@ -18,6 +18,7 @@
+
@@ -284,7 +285,8 @@ } if ("WebSocket" in window) { - socket = new WebSocket('ws://127.0.0.1:11111/webSocket/300450'); + let number = $("#number").val(); + socket = new WebSocket('ws://127.0.0.1:11111/webSocket/'+number); switch (socket.readyState) { case WebSocket.CONNECTING: // 连接中