From 55ed7b7c0c64498f07fbcb583a0696a4b1e7e4b4 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期一, 29 四月 2024 15:47:46 +0800 Subject: [PATCH] 增加钢化显示 --- hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 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 2d219e2..2fbfdcc 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,10 +1,10 @@ package com.mes.temperingglass.controller; import com.mes.temperingglass.entity.TemperingGlassInfo; +import com.mes.temperingglass.service.TemperingAgoService; import com.mes.temperingglass.service.TemperingOverService; import com.mes.temperingglass.service.TemperingService; import com.mes.utils.Result; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -26,24 +26,27 @@ TemperingService temperingService; @Autowired private TemperingOverService temperingOverService; + @Autowired + private TemperingAgoService temperingAgoService; + @ApiOperation("鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�") @GetMapping("/selectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓� public Result <List<TemperingGlassInfo>> selectWaitingGlass() { - List<TemperingGlassInfo> glass = temperingService.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 = temperingService.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 = temperingOverService.SelectOutGlass(); + List<TemperingGlassInfo> glass = temperingAgoService.SelectOutGlass(); log.info("閽㈠寲鍑虹倝鍚庣殑鐜荤拑淇℃伅{}",glass); return Result.build(200, "", glass); } -- Gitblit v1.8.0