From 33aea4a7532fcaddbd4262e51900b5102c0aa07c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 09 十月 2024 14:09:52 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java
index 5048d9e..4f0fb3f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java
@@ -4,9 +4,10 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.mdc.entity.EquipmentAlarm;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
-import org.jeecg.modules.mdcJc.entity.MdcProductDayschedule;
import org.jeecg.modules.screen.dto.MdcProductDayscheduleDto;
+import org.jeecg.modules.screen.dto.ToolLifeDto;
import org.jeecg.modules.screen.service.MdcSubLargeScreenService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,12 +43,19 @@
return Result.ok(result);
}
-// @ApiOperation(value = "鍒嗘帶鐪嬫澘-璁惧瀹炴椂鐘舵��", notes = "鍒嗘帶鐪嬫澘-璁惧瀹炴椂鐘舵��")
-// @GetMapping("/equipmentStatus")
-// public Result<?> equipmentStatus(String productionId) {
-// List<MdcEquipmentMonitor> result = mdcSubLargeScreenService.equipmentStatus(productionId);
-// return Result.ok(result);
-// }
+ @ApiOperation(value = "鍒嗘帶鐪嬫澘-璁惧鎶ヨ", notes = "鍒嗘帶鐪嬫澘-璁惧鎶ヨ")
+ @GetMapping("/equipmentAlarm")
+ public Result<?> equipmentAlarm(String productionId) {
+ List<EquipmentAlarm> result = mdcSubLargeScreenService.equipmentAlarm(productionId);
+ return Result.ok(result);
+ }
+
+ @ApiOperation(value = "鍒嗘帶鐪嬫澘-鍒�鍏峰鍛藉垪琛�", notes = "鍒嗘帶鐪嬫澘-鍒�鍏峰鍛藉垪琛�")
+ @GetMapping("/toolLifeList")
+ public Result<?> toolLifeList(String productionId) {
+ List<ToolLifeDto> result = mdcSubLargeScreenService.toolLifeList(productionId);
+ return Result.ok(result);
+ }
}
--
Gitblit v1.9.3