From 03f241781205b4aaafa6cee66e7402a41ef97fc1 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 24 五月 2024 15:27:40 +0800
Subject: [PATCH] 增加websocket 推送下片数据给前端
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 71 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 24 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 0248b42..40f9793 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
@@ -4,6 +4,8 @@
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.glassinfo.service.GlassInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -23,38 +25,19 @@
*/
@RestController
-@RequestMapping("/api/unLoadGlass")
+@Api(description = "宸ヤ綅")
+@RequestMapping("/downWorkStation")
public class DownWorkstationController {
@Autowired
private DownWorkstationService downWorkstationService;
@Autowired
private GlassInfoService glassInfoService;
-
+ @ApiOperation("鑾峰彇宸ヤ綅淇℃伅")
@GetMapping("/getone")
public ResponseEntity<?> getOneDownWorkstations() {
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("/gettwo")
- public ResponseEntity<?> gettwoDownWorkstations() {
- try {
- List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,5);
+ List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,6);
// 鏋勫缓绗﹀悎棰勬湡鏍煎紡鐨勫搷搴旀暟鎹�
Map<String, Object> responseData = new HashMap<>();
responseData.put("code", 200);
@@ -72,6 +55,7 @@
}
}
+ @ApiOperation("鑾峰彇娴佺▼鍗″彿")
@GetMapping("/getflowCardId")
public ResponseEntity<Map<String, Object>> getflowCardId() {
Map<String, Object> responseData = new HashMap<>();
@@ -92,6 +76,7 @@
//缁戝畾鏋跺瓙
+@ApiOperation("缁戝畾鏋跺瓙")
@PostMapping("/updateFlowCardId")
public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody Map<String, Object> requestData) {
// 浠� requestData 涓幏鍙栦紶鍏ョ殑 flowCardId
@@ -112,7 +97,7 @@
return ResponseEntity.ok(responseData);
}
-
+ @ApiOperation("娓呴櫎宸ヤ綅淇℃伅")
@PostMapping("/clear")
public ResponseEntity<Map<String, Object>> clearWorkstationInfo(@RequestBody Map<String, Object> requestData) {
// 璋冪敤 DownWorkstationService 涓殑鏂规硶娓呴櫎鎸囧畾宸ヤ綅ID鐨勪俊鎭�
@@ -146,6 +131,44 @@
+ @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�1")
+ @GetMapping("/getwo")
+ public ResponseEntity<Map<String, Object>> getwo() {
+ Map<String, Object> responseData = new HashMap<>();
+ try {
+ List<Map<String, Object>> data = downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3);
+ 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);
+ }
+ }
+
+ @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�2")
+ @GetMapping("/getwo2")
+ public ResponseEntity<Map<String, Object>> getw2o() {
+ Map<String, Object> responseData = new HashMap<>();
+ try {
+ List<Map<String, Object>> data = downWorkstationService.getTotalGlassDimensionsByWorkstation(4,6);
+ 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