From 3635a1df87e3a12d61b2a1bd7de2984475c4f71a Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 16 五月 2025 16:23:47 +0800
Subject: [PATCH] 修改查询机房和查询电源下拉返回为对象
---
src/main/java/com/whyc/service/StationInfService.java | 6 ++++--
src/main/java/com/whyc/service/BattInfService.java | 14 +++++++++++---
src/main/java/com/whyc/pojo/db_station/BattInf.java | 6 ++++++
src/main/resources/mapper/StationInfMapper.xml | 8 ++++----
src/main/java/com/whyc/controller/BattInfController.java | 9 +++++++--
src/main/java/com/whyc/mapper/StationInfMapper.java | 5 +++--
6 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattInfController.java b/src/main/java/com/whyc/controller/BattInfController.java
index 17cdae7..5eba3b6 100644
--- a/src/main/java/com/whyc/controller/BattInfController.java
+++ b/src/main/java/com/whyc/controller/BattInfController.java
@@ -20,11 +20,16 @@
private BattInfService service;
- @ApiOperation(value = "娣诲姞鐢垫睜缁�")
- @PostMapping("addBatt")
+ @ApiOperation(value = "璁惧娣诲姞鐢垫睜缁�")
+ @PostMapping("addBattInDev")
public Response addBatt(@RequestBody BattInf binf){
return service.addBatt(binf);
}
+ @ApiOperation(value = "鏂板缓鐢垫睜缁勶紙鏂扮殑璁惧鏂扮殑鐢垫睜缁勶級")
+ @PostMapping("addDev")
+ public Response addDev(@RequestBody BattInf binf){
+ return service.addDev(binf);
+ }
@ApiOperation(value = "鍒犻櫎鐢垫睜缁�")
@GetMapping("delBatt")
diff --git a/src/main/java/com/whyc/mapper/StationInfMapper.java b/src/main/java/com/whyc/mapper/StationInfMapper.java
index fc59e54..de5e7bb 100644
--- a/src/main/java/com/whyc/mapper/StationInfMapper.java
+++ b/src/main/java/com/whyc/mapper/StationInfMapper.java
@@ -1,6 +1,7 @@
package com.whyc.mapper;
import com.whyc.dto.Station.Provice;
+import com.whyc.pojo.db_station.PowerInf;
import com.whyc.pojo.db_station.StationInf;
import org.apache.ibatis.annotations.Param;
@@ -18,7 +19,7 @@
//鑾峰彇鐪佸競涓嬬殑鍖哄幙
List<String> getCountryByUid(@Param("uid") Integer uid,@Param("provice") String provice, @Param("city") String city);
//鑾峰彇鐪佸競鍖哄幙涓嬬殑绔欑偣
- List<String> getStationByUid(@Param("uid") Integer uid,@Param("provice") String provice,@Param("city") String city,@Param("country") String country);
+ List<StationInf> getStationByUid(@Param("uid") Integer uid,@Param("provice") String provice,@Param("city") String city,@Param("country") String country);
//鑾峰彇绔欑偣涓嬬殑鐢垫簮(涓嬫媺)
- List<String> getPowerByUid(@Param("uid") Integer uid,@Param("provice") String provice,@Param("city") String city,@Param("country") String country,@Param("stationName") String stationName);
+ List<PowerInf> getPowerByUid(@Param("uid") Integer uid, @Param("provice") String provice, @Param("city") String city, @Param("country") String country, @Param("stationName") String stationName);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_station/BattInf.java b/src/main/java/com/whyc/pojo/db_station/BattInf.java
index d144c34..e0d4596 100644
--- a/src/main/java/com/whyc/pojo/db_station/BattInf.java
+++ b/src/main/java/com/whyc/pojo/db_station/BattInf.java
@@ -47,6 +47,12 @@
@ApiModelProperty(value = "璁惧鍚嶇О")
private String devName;
+ @ApiModelProperty(value = "璁惧绫诲瀷")
+ private String devType;
+
+ @ApiModelProperty(value = "璁惧缂栧彿")
+ private Integer devNum;
+
@ApiModelProperty(value = "鐢垫睜缁刬d")
private Integer battgroupId;
diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index 36fa164..9f77385 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -25,8 +25,17 @@
@Autowired(required = false)
private BattInfMapper mapper;
-
- //娣诲姞鐢垫簮
+ /*鏂板缓鐢垫睜缁勶紙鏂扮殑璁惧鏂扮殑鐢垫睜缁勶級
+ * @param binf
+ * 1.鍦ㄧ數婧愪笅鏂板缓璁惧锛岃褰曡澶囩紪鍙凤紝devNum,璁惧鍚嶇О涓鸿澶囩被鍨�+devNum
+ */
+ public Response addDev(BattInf adddinf) {
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("station_id",adddinf.getStationId());
+ wrapper.eq("power_id",adddinf.getPowerId());
+ return new Response().set(1, true, "鏂板缓鐢垫睜缁勶紙鏂扮殑璁惧鏂扮殑鐢垫睜缁勶級");
+ }
+ //璁惧涓嬫坊鍔犵數婧�
@Transactional
public Response addBatt(BattInf addbinf) {
//鍒ゆ柇鐢垫睜缁勬槸鍚﹀瓨鍦�
@@ -106,6 +115,5 @@
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鐢垫睜");
}
-
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/StationInfService.java b/src/main/java/com/whyc/service/StationInfService.java
index 4b87cdd..f36a249 100644
--- a/src/main/java/com/whyc/service/StationInfService.java
+++ b/src/main/java/com/whyc/service/StationInfService.java
@@ -7,6 +7,8 @@
import com.whyc.dto.Response;
import com.whyc.dto.Station.Provice;
import com.whyc.mapper.StationInfMapper;
+import com.whyc.pojo.db_station.PowerInf;
+import com.whyc.pojo.db_station.StationInf;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,12 +42,12 @@
}
//鑾峰彇鐪佸競鍖哄幙涓嬬殑绔欑偣
public Response getStationByUid(int uid, String provice, String city, String country) {
- List<String> list=mapper.getStationByUid(uid,provice,city,country);
+ List<StationInf> list=mapper.getStationByUid(uid,provice,city,country);
return new Response().setII(1,list.size()>0,list,"鑾峰彇鐪佸競鍖哄幙涓嬬殑绔欑偣");
}
//鑾峰彇绔欑偣涓嬬殑鐢垫簮(涓嬫媺)
public Response getPowerByUid(int uid, String provice, String city, String country, String stationName) {
- List<String> list=mapper.getPowerByUid(uid,provice,city,country,stationName);
+ List<PowerInf> list=mapper.getPowerByUid(uid,provice,city,country,stationName);
return new Response().setII(1,list.size()>0,list,"鑾峰彇绔欑偣涓嬬殑鐢垫簮(涓嬫媺)");
}
}
\ No newline at end of file
diff --git a/src/main/resources/mapper/StationInfMapper.xml b/src/main/resources/mapper/StationInfMapper.xml
index 0331c38..775d9ee 100644
--- a/src/main/resources/mapper/StationInfMapper.xml
+++ b/src/main/resources/mapper/StationInfMapper.xml
@@ -110,8 +110,8 @@
</if>
</where>
</select>
- <select id="getStationByUid" resultType="java.lang.String">
- select distinct station_name from db_station.tb_station_inf
+ <select id="getStationByUid" resultType="StationInf">
+ select distinct * from db_station.tb_station_inf
<where>
<if test="provice!=null">
and provice=#{provice}
@@ -131,8 +131,8 @@
</if>
</where>
</select>
- <select id="getPowerByUid" resultType="java.lang.String">
- select distinct power_name from db_station.tb_power_inf,db_station.tb_station_inf
+ <select id="getPowerByUid" resultType="PowerInf">
+ select distinct * from db_station.tb_power_inf,db_station.tb_station_inf
<where>
tb_power_inf.station_id=tb_station_inf.station_id
<if test="provice!=null">
--
Gitblit v1.9.1