From 12ea7330bac0a43818b8ec3a8601119dd609dfb9 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期五, 18 四月 2025 22:43:12 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/zhitan-cloud/zhitan-ems
---
zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java
index 181e1ff..4d2c776 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java
@@ -12,6 +12,7 @@
import com.zhitan.common.enums.BusinessType;
import com.zhitan.common.utils.poi.ExcelUtil;
import com.zhitan.framework.web.service.TokenService;
+import com.zhitan.model.domain.ModelNode;
import com.zhitan.realtimedata.domain.TagValue;
import com.zhitan.realtimedata.service.RealtimeDatabaseService;
import io.swagger.annotations.Api;
@@ -43,10 +44,7 @@
public class HistoryAlarmController extends BaseController
{
@Autowired
- private IHistoryAlarmService iHistoryAlarmService;
-
- @Autowired
- private TokenService tokenService;
+ private IHistoryAlarmService historyAlarmService;
@Autowired
private RealtimeDatabaseService realtimeDatabaseService;
@@ -55,12 +53,11 @@
* 鍘嗗彶鎶ヨ 椤甸潰 鏍规嵁 鑺傜偣鐩綍鍜� 鏉′欢鏌ヨ
*/
@ApiOperation("鍘嗗彶鎶ヨ鏌ヨ")
-// @PreAuthorize("@ss.hasPermi('energyAlarm:historicalAlarm:list')")
+ @PreAuthorize("@ss.hasPermi('energyAlarm:historicalAlarm:list')")
@GetMapping("/list")
- public TableDataInfo list(JkHistoryAlarm jkHistoryAlarm,Long pageNum,Long pageSize)
+ public TableDataInfo list(JkHistoryAlarm jkHistoryAlarm)
{
- Page<JkHistoryAlarm> list = iHistoryAlarmService.selectJkHistoryAlarmPage(jkHistoryAlarm,pageNum,pageSize);
- return getDataTable(list);
+ return getDataTable(historyAlarmService.selectHistoryAlarmPageList(jkHistoryAlarm));
}
/**
* 瀵煎嚭鍘嗗彶鎶ヨ鐩戞帶鍒楄〃
@@ -70,7 +67,7 @@
@GetMapping("/export")
public AjaxResult export(JkHistoryAlarm jkHistoryAlarm)
{
- List<JkHistoryAlarm> list = iHistoryAlarmService.selectJkHistoryAlarmListExcel(jkHistoryAlarm);
+ List<JkHistoryAlarm> list = historyAlarmService.selectJkHistoryAlarmListExcel(jkHistoryAlarm);
ExcelUtil<JkHistoryAlarm> util = new ExcelUtil<JkHistoryAlarm>(JkHistoryAlarm.class);
return util.exportExcel(list, "alarm");
}
@@ -165,7 +162,7 @@
public TableDataInfo listNote(JkHistoryAlarm jkHistoryAlarm)
{
startPage();
- List<JkHistoryAlarm> list = iHistoryAlarmService.selectHistoryAlarmNoteList(jkHistoryAlarm);
+ List<JkHistoryAlarm> list = historyAlarmService.selectHistoryAlarmNoteList(jkHistoryAlarm);
return getDataTable(list);
}
}
--
Gitblit v1.9.3