From 7d8887e36acb71ee20bf2f55170571b3fa7621b7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 31 十月 2024 15:47:12 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcSubLargeScreenController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 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..df7ca86 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,12 +4,15 @@
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.EquipmentInfoDto;
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;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@@ -42,12 +45,26 @@
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);
+ }
+
+ @ApiOperation(value = "鍒嗘帶鐪嬫澘-璁惧璇︾粏淇℃伅", notes = "鍒嗘帶鐪嬫澘-璁惧璇︾粏淇℃伅")
+ @GetMapping("/equipmentInfo")
+ public Result<?> equipmentInfo(@RequestParam(name = "equipmentId", required = true) String equipmentId) {
+ EquipmentInfoDto result = mdcSubLargeScreenService.equipmentInfo(equipmentId);
+ return Result.ok(result);
+ }
}
--
Gitblit v1.9.3