From adacb4935bf37e88a054adb8796862902c3b6d0d Mon Sep 17 00:00:00 2001 From: wang <3597712270@qq.com> Date: 星期五, 26 四月 2024 16:58:15 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java index 6480461..eee88eb 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java @@ -131,6 +131,28 @@ + @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�") + @GetMapping("/getwo") + public ResponseEntity<Map<String, Object>> getwo() { + Map<String, Object> responseData = new HashMap<>(); + try { + List<Map<String, Object>> data = downWorkstationService.getTotalGlassDimensionsByWorkstation(); + responseData.put("code", 200); + responseData.put("msg", "鎴愬姛"); + responseData.put("data", data); + return ResponseEntity.ok(responseData); + } catch (Exception e) { + responseData.put("code", 500); + responseData.put("msg", "澶辫触"); + responseData.put("data", null); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseData); + } + } + + + + + } -- Gitblit v1.8.0