From e8401b85ea303e7cb87062dfa918cb59071befb3 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期五, 18 四月 2025 12:40:02 +0800
Subject: [PATCH] 报警代码优化
---
zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/HistoryAlarmController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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..1e26f86 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,11 +53,13 @@
* 鍘嗗彶鎶ヨ 椤甸潰 鏍规嵁 鑺傜偣鐩綍鍜� 鏉′欢鏌ヨ
*/
@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);
+ startPage();
+ List<JkHistoryAlarm> list = historyAlarmService.selectHistoryAlarmPageList(jkHistoryAlarm);
+// Page<JkHistoryAlarm> list = historyAlarmService.selectJkHistoryAlarmPage(jkHistoryAlarm);
return getDataTable(list);
}
/**
@@ -70,7 +70,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 +165,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