From f95afb8ff0588bf12a53b6ff811a192bccd79546 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 六月 2024 14:39:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 71 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index 740d65a..3496554 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,51 +1,50 @@
package com.mes.temperingglass.controller;
+import com.mes.temperingglass.service.TemperingAgoService;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
-import com.mes.temperingglass.service.TemperingOverService;
-import com.mes.temperingglass.service.TemperingService;
-import com.mes.utils.Result;
-
+/**
+ * @author SNG-010
+ */
@RestController
@RequestMapping("/temperingGlassInfo")
-
+@Slf4j
// TidyUpGlassModule 閽㈠寲妯″潡
public class TemperingGlassInfoController {
@Autowired
- TemperingService temperingService;
+ private TemperingAgoService temperingAgoService;
- @Autowired
- private TemperingOverService temperingOverService;
-
- @PostMapping("/SelectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
- @ResponseBody
- public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
- List<TemperingGlassInfo> glass = temperingService.SelectWaitingGlass();
- System.out.println(glass);
- return Result.build(200,"", glass);
+ @ApiOperation("鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�")
+ @GetMapping("/selectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
+ public Result <List<TemperingGlassInfo>> selectWaitingGlass() {
+ List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass();
+ log.info("绛夊緟涓殑鐜荤拑淇℃伅{}",glass);
+ return Result.build(200, "", glass);
+ }
+// @ApiOperation("鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�")
+// @GetMapping("/selectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
+// public Result <List<TemperingGlassInfo>> selectIntoGlass() {
+// List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass();
+// log.info("杩涚倝涓殑鐜荤拑鐗堝浘淇℃伅{}",glass);
+// return Result.build(200, "", glass);
+// }
+ @ApiOperation("//閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅銆�")
+ @GetMapping("/selectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
+ public Result <List<TemperingGlassInfo>> selectOutGlass() {
+ List<TemperingGlassInfo> glass = temperingAgoService.selectOutGlass();
+ log.info("閽㈠寲鍑虹倝鍚庣殑鐜荤拑淇℃伅{}",glass);
+ return Result.build(200, "", glass);
}
- @GetMapping("/SelectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
- @ResponseBody
- public Result SelectIntoGlass(String ProcessId) {
- List<TemperingGlassInfo> glass = temperingService.SelectIntoGlass();
- System.out.println(glass);
- return Result.build(200,"", glass);
- }
-
- @GetMapping("/SelectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
- @ResponseBody
- public Result SelectOutGlass(String ProcessId) {
- List<TemperingGlassInfo> glass = temperingOverService.SelectOutGlass();
- System.out.println(glass);
- return Result.build(200,"", glass);
- }
-
-
-
}
--
Gitblit v1.8.0