From 0d3e5cefe51ab44f28097839405c1a4c31466650 Mon Sep 17 00:00:00 2001 From: lius <Lius2225@163.com> Date: 星期四, 07 九月 2023 14:40:49 +0800 Subject: [PATCH] 报警分析走势 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentAlarmAnalyzeController.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentAlarmAnalyzeController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentAlarmAnalyzeController.java index ee6b397..e18ce6f 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentAlarmAnalyzeController.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEquipmentAlarmAnalyzeController.java @@ -8,8 +8,9 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.mdc.dto.MdcAlarmAnalyzeDto; +import org.jeecg.modules.mdc.dto.MdcAlarmTrendDto; import org.jeecg.modules.mdc.service.MdcEquipmentAlarmAnalyzeService; -import org.jeecg.modules.mdc.vo.DayUtilizationRateContrastQueryVo; +import org.jeecg.modules.mdc.vo.MdcAlarmAnalyzeQueryVo; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -33,11 +34,21 @@ @AutoLog(value = "鎶ヨ鍒嗘瀽-鍒楄〃鏌ヨ") @ApiOperation(value = "鎶ヨ鍒嗘瀽-鍒楄〃鏌ヨ", notes = "鎶ヨ鍒嗘瀽-鍒楄〃鏌ヨ") @GetMapping("/alarmList") - public Result alarmList(DayUtilizationRateContrastQueryVo vo) { + public Result alarmList(MdcAlarmAnalyzeQueryVo vo) { LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = user.getId(); List<MdcAlarmAnalyzeDto> result = mdcEquipmentAlarmAnalyzeService.alarmList(userId, vo); return Result.OK(result); } + @AutoLog(value = "鎶ヨ鍒嗘瀽-璧板娍鏌ヨ") + @ApiOperation(value = "鎶ヨ鍒嗘瀽-璧板娍鏌ヨ", notes = "鎶ヨ鍒嗘瀽-璧板娍鏌ヨ") + @GetMapping("/alarmTrend") + public Result alarmTrend(MdcAlarmAnalyzeQueryVo vo) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userId = user.getId(); + MdcAlarmTrendDto result = mdcEquipmentAlarmAnalyzeService.alarmTrend(userId, vo); + return Result.OK(result); + } + } -- Gitblit v1.9.3