From e8005cc7b6caaa85c7fc99cc87e3877516f777d9 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期三, 17 四月 2024 10:53:30 +0800 Subject: [PATCH] 更新语句 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 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 8788d0e..0248b42 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 @@ -51,11 +51,27 @@ return ResponseEntity.status(500).body(errorResponse); } } - @GetMapping("/gettwo") - public List<DownWorkstation> gettwoDownWorkstations() { - return downWorkstationService.getoneDownWorkstations(6,10); + public ResponseEntity<?> gettwoDownWorkstations() { + try { + List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,5); + // 鏋勫缓绗﹀悎棰勬湡鏍煎紡鐨勫搷搴旀暟鎹� + Map<String, Object> responseData = new HashMap<>(); + responseData.put("code", 200); + responseData.put("msg", "鎴愬姛"); + responseData.put("data", data); + // 杩斿洖 ResponseEntity 瀵硅薄锛屽寘鍚搷搴旀暟鎹拰鐘舵�佺爜 + return ResponseEntity.ok(responseData); + } catch (Exception e) { + e.printStackTrace(); + // 濡傛灉鍑虹幇寮傚父锛岃繑鍥為敊璇俊鎭� + Map<String, Object> errorResponse = new HashMap<>(); + errorResponse.put("code", 500); + errorResponse.put("msg", "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"); + return ResponseEntity.status(500).body(errorResponse); + } } + @GetMapping("/getflowCardId") public ResponseEntity<Map<String, Object>> getflowCardId() { Map<String, Object> responseData = new HashMap<>(); -- Gitblit v1.8.0