From 877a671ec240a67801c2840d3cdec961350bf5cf Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 10 六月 2025 17:28:31 +0800
Subject: [PATCH] 电池告警参数查询
---
src/main/resources/mapper/BattAlmparamMapper.xml | 30 +++++++++++++++++-------------
src/main/java/com/whyc/dto/Real/AlmDto.java | 1 +
src/main/java/com/whyc/controller/AlmParamController.java | 2 +-
src/main/java/com/whyc/pojo/db_param/BattAlmparam.java | 19 +++++++++++++++++++
4 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AlmParamController.java b/src/main/java/com/whyc/controller/AlmParamController.java
index 3ff7097..b1497a8 100644
--- a/src/main/java/com/whyc/controller/AlmParamController.java
+++ b/src/main/java/com/whyc/controller/AlmParamController.java
@@ -14,7 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
@RestController
-@Api(tags = "鍛婅绠＄悊")
+@Api(tags = "鍛婅鍙傛暟绠＄悊")
@RequestMapping("almParam")
public class AlmParamController {
@Autowired
diff --git a/src/main/java/com/whyc/dto/Real/AlmDto.java b/src/main/java/com/whyc/dto/Real/AlmDto.java
index 283d164..99280ba 100644
--- a/src/main/java/com/whyc/dto/Real/AlmDto.java
+++ b/src/main/java/com/whyc/dto/Real/AlmDto.java
@@ -13,6 +13,7 @@
private String city;
private String country;
private String stationName;
+ private String battgroupName;
private List<Integer> almIds;
private Integer almLevel;
private Integer pageNum;
diff --git a/src/main/java/com/whyc/pojo/db_param/BattAlmparam.java b/src/main/java/com/whyc/pojo/db_param/BattAlmparam.java
index 16ae02e..8610946 100644
--- a/src/main/java/com/whyc/pojo/db_param/BattAlmparam.java
+++ b/src/main/java/com/whyc/pojo/db_param/BattAlmparam.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_param;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -77,5 +78,23 @@
@ApiModelProperty(value = "涓嬩笅闄愬憡璀︿娇鑳�")
private Integer almLowCoeLowerEn;
+ @TableField(exist = false)
+ private String provice;
+
+ @TableField(exist = false)
+ private String city;
+
+ @TableField(exist = false)
+ private String country;
+
+ @TableField(exist = false)
+ private String fullName;
+
+ @TableField(exist = false)
+ private String stationName;
+
+ @ApiModelProperty(value = "鐢垫睜缁勫悕绉�")
+ @TableField(exist = false)
+ private String battgroupName;
}
diff --git a/src/main/resources/mapper/BattAlmparamMapper.xml b/src/main/resources/mapper/BattAlmparamMapper.xml
index 2be7e7c..87b1535 100644
--- a/src/main/resources/mapper/BattAlmparamMapper.xml
+++ b/src/main/resources/mapper/BattAlmparamMapper.xml
@@ -3,28 +3,32 @@
<mapper namespace="com.whyc.mapper.BattAlmparamMapper">
<select id="getBattAlmParam" resultType="com.whyc.pojo.db_param.BattAlmparam">
- select distinct tb_batt_inf.*
+ select distinct tb_batt_almparam.*,tb_batt_inf.battgroup_name
,tb_station_inf.station_type,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name
- from db_station.tb_batt_inf,db_station.tb_station_inf
+ from db_station.tb_batt_inf,db_station.tb_station_inf,db_param.tb_batt_almparam
<where>
- tb_batt_inf.station_id=tb_station_inf.station_id
- <if test="stic.provice!=null">
- and tb_station_inf.provice=#{stic.provice}
+ tb_batt_inf.battgroup_id=tb_batt_almparam.battgroup_id
+ and tb_batt_inf.station_id=tb_station_inf.station_id
+ <if test="almDto.provice!=null">
+ and tb_station_inf.provice=#{almDto.provice}
</if>
- <if test="stic.city!=null">
- and tb_station_inf.city=#{stic.city}
+ <if test="almDto.city!=null">
+ and tb_station_inf.city=#{almDto.city}
</if>
- <if test="stic.country!=null">
- and tb_station_inf.country=#{stic.country}
+ <if test="almDto.country!=null">
+ and tb_station_inf.country=#{almDto.country}
</if>
- <if test="stic.stationName!=null">
- and tb_station_inf.station_name=#{stic.stationName}
+ <if test="almDto.stationName!=null">
+ and tb_station_inf.station_name=#{almDto.stationName}
</if>
- <if test="stic.uid>100">
+ <if test="almDto.battgroupName!=null">
+ and tb_batt_inf.battgroup_name=#{almDto.battgroupName}
+ </if>
+ <if test="almDto.uid>100">
and tb_batt_inf.station_id in(
select distinct station_id from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr
where tb_baojigroup_power.baoji_group_id=tb_baojigroup_usr.baoji_group_id
- and tb_baojigroup_usr.uid=#{stic.uid}
+ and tb_baojigroup_usr.uid=#{almDto.uid}
)
</if>
order by tb_batt_inf.dev_id asc,battgroup_id asc
--
Gitblit v1.9.1