From e77384436e2f6d454bcf2c4bb66f70bb6a2024a6 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 16:39:26 +0800
Subject: [PATCH] 3.1预警设置界面用于导出的查询
---
src/main/resources/mapper/PwrdevAlarmParamMapper.xml | 17 ++++++++
src/main/java/com/whyc/mapper/BattAlmparamMapper.java | 2 +
src/main/resources/mapper/BattAlmparamMapper.xml | 17 ++++++++
src/main/java/com/whyc/controller/AlmParamController.java | 14 ++++++
src/main/java/com/whyc/service/BattAlmparamService.java | 6 +++
src/main/java/com/whyc/service/PwrdevAlarmParamService.java | 7 +++
src/main/java/com/whyc/mapper/PwrdevAlarmParamMapper.java | 2 +
src/main/java/com/whyc/pojo/db_param/BattAlmparam.java | 3 +
8 files changed, 67 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AlmParamController.java b/src/main/java/com/whyc/controller/AlmParamController.java
index 76c1bb3..b3552d3 100644
--- a/src/main/java/com/whyc/controller/AlmParamController.java
+++ b/src/main/java/com/whyc/controller/AlmParamController.java
@@ -55,6 +55,13 @@
return battAlmparamService.getBattAlmParam(dto);
}
+ @GetMapping("getBattAlmParamToExport")
+ @ApiOperation("鑾峰彇鐢垫睜鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)")
+ public Response getBattAlmParamToExport(){
+ Integer uid=ActionUtil.getUser().getId();
+ return battAlmparamService.getBattAlmParamToExport(uid);
+ }
+
@PostMapping("setBattAlmParam")
@ApiOperation("淇敼鐢垫睜鍛婅鍙傛暟")
public Response setBattAlmParam(@RequestBody List<BattAlmparam> almparamList){
@@ -86,7 +93,12 @@
return pwrAlmparamService.getPwrAlmParam(dto);
}
-
+ @GetMapping("getPwrAlmParamToExport")
+ @ApiOperation("鑾峰彇鐢垫簮鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)")
+ public Response getPwrAlmParamToExport(){
+ Integer uid=ActionUtil.getUser().getId();
+ return pwrAlmparamService.getPwrAlmParamToExport(uid);
+ }
@PostMapping("setPwrAlmParam")
@ApiOperation("淇敼鐢垫簮鍛婅鍙傛暟")
public Response setPwrAlmParam(@RequestBody List<PwrdevAlarmParam> almparamList){
diff --git a/src/main/java/com/whyc/mapper/BattAlmparamMapper.java b/src/main/java/com/whyc/mapper/BattAlmparamMapper.java
index ebfc057..69a8b36 100644
--- a/src/main/java/com/whyc/mapper/BattAlmparamMapper.java
+++ b/src/main/java/com/whyc/mapper/BattAlmparamMapper.java
@@ -9,4 +9,6 @@
public interface BattAlmparamMapper extends CustomMapper<BattAlmparam>{
//鑾峰彇鐢垫睜鍛婅鍙傛暟
List<BattAlmparam> getBattAlmParam(@Param("almDto") AlmDto almDto);
+ //鑾峰彇鐢垫睜鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)
+ List<BattAlmparam> getBattAlmParamToExport(@Param("uid") Integer uid);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/PwrdevAlarmParamMapper.java b/src/main/java/com/whyc/mapper/PwrdevAlarmParamMapper.java
index 46b3ced..5f87b3e 100644
--- a/src/main/java/com/whyc/mapper/PwrdevAlarmParamMapper.java
+++ b/src/main/java/com/whyc/mapper/PwrdevAlarmParamMapper.java
@@ -9,4 +9,6 @@
public interface PwrdevAlarmParamMapper extends CustomMapper<PwrdevAlarmParam>{
//鑾峰彇鐢垫簮鍛婅鍙傛暟
List<PwrdevAlarmParam> getPwrAlmParam(@Param("almDto") AlmDto almDto);
+ //鑾峰彇鐢垫簮鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)
+ List<PwrdevAlarmParam> getPwrAlmParamToExport(@Param("uid") Integer uid);
}
\ No newline at end of file
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 c2e2e41..e710ec9 100644
--- a/src/main/java/com/whyc/pojo/db_param/BattAlmparam.java
+++ b/src/main/java/com/whyc/pojo/db_param/BattAlmparam.java
@@ -78,6 +78,9 @@
@ApiModelProperty(value = "涓嬩笅闄愬憡璀︿娇鑳�")
private Integer almLowCoeLowerEn;
+ @ApiModelProperty(value = "鍛婅寤惰繜鏃堕暱[鍗曚綅锛氱]")
+ private Integer almDelayTime;
+
@TableField(exist = false)
private String provice;
diff --git a/src/main/java/com/whyc/service/BattAlmparamService.java b/src/main/java/com/whyc/service/BattAlmparamService.java
index 9dbcc75..b898972 100644
--- a/src/main/java/com/whyc/service/BattAlmparamService.java
+++ b/src/main/java/com/whyc/service/BattAlmparamService.java
@@ -40,6 +40,12 @@
//PageInfo<BattAlmparam> pageInfo=new PageInfo<>(list);
return new Response().setIII(1,list!=null,list,binf,"鑾峰彇鐢垫睜鍛婅鍙傛暟");
}
+ //鑾峰彇鐢垫睜鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)
+ public Response getBattAlmParamToExport(Integer uid) {
+ //鑾峰彇鎵�鏈夌殑鐢垫睜缁刬d
+ List<BattAlmparam> list = mapper.getBattAlmParamToExport(uid);
+ return new Response().setII(1,list!=null,list,"鑾峰彇鐢垫睜鍛婅鍙傛暟");
+ }
//淇敼鐢垫睜鍛婅鍙傛暟
public Response setBattAlmParam(List<BattAlmparam> almparamList) {
for (BattAlmparam param:almparamList) {
diff --git a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
index cbee80c..d53cc6b 100644
--- a/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
+++ b/src/main/java/com/whyc/service/PwrdevAlarmParamService.java
@@ -90,6 +90,12 @@
// PageInfo<PwrdevAlarmParam> pageInfo=new PageInfo(list);
return new Response().setIII(1,list!=null,list,pinf,"鑾峰彇鐢垫簮鍛婅鍙傛暟");
}
+
+ //鑾峰彇鐢垫簮鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)
+ public Response getPwrAlmParamToExport(Integer uid) {
+ List<PwrdevAlarmParam> list = mapper.getPwrAlmParamToExport(uid);
+ return new Response().setII(1,list!=null,list,"鑾峰彇鐢垫簮鍛婅鍙傛暟(鏃犲弬鐢ㄤ簬瀵煎嚭)");
+ }
//淇敼鐢垫簮鍛婅鍙傛暟
public Response setPwrAlmParam(List<PwrdevAlarmParam> almparamList) {
for (PwrdevAlarmParam param:almparamList) {
@@ -100,4 +106,5 @@
}
return new Response().set(1,true,"淇敼鐢垫簮鍛婅鍙傛暟");
}
+
}
\ No newline at end of file
diff --git a/src/main/resources/mapper/BattAlmparamMapper.xml b/src/main/resources/mapper/BattAlmparamMapper.xml
index 87b1535..32b4ca9 100644
--- a/src/main/resources/mapper/BattAlmparamMapper.xml
+++ b/src/main/resources/mapper/BattAlmparamMapper.xml
@@ -34,4 +34,21 @@
order by tb_batt_inf.dev_id asc,battgroup_id asc
</where>
</select>
+ <select id="getBattAlmParamToExport" resultType="com.whyc.pojo.db_param.BattAlmparam">
+ 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,db_param.tb_batt_almparam
+ <where>
+ tb_batt_inf.battgroup_id=tb_batt_almparam.battgroup_id
+ and tb_batt_inf.station_id=tb_station_inf.station_id
+ <if test="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=#{uid}
+ )
+ </if>
+ order by tb_batt_inf.dev_id asc,battgroup_id asc
+ </where>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/PwrdevAlarmParamMapper.xml b/src/main/resources/mapper/PwrdevAlarmParamMapper.xml
index 04568da..2bad1d9 100644
--- a/src/main/resources/mapper/PwrdevAlarmParamMapper.xml
+++ b/src/main/resources/mapper/PwrdevAlarmParamMapper.xml
@@ -34,4 +34,21 @@
order by tb_power_inf.power_id asc
</where>
</select>
+ <select id="getPwrAlmParamToExport" resultType="com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam">
+ select distinct tb_pwrdev_alarm_param.*,tb_power_inf.power_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_power_inf,db_station.tb_station_inf,db_pwrdev_alarm.tb_pwrdev_alarm_param
+ <where>
+ tb_power_inf.power_id=tb_pwrdev_alarm_param.power_id
+ and tb_power_inf.station_id=tb_station_inf.station_id
+ <if test="uid>100">
+ and tb_power_inf.power_id in(
+ select distinct power_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=#{uid}
+ )
+ </if>
+ order by tb_power_inf.power_id asc
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1