From 7c0f82055e064831c9971aad068106241705030e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 04 三月 2025 11:20:07 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcLargeScreenController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcLargeScreenController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcLargeScreenController.java
index 31b0207..5852dc8 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcLargeScreenController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcLargeScreenController.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.screen.dto.AlarmInfoDto;
import org.jeecg.modules.screen.dto.EquipmentStatusOverview;
import org.jeecg.modules.screen.service.MdcLargeScreenService;
import org.springframework.web.bind.annotation.GetMapping;
@@ -11,6 +12,8 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* @Author: Lius
@@ -28,16 +31,37 @@
@ApiOperation(value = "澶у睆鐪嬫澘-璁惧鎯呭喌", notes = "澶у睆鐪嬫澘-璁惧鎯呭喌")
@GetMapping("/equipmentStatusOverview")
- public Result<EquipmentStatusOverview> equipmentStatusOverview(String workshopId) {
- EquipmentStatusOverview equipmentStatusOverview = mdcLargeScreenService.equipmentStatusOverview(workshopId);
+ public Result<EquipmentStatusOverview> equipmentStatusOverview(String productionId) {
+ EquipmentStatusOverview equipmentStatusOverview = mdcLargeScreenService.equipmentStatusOverview(productionId);
return Result.OK(equipmentStatusOverview);
}
-// @ApiOperation(value = "澶у睆鐪嬫澘-鏈堝埄鐢ㄧ巼瓒嬪娍", notes = "澶у睆鐪嬫澘-鏈堝埄鐢ㄧ巼瓒嬪娍")
-// @GetMapping("/monthUtilizationTendency")
-// public Result<EquipmentStatusOverview> monthUtilizationTendency(String workshopId) {
-//
-// return Result.OK(equipmentStatusOverview);
-// }
+ @ApiOperation(value = "澶у睆鐪嬫澘-鏈堝埄鐢ㄧ巼瓒嬪娍", notes = "澶у睆鐪嬫澘-鏈堝埄鐢ㄧ巼瓒嬪娍")
+ @GetMapping("/monthUtilizationTendency")
+ public Result<Map<String, Object>> monthUtilizationTendency(String productionId) {
+ Map<String, Object> result = mdcLargeScreenService.monthUtilizationTendency(productionId);
+ return Result.OK(result);
+ }
+
+ @ApiOperation(value = "澶у睆鐪嬫澘-鍛ㄥ埄鐢ㄧ巼瓒嬪娍", notes = "澶у睆鐪嬫澘-鍛ㄥ埄鐢ㄧ巼瓒嬪娍")
+ @GetMapping("/weekUtilizationTendency")
+ public Result<Map<String, Object>> weekUtilizationTendency(String productionId) {
+ Map<String, Object> result = mdcLargeScreenService.weekUtilizationTendency(productionId);
+ return Result.OK(result);
+ }
+
+ @ApiOperation(value = "澶у睆鐪嬫澘-鏃ュ埄鐢ㄧ巼瓒嬪娍", notes = "澶у睆鐪嬫澘-鏃ュ埄鐢ㄧ巼瓒嬪娍")
+ @GetMapping("/dayUtilizationTendency")
+ public Result<Map<String, Object>> dayUtilizationTendency(String productionId) {
+ Map<String, Object> result = mdcLargeScreenService.dayUtilizationTendency(productionId);
+ return Result.OK(result);
+ }
+
+ @ApiOperation(value = "澶у睆鐪嬫澘-璁惧鎶ヨ淇℃伅", notes = "澶у睆鐪嬫澘-璁惧鎶ヨ淇℃伅")
+ @GetMapping("/getAlarmInfo")
+ public Result<List<AlarmInfoDto>> getAlarmInfo(String productionId) {
+ List<AlarmInfoDto> result = mdcLargeScreenService.getAlarmInfo(productionId);
+ return Result.OK(result);
+ }
}
--
Gitblit v1.9.3