From 2eff7304df15f463dcd4563c0c62f4531bbef138 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 27 六月 2024 15:52:10 +0800
Subject: [PATCH] 电源ACDC
---
src/main/java/com/whyc/pojo/StationInf.java | 3 +
src/main/java/com/whyc/service/SinfBinfService.java | 19 +++++++--
src/main/java/com/whyc/pojo/PowerInf.java | 2
src/main/java/com/whyc/controller/SinfBinfController.java | 15 +++++--
src/main/java/com/whyc/pojo/SinfBinf.java | 4 ++
src/main/java/com/whyc/mapper/SinfBinfMapper.java | 7 ++-
src/main/resources/mapper/SinfBinfMapper.xml | 28 ++++++++++++--
pom.xml | 12 +++++
8 files changed, 74 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2863ddf..3dcd92d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,12 +72,22 @@
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.5</version>
</dependency>
-
<!--mybatis 鍙妋ybatis-plus-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.1.2</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>mybatis</artifactId>
+ <groupId>org.mybatis</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ <version>3.5.3</version>
</dependency>
<dependency>
diff --git a/src/main/java/com/whyc/controller/SinfBinfController.java b/src/main/java/com/whyc/controller/SinfBinfController.java
index 0ed33e1..96a88db 100644
--- a/src/main/java/com/whyc/controller/SinfBinfController.java
+++ b/src/main/java/com/whyc/controller/SinfBinfController.java
@@ -16,10 +16,17 @@
@Autowired
private SinfBinfService service;
- @ApiOperation("鏌ヨ宸︿晶鏈烘埧淇℃伅鍒楄〃")
- @GetMapping("getAllSinfBinf")
- public Response getAllSinfBinf(){
- Response res=service.getAllSinfBinf();
+ @ApiOperation("鏌ヨ宸︿晶鐢垫睜鏈烘埧淇℃伅鍒楄〃")
+ @GetMapping("getAllSinfBinf1")
+ public Response getAllSinfBinf1(){
+ Response res=service.getAllSinfBinf1();
+ return res;
+ }
+
+ @ApiOperation("鏌ヨ宸︿晶鐢垫簮鏈烘埧淇℃伅鍒楄〃")
+ @GetMapping("getAllSinfBinf2")
+ public Response getAllSinfBinf2(){
+ Response res=service.getAllSinfBinf2();
return res;
}
}
diff --git a/src/main/java/com/whyc/mapper/SinfBinfMapper.java b/src/main/java/com/whyc/mapper/SinfBinfMapper.java
index c2d7dee..8b5eef0 100644
--- a/src/main/java/com/whyc/mapper/SinfBinfMapper.java
+++ b/src/main/java/com/whyc/mapper/SinfBinfMapper.java
@@ -6,6 +6,9 @@
import java.util.List;
public interface SinfBinfMapper extends CustomMapper<SinfBinf>{
- //鏌ヨ宸︿晶鏈烘埧淇℃伅鍒楄〃
- List<StationInf> getAllSinfBinf();
+ //鏌ヨ宸︿晶鐢垫睜鏈烘埧淇℃伅鍒楄〃
+ List<StationInf> getAllSinfBinf1();
+
+ //鏌ヨ宸︿晶鐢垫簮鏈烘埧淇℃伅鍒楄〃
+ List<StationInf> getAllSinfBinf2();
}
diff --git a/src/main/java/com/whyc/pojo/PowerInf.java b/src/main/java/com/whyc/pojo/PowerInf.java
index 182cfab..b18ca24 100644
--- a/src/main/java/com/whyc/pojo/PowerInf.java
+++ b/src/main/java/com/whyc/pojo/PowerInf.java
@@ -26,7 +26,7 @@
@TableField("power_name")
@ApiModelProperty("鐢垫簮鍚嶇О")
- private Date power_name;
+ private String powerName;
@TableField("mon_num")
@ApiModelProperty("鍗曚綋涓暟")
diff --git a/src/main/java/com/whyc/pojo/SinfBinf.java b/src/main/java/com/whyc/pojo/SinfBinf.java
index b646393..03e1527 100644
--- a/src/main/java/com/whyc/pojo/SinfBinf.java
+++ b/src/main/java/com/whyc/pojo/SinfBinf.java
@@ -32,4 +32,8 @@
@TableField("group_index")
@ApiModelProperty("鏈烘埧鍐呯數姹犵粍缂栧彿")
private Integer groupIndex;
+
+ @TableField("stype")
+ @ApiModelProperty("鏈烘埧绫诲瀷: 1<鐢垫睜缁�> 2<鐢垫簮>")
+ private Integer stype;
}
diff --git a/src/main/java/com/whyc/pojo/StationInf.java b/src/main/java/com/whyc/pojo/StationInf.java
index aaadbbd..2f43bec 100644
--- a/src/main/java/com/whyc/pojo/StationInf.java
+++ b/src/main/java/com/whyc/pojo/StationInf.java
@@ -32,4 +32,7 @@
@TableField(exist = false)
private List<BattInf> binfList;
+
+ @TableField(exist = false)
+ private List<PowerInf> pinfList;
}
diff --git a/src/main/java/com/whyc/service/SinfBinfService.java b/src/main/java/com/whyc/service/SinfBinfService.java
index d9b07e6..1a5b1c4 100644
--- a/src/main/java/com/whyc/service/SinfBinfService.java
+++ b/src/main/java/com/whyc/service/SinfBinfService.java
@@ -14,14 +14,25 @@
@Autowired(required = false)
private SinfBinfMapper mapper;
- /*鏌ヨ宸︿晶鏈烘埧淇℃伅鍒楄〃
+ /*鏌ヨ宸︿晶鐢垫睜鏈烘埧淇℃伅鍒楄〃
* @param null 鍏ュ弬
* @return null
* @author lxw
* @date 2024/6/15 9:41
**/
- public Response getAllSinfBinf() {
- List<StationInf> list=mapper.getAllSinfBinf();
- return new Response().setII(1,list!=null,list,"宸︿晶鏈烘埧淇℃伅");
+ public Response getAllSinfBinf1() {
+ List<StationInf> list=mapper.getAllSinfBinf1();
+ return new Response().setII(1,list!=null,list,"宸︿晶鐢垫睜鏈烘埧淇℃伅");
+ }
+
+ /*鏌ヨ宸︿晶鐢垫簮鏈烘埧淇℃伅鍒楄〃
+ * @param null 鍏ュ弬
+ * @return null
+ * @author lxw
+ * @date 2024/6/15 9:41
+ **/
+ public Response getAllSinfBinf2() {
+ List<StationInf> list=mapper.getAllSinfBinf2();
+ return new Response().setII(1,list!=null,list,"宸︿晶鐢垫簮鏈烘埧淇℃伅");
}
}
diff --git a/src/main/resources/mapper/SinfBinfMapper.xml b/src/main/resources/mapper/SinfBinfMapper.xml
index 8795bf8..52a273a 100644
--- a/src/main/resources/mapper/SinfBinfMapper.xml
+++ b/src/main/resources/mapper/SinfBinfMapper.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.SinfBinfMapper">
- <resultMap id="sinfList" type="stationInf">
+ <resultMap id="sinfList1" type="stationInf">
<id property="sinfId" column="sinf_id"></id>
<result property="sinfName" column="sinf_name"></result>
<result property="sinfIp" column="sinf_ip"></result>
<collection property="binfList" javaType="java.util.ArrayList" ofType="com.whyc.pojo.BattInf" column="{sinfId=sinf_id}" select="selectBinfList">
</collection>
-
</resultMap>
- <select id="getAllSinfBinf" resultMap="sinfList">
- select * from db_batt.station_inf order by sinf_id asc
+ <select id="getAllSinfBinf1" resultMap="sinfList1">
+ select * from db_batt.station_inf where stype=1 or stype=0 order by sinf_id asc
</select>
+
<select id="selectBinfList" resultType="battInf">
select batt_inf.* from db_batt.batt_inf,db_batt.sinf_binf
<where>
@@ -19,4 +19,24 @@
and sinf_binf.sinf_id=#{sinfId}
</where>
</select>
+
+ <resultMap id="sinfList2" type="stationInf">
+ <id property="sinfId" column="sinf_id"></id>
+ <result property="sinfName" column="sinf_name"></result>
+ <result property="sinfIp" column="sinf_ip"></result>
+ <collection property="pinfList" javaType="java.util.ArrayList" ofType="com.whyc.pojo.PowerInf" column="{sinfId=sinf_id}" select="selectPinfList">
+ </collection>
+ </resultMap>
+ <select id="getAllSinfBinf2" resultMap="sinfList2">
+ select * from db_batt.station_inf where stype=2 or stype=0 order by sinf_id asc
+ </select>
+
+ <select id="selectPinfList" resultType="powerInf">
+ select power_inf.* from db_batt.power_inf,db_batt.sinf_pinf
+ <where>
+ power_inf.power_id=sinf_pinf.pinf_id
+ and sinf_pinf.sinf_id=#{sinfId}
+ </where>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1