From 91e4ba507f9806c975a4273154d79f1a43b836c4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 29 四月 2024 13:42:29 +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 | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 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 6f653fc..6b0b547 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,18 +25,19 @@
*/
@RestController
-@RequestMapping("/api/downWorkstation")
+@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();
+ List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,5);
// 鏋勫缓绗﹀悎棰勬湡鏍煎紡鐨勫搷搴旀暟鎹�
Map<String, Object> responseData = new HashMap<>();
responseData.put("code", 200);
@@ -52,15 +55,12 @@
}
}
- @GetMapping("/gettwo")
- public List<DownWorkstation> gettwoDownWorkstations() {
- return downWorkstationService.gettwoDownWorkstations();
- }
+ @ApiOperation("鑾峰彇娴佺▼鍗″彿")
@GetMapping("/getflowCardId")
public ResponseEntity<Map<String, Object>> getflowCardId() {
Map<String, Object> responseData = new HashMap<>();
try {
- List<Map<String, Object>> data = downWorkstationService.getflowCardId();
+ List<Map<String, Object>> data = glassInfoService.getFlowCardId();
responseData.put("code", 200);
responseData.put("msg", "鎴愬姛");
responseData.put("data", data);
@@ -75,7 +75,8 @@
-
+//缁戝畾鏋跺瓙
+@ApiOperation("缁戝畾鏋跺瓙")
@PostMapping("/updateFlowCardId")
public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody Map<String, Object> requestData) {
// 浠� requestData 涓幏鍙栦紶鍏ョ殑 flowCardId
@@ -86,7 +87,7 @@
int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId);
// 鏇存柊 down_workstation 琛ㄤ腑鐨勬�绘暟閲�
- glassInfoService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
+ downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
// 鏋勫缓鍝嶅簲鏁版嵁
Map<String, Object> responseData = new HashMap<>();
@@ -96,7 +97,7 @@
return ResponseEntity.ok(responseData);
}
-
+ @ApiOperation("娓呴櫎宸ヤ綅淇℃伅")
@PostMapping("/clear")
public ResponseEntity<Map<String, Object>> clearWorkstationInfo(@RequestBody Map<String, Object> requestData) {
// 璋冪敤 DownWorkstationService 涓殑鏂规硶娓呴櫎鎸囧畾宸ヤ綅ID鐨勪俊鎭�
@@ -130,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