From a6b7035f3f359fc47e4fc0acb9b059839cac6d67 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 25 三月 2025 09:00:26 +0800
Subject: [PATCH] 告警类型对应
---
src/main/java/com/whyc/service/BattAlarmService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattAlarmService.java b/src/main/java/com/whyc/service/BattAlarmService.java
index 014518e..2f9122a 100644
--- a/src/main/java/com/whyc/service/BattAlarmService.java
+++ b/src/main/java/com/whyc/service/BattAlarmService.java
@@ -6,6 +6,7 @@
import com.whyc.dto.Response;
import com.whyc.mapper.BattAlarmMapper;
import com.whyc.pojo.db_alarm.BattAlarm;
+import com.whyc.pojo.db_param.BattAlarmCfg;
import com.whyc.util.ActionUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +20,9 @@
@Autowired(required = false)
private BattAlarmMapper mapper;
+ @Autowired
+ private BattAlarmCfgService cfgService;
+
/*
鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�
**/
@@ -30,6 +34,8 @@
public Response getPage(Integer almLevel, String startTime, String endTime ,int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
List<BattAlarm> list=mapper.getList(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
+ List<BattAlarmCfg> cfg = cfgService.getList();
+
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鍒嗛〉");
}
--
Gitblit v1.9.1