From 285e8c1270fc75997ac2340a06f224a7f3fe7b6b Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 27 五月 2025 15:56:01 +0800
Subject: [PATCH] 实时告警添加省市区县全称
---
src/main/resources/mapper/PwrdevAlarmMapper.xml | 2 +-
src/main/resources/mapper/BattalarmDataMapper.xml | 2 +-
src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java | 9 +++++++++
src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java | 8 ++++++++
src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java | 8 ++++++++
src/main/resources/mapper/DevalarmDataMapper.xml | 2 +-
6 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java b/src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java
index eeef1c0..a4aa3f4 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattalarmData.java
@@ -83,5 +83,13 @@
@TableField(exist = false)
private String stationName;
+ @TableField(exist = false)
+ private String provice;
+ @TableField(exist = false)
+ private String city;
+ @TableField(exist = false)
+ private String country;
+ @TableField(exist = false)
+ private String fullName;
}
diff --git a/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java b/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
index e9de683..06d33de 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
@@ -82,4 +82,13 @@
@TableField(exist = false)
private String stationName;
+ @TableField(exist = false)
+ private String provice;
+ @TableField(exist = false)
+ private String city;
+ @TableField(exist = false)
+ private String country;
+ @TableField(exist = false)
+ private String fullName;
+
}
diff --git a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java
index eeacffe..cebb984 100644
--- a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java
@@ -74,4 +74,12 @@
@TableField(exist = false)
private String stationName;
+ @TableField(exist = false)
+ private String provice;
+ @TableField(exist = false)
+ private String city;
+ @TableField(exist = false)
+ private String country;
+ @TableField(exist = false)
+ private String fullName;
}
diff --git a/src/main/resources/mapper/BattalarmDataMapper.xml b/src/main/resources/mapper/BattalarmDataMapper.xml
index 29a1a73..3bf08da 100644
--- a/src/main/resources/mapper/BattalarmDataMapper.xml
+++ b/src/main/resources/mapper/BattalarmDataMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.whyc.mapper.BattalarmDataMapper">
<select id="getBattAlmReal" resultType="com.whyc.pojo.db_alarm.BattalarmData">
- select tb_battalarm_data.*,tb_batt_inf.battgroup_name,tb_station_inf.station_name
+ select tb_battalarm_data.*,tb_batt_inf.battgroup_name,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name
from db_alarm.tb_battalarm_data,db_station.tb_batt_inf,db_station.tb_station_inf
<where>
tb_battalarm_data.battgroup_id=tb_batt_inf.battgroup_id
diff --git a/src/main/resources/mapper/DevalarmDataMapper.xml b/src/main/resources/mapper/DevalarmDataMapper.xml
index b14968d..ef4e3bb 100644
--- a/src/main/resources/mapper/DevalarmDataMapper.xml
+++ b/src/main/resources/mapper/DevalarmDataMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.DevalarmDataMapper">
<select id="getDevAlmReal" resultType="com.whyc.pojo.db_alarm.DevalarmData">
- select tb_devalarm_data.*,tb_batt_inf.dev_name,tb_station_inf.station_name
+ select tb_devalarm_data.*,tb_batt_inf.dev_name,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name
from db_alarm.tb_devalarm_data,db_station.tb_batt_inf,db_station.tb_station_inf
<where>
tb_devalarm_data.dev_id=tb_batt_inf.dev_id
diff --git a/src/main/resources/mapper/PwrdevAlarmMapper.xml b/src/main/resources/mapper/PwrdevAlarmMapper.xml
index ce0719f..094f7e4 100644
--- a/src/main/resources/mapper/PwrdevAlarmMapper.xml
+++ b/src/main/resources/mapper/PwrdevAlarmMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.PwrdevAlarmMapper">
<select id="getPwrAlmReal" resultType="com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarm">
- select tb_pwrdev_alarm.*,tb_power_inf.power_name,tb_station_inf.station_name
+ select tb_pwrdev_alarm.*,tb_power_inf.power_name,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name
from db_pwrdev_alarm.tb_pwrdev_alarm,db_station.tb_power_inf,db_station.tb_station_inf
<where>
tb_pwrdev_alarm.power_id=tb_power_inf.power_id
--
Gitblit v1.9.1