From 4b3d8d360638073683eef4260be228dd2a9f541b Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 27 三月 2025 10:06:48 +0800
Subject: [PATCH] 电源查询增加站点字段
---
src/main/java/com/whyc/mapper/PowerInfMapper.java | 9 +++++++++
src/main/java/com/whyc/service/PowerInfService.java | 9 ++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/PowerInfMapper.java b/src/main/java/com/whyc/mapper/PowerInfMapper.java
index 356c8cb..9116478 100644
--- a/src/main/java/com/whyc/mapper/PowerInfMapper.java
+++ b/src/main/java/com/whyc/mapper/PowerInfMapper.java
@@ -12,4 +12,13 @@
@Select("select distinct producer from db_batt.power_inf where producer is not null")
List<String> getProducerList();
+
+ @Select("SELECT s.sinf_name as station_name,p.*,p.binf_id as battGroupId,p.binf_name as battGroupName from db_batt.power_inf p,db_batt.sinf_pinf sp,db_batt.station_inf s\n" +
+ "where p.power_id = sp.pinf_id and sp.sinf_id = s.sinf_id")
+ List<PowerInf> getList();
+
+ @Select("SELECT s.sinf_name as station_name,p.*,p.binf_id as battGroupId,p.binf_name as battGroupName from db_batt.power_inf p,db_batt.sinf_pinf sp,db_batt.station_inf s\n" +
+ "where p.power_id = sp.pinf_id and sp.sinf_id = s.sinf_id and power_id = #{powerId}")
+ PowerInf getById(int powerId);
+
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/PowerInfService.java b/src/main/java/com/whyc/service/PowerInfService.java
index 520622d..697aa48 100644
--- a/src/main/java/com/whyc/service/PowerInfService.java
+++ b/src/main/java/com/whyc/service/PowerInfService.java
@@ -146,16 +146,19 @@
public Response getPage(int pageNum, int pageSize) {
PageHelper helper = new PageHelper();
helper.startPage(pageNum,pageSize);
- QueryWrapper<PowerInf> queryWrapper = Wrappers.query();
+ /*QueryWrapper<PowerInf> queryWrapper = Wrappers.query();
queryWrapper.orderByAsc("power_id");
- List<PowerInf> powerInfs = mapper.selectList(queryWrapper);
+
+ List<PowerInf> powerInfs = mapper.selectList(queryWrapper);*/
+ List<PowerInf> powerInfs = mapper.getList();
PageInfo<PowerInf> pageInfo = new PageInfo<>(powerInfs);
return new Response().set(1,pageInfo);
}
public Response getById(int powerId) {
- PowerInf powerInf = mapper.selectById(powerId);
+ //PowerInf powerInf = mapper.selectById(powerId);
+ PowerInf powerInf = mapper.getById(powerId);
return new Response().set(1,powerInf);
}
--
Gitblit v1.9.1