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/mapper/BattAlarmCfgMapper.java | 6 +++
src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java | 3 +
src/main/java/com/whyc/service/BattAlarmCfgService.java | 24 ++++++++++++
src/main/java/com/whyc/mapper/PowerAlarmCfgMapper.java | 6 +++
src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java | 3 +
src/main/java/com/whyc/service/BattAlarmService.java | 6 +++
src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java | 3 +
src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java | 3 +
src/main/java/com/whyc/pojo/db_param/BattAlarmCfg.java | 38 +++++++++++++++++++
src/main/java/com/whyc/service/PowerAlarmCfgService.java | 23 +++++++++++
10 files changed, 115 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/BattAlarmCfgMapper.java b/src/main/java/com/whyc/mapper/BattAlarmCfgMapper.java
new file mode 100644
index 0000000..6e2d5b9
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/BattAlarmCfgMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_param.BattAlarmCfg;
+
+public interface BattAlarmCfgMapper extends CustomMapper<BattAlarmCfg> {
+}
diff --git a/src/main/java/com/whyc/mapper/PowerAlarmCfgMapper.java b/src/main/java/com/whyc/mapper/PowerAlarmCfgMapper.java
new file mode 100644
index 0000000..3b82689
--- /dev/null
+++ b/src/main/java/com/whyc/mapper/PowerAlarmCfgMapper.java
@@ -0,0 +1,6 @@
+package com.whyc.mapper;
+
+import com.whyc.pojo.db_power_alarm.PowerAlarmCfg;
+
+public interface PowerAlarmCfgMapper extends CustomMapper<PowerAlarmCfg> {
+}
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java b/src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java
index c20020c..f3d1f61 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java
@@ -73,4 +73,7 @@
@TableField(exist = false)
@ApiModelProperty("鐢垫簮鍚嶇О")
private String powerName;
+
+ @TableField(exist = false)
+ private String almName;
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java b/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
index 1df4513..097e97b 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
@@ -59,6 +59,9 @@
private String powerName;
@TableField(exist = false)
+ private String almName;
+
+ @TableField(exist = false)
@ApiModelProperty("琛ㄥ悕瀛楁嫾鎺�")
private String recordYear;
diff --git a/src/main/java/com/whyc/pojo/db_param/BattAlarmCfg.java b/src/main/java/com/whyc/pojo/db_param/BattAlarmCfg.java
new file mode 100644
index 0000000..f7209ce
--- /dev/null
+++ b/src/main/java/com/whyc/pojo/db_param/BattAlarmCfg.java
@@ -0,0 +1,38 @@
+package com.whyc.pojo.db_param;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.ToString;
+
+@TableName(schema = "db_alarm",value = "batt_alarm_cfg")
+@ToString
+public class BattAlarmCfg {
+
+ private Integer num;
+ private Integer almId;
+ private String almName;
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public Integer getAlmId() {
+ return almId;
+ }
+
+ public void setAlmId(Integer almId) {
+ this.almId = almId;
+ }
+
+ public String getAlmName() {
+ return almName;
+ }
+
+ public void setAlmName(String almName) {
+ this.almName = almName;
+ }
+}
diff --git a/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java b/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java
index 417980d..f749ee3 100644
--- a/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarm.java
@@ -63,4 +63,7 @@
@TableField(exist = false)
@ApiModelProperty("鐢垫簮鍚嶇О")
private String powerName;
+
+ @TableField(exist = false)
+ private String almName;
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java b/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java
index 3fad888..0408144 100644
--- a/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java
+++ b/src/main/java/com/whyc/pojo/db_power_alarm/PowerAlarmHistory.java
@@ -62,6 +62,9 @@
private String powerName;
@TableField(exist = false)
+ private String almName;
+
+ @TableField(exist = false)
@ApiModelProperty("琛ㄥ悕瀛楁嫾鎺�")
private String recordYear;
diff --git a/src/main/java/com/whyc/service/BattAlarmCfgService.java b/src/main/java/com/whyc/service/BattAlarmCfgService.java
new file mode 100644
index 0000000..c6d8c8e
--- /dev/null
+++ b/src/main/java/com/whyc/service/BattAlarmCfgService.java
@@ -0,0 +1,24 @@
+package com.whyc.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.whyc.mapper.BattAlarmCfgMapper;
+import com.whyc.pojo.db_alarm.BattAlarm;
+import com.whyc.pojo.db_param.BattAlarmCfg;
+import com.whyc.util.ActionUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class BattAlarmCfgService {
+
+ @Autowired
+ private BattAlarmCfgMapper mapper;
+
+ public List<BattAlarmCfg> getList(){
+ return mapper.selectList((Wrapper<BattAlarmCfg>) ActionUtil.objeNull);
+ }
+
+
+}
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,"鏌ヨ鍒嗛〉");
}
diff --git a/src/main/java/com/whyc/service/PowerAlarmCfgService.java b/src/main/java/com/whyc/service/PowerAlarmCfgService.java
new file mode 100644
index 0000000..9eabb0f
--- /dev/null
+++ b/src/main/java/com/whyc/service/PowerAlarmCfgService.java
@@ -0,0 +1,23 @@
+package com.whyc.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.whyc.mapper.PowerAlarmCfgMapper;
+import com.whyc.pojo.db_power_alarm.PowerAlarmCfg;
+import com.whyc.util.ActionUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PowerAlarmCfgService {
+
+ @Autowired
+ private PowerAlarmCfgMapper mapper;
+
+ public List<PowerAlarmCfg> getList(){
+ return mapper.selectList((Wrapper<PowerAlarmCfg>) ActionUtil.objeNull);
+ }
+
+
+}
--
Gitblit v1.9.1