From eae3d7dfc44e469e90315339dc63efd5a8c2389a Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 17:17:16 +0800
Subject: [PATCH] 统计修改
---
src/main/java/com/whyc/pojo/db_ram_db/DeviceState.java | 7 +++++++
src/main/resources/mapper/BatttestdataInfMapper.xml | 3 ++-
src/main/resources/mapper/DeviceStateMapper.xml | 1 +
src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java | 7 +++++++
4 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java b/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
index 17e1079..9c62082 100644
--- a/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
+++ b/src/main/java/com/whyc/pojo/db_batt_testdata/BatttestdataInf.java
@@ -107,6 +107,13 @@
@TableField(exist = false)
private String stationName;
+
+ @TableField(exist = false)
+ private String stationId;
+
+ @TableField(exist = false)
+ private Integer powerId;
+
@TableField(exist = false)
private String battgroupName;
diff --git a/src/main/java/com/whyc/pojo/db_ram_db/DeviceState.java b/src/main/java/com/whyc/pojo/db_ram_db/DeviceState.java
index 34244bf..d0b91b9 100644
--- a/src/main/java/com/whyc/pojo/db_ram_db/DeviceState.java
+++ b/src/main/java/com/whyc/pojo/db_ram_db/DeviceState.java
@@ -131,6 +131,13 @@
@TableField(exist = false)
private String stationName;
+
+ @TableField(exist = false)
+ private String stationId;
+
+ @TableField(exist = false)
+ private Integer powerId;
+
@TableField(exist = false)
private String devName;
diff --git a/src/main/resources/mapper/BatttestdataInfMapper.xml b/src/main/resources/mapper/BatttestdataInfMapper.xml
index 2a04d22..933512e 100644
--- a/src/main/resources/mapper/BatttestdataInfMapper.xml
+++ b/src/main/resources/mapper/BatttestdataInfMapper.xml
@@ -4,7 +4,8 @@
<select id="getBattTinfStatistic" resultType="com.whyc.pojo.db_batt_testdata.BatttestdataInf">
select tb_batttestdata_inf.*
- ,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name,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
+ ,tb_batt_inf.battgroup_name,tb_batt_inf.power_id,tb_batt_inf.station_id
from db_batt_testdata.tb_batttestdata_inf,db_station.tb_station_inf,db_station.tb_batt_inf
<where>
tb_batttestdata_inf.battgroup_id=tb_batt_inf.battgroup_id
diff --git a/src/main/resources/mapper/DeviceStateMapper.xml b/src/main/resources/mapper/DeviceStateMapper.xml
index 8dc0277..33a5492 100644
--- a/src/main/resources/mapper/DeviceStateMapper.xml
+++ b/src/main/resources/mapper/DeviceStateMapper.xml
@@ -5,6 +5,7 @@
<select id="getDeviceStateStatistic" resultType="com.whyc.pojo.db_ram_db.DeviceState">
select tb_device_state.*
,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name,tb_batt_inf.dev_name
+ ,tb_batt_inf.power_id,tb_batt_inf.station_id
from db_ram_db.tb_device_state,db_station.tb_station_inf,db_station.tb_batt_inf
<where>
tb_device_state.dev_id=tb_batt_inf.dev_id
--
Gitblit v1.9.1