From 4b3cef746d0752487beffb72ff340e220b0388cd Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 21 六月 2025 16:20:02 +0800
Subject: [PATCH] 预警分析管理修改
---
src/main/java/com/whyc/controller/AnalysisAlmController.java | 9 +++++++++
src/main/java/com/whyc/service/BattInfService.java | 4 ++--
src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java | 3 ++-
src/main/java/com/whyc/service/DevalarmDataService.java | 5 +++--
src/main/java/com/whyc/dto/AnalysisAlm/AnalysisChangeRes.java | 1 -
src/main/java/com/whyc/mapper/BattInfMapper.java | 4 ++--
src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java | 3 ++-
src/main/resources/mapper/BattInfMapper.xml | 8 ++++----
src/main/java/com/whyc/service/AlmAnalysisParamService.java | 8 +-------
src/main/java/com/whyc/service/AppParamService.java | 5 +++--
src/main/java/com/whyc/service/PwrdevAlarmService.java | 5 +++--
11 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AnalysisAlmController.java b/src/main/java/com/whyc/controller/AnalysisAlmController.java
index 4cb50cd..f6953b6 100644
--- a/src/main/java/com/whyc/controller/AnalysisAlmController.java
+++ b/src/main/java/com/whyc/controller/AnalysisAlmController.java
@@ -33,6 +33,9 @@
@Autowired
private DevalarmDataService devalarmDataService;
+ @Autowired
+ private AppParamService appParamService;
+
@PostMapping("getBattAlmAnalyse")
@ApiOperation("棰勮鍒嗘瀽绠＄悊-鐢垫睜鍛婅")
public Response getBattAlmAnalyse(@RequestBody AlmAnalyseDto dto){
@@ -75,4 +78,10 @@
return almAnalysisParamService.getAlmSummaryParam();
}
+ @PostMapping("updateAlarmAnalysisCycle")
+ @ApiOperation("棰勮鍒嗘瀽绠＄悊-璁剧疆鏃堕棿闂撮殧")
+ public Response updateAlarmAnalysisCycle(@RequestParam Integer intervalTime){
+ return appParamService.updateAlarmAnalysisCycle(intervalTime);
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/dto/AnalysisAlm/AnalysisChangeRes.java b/src/main/java/com/whyc/dto/AnalysisAlm/AnalysisChangeRes.java
index 666c4f7..6a1183f 100644
--- a/src/main/java/com/whyc/dto/AnalysisAlm/AnalysisChangeRes.java
+++ b/src/main/java/com/whyc/dto/AnalysisAlm/AnalysisChangeRes.java
@@ -7,7 +7,6 @@
private Integer battgroupId;
private Integer powerId;
private String startTime;
- private Integer intervalTime;
private String dataName1;
private Integer dataType1;
private String dataName2;
diff --git a/src/main/java/com/whyc/mapper/BattInfMapper.java b/src/main/java/com/whyc/mapper/BattInfMapper.java
index a58423e..806cbe4 100644
--- a/src/main/java/com/whyc/mapper/BattInfMapper.java
+++ b/src/main/java/com/whyc/mapper/BattInfMapper.java
@@ -64,7 +64,7 @@
//鏍规嵁鏌ヨ鏉′欢鑾峰彇鐢垫睜缁勯泦鍚�
BattInf getBattgroupIdInf(@Param("battgroupId") Integer battgroupId);
//鏌ヨ鐢垫簮涓嬫墍鏈夌殑鐢垫睜缁刬d
- List<Integer> getBattgroupIdListByPowerId(@Param("powerId") Integer powerId);
+ List<BattInf> getBattgroupIdListByPowerId(@Param("powerId") Integer powerId);
//鏌ヨ璁惧涓嬫墍鏈夌殑鐢垫睜缁刬d
- List<Integer> getBattgroupIdListByDevId(@Param("devId") Integer devId);
+ List<BattInf> getBattgroupIdListByDevId(@Param("devId") Integer devId);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java b/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
index 3056462..6b2df4e 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/DevalarmData.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.whyc.pojo.db_station.BattInf;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -95,6 +96,6 @@
@TableField(exist = false)
private String fullName;
@TableField(exist = false)
- private List<Integer> battgroupIdList;
+ private List<BattInf> binfList;
}
diff --git a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java
index fd2f3bb..c64d9a2 100644
--- a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarm.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.whyc.pojo.db_station.BattInf;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -88,5 +89,5 @@
private String fullName;
@TableField(exist = false)
- private List<Integer> battgroupIdList;
+ private List<BattInf> binfList;
}
diff --git a/src/main/java/com/whyc/service/AlmAnalysisParamService.java b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
index 9c76ae8..3cf2853 100644
--- a/src/main/java/com/whyc/service/AlmAnalysisParamService.java
+++ b/src/main/java/com/whyc/service/AlmAnalysisParamService.java
@@ -206,13 +206,7 @@
Integer cycleTime=0;
//鑾峰彇棰勮鍒嗘瀽鍛ㄦ湡闃堝��
AppParam appParam = appParamService.getAlarmAnalysisCycle();
- if(res.getIntervalTime()==null){
- cycleTime=appParam.getParamValue().intValue();
- }else{
- //灏嗘暟鎹簱涓椂闂撮棿闅斾慨鏀�
- appParamService.updateAlarmAnalysisCycle(res.getIntervalTime());
- cycleTime=res.getIntervalTime();
- }
+ cycleTime=appParam.getParamValue().intValue();
Date cyscleDate=ActionUtil.getDateAdd(ThreadLocalUtil.parse(res.getStartTime(),1),cycleTime*(-1));
//鑾峰彇cyscleDate鍒扮幇鍦ㄦ墍鏈夌殑鍘嗗彶瀹炴椂鏁版嵁
List<List<Date>> monthTimeList = DateUtil.getMonthTime(cyscleDate,new Date());
diff --git a/src/main/java/com/whyc/service/AppParamService.java b/src/main/java/com/whyc/service/AppParamService.java
index 623d80f..f781a0f 100644
--- a/src/main/java/com/whyc/service/AppParamService.java
+++ b/src/main/java/com/whyc/service/AppParamService.java
@@ -63,10 +63,11 @@
return param;
}
//灏嗘暟鎹簱涓椂闂撮棿闅斾慨鏀�
- public void updateAlarmAnalysisCycle(Integer intervalTime) {
+ public Response updateAlarmAnalysisCycle(Integer intervalTime) {
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("param_name_psx","alm_analysis_already_time");
wrapper.set("param_value",intervalTime);
- mapper.update(null,wrapper);
+ int flag=mapper.update(null,wrapper);
+ return new Response().setII(1,flag>0,flag,"淇敼鎴愬姛");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index 2fee615..5aff1a0 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -503,11 +503,11 @@
return mapper.getBattgroupIdInf(battgroupId);
}
//鏌ヨ鐢垫簮涓嬫墍鏈夌殑鐢垫睜缁刬d
- public List<Integer> getBattgroupIdListByPowerId(Integer powerId) {
+ public List<BattInf> getBattgroupIdListByPowerId(Integer powerId) {
return mapper.getBattgroupIdListByPowerId(powerId);
}
//鏌ヨ璁惧涓嬫墍鏈夌殑鐢垫睜缁刬d
- public List<Integer> getBattgroupIdListByDevId(Integer devId) {
+ public List<BattInf> getBattgroupIdListByDevId(Integer devId) {
return mapper.getBattgroupIdListByDevId(devId);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/DevalarmDataService.java b/src/main/java/com/whyc/service/DevalarmDataService.java
index 6b5f4ee..02b22ae 100644
--- a/src/main/java/com/whyc/service/DevalarmDataService.java
+++ b/src/main/java/com/whyc/service/DevalarmDataService.java
@@ -15,6 +15,7 @@
import com.whyc.mapper.DevalarmDataMapper;
import com.whyc.pojo.db_alarm.BattalarmData;
import com.whyc.pojo.db_alarm.DevalarmData;
+import com.whyc.pojo.db_station.BattInf;
import com.whyc.pojo.web_site.AlarmInspection;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -96,8 +97,8 @@
list.forEach(data->{
data.setAlmName(DevAlarmEnum.getValue(data.getAlmId()));
//鏌ヨ璁惧涓嬫墍鏈夌殑鐢垫睜缁刬d
- List<Integer> battgroupIdList = battInfService.getBattgroupIdListByDevId(data.getDevId());
- data.setBattgroupIdList(battgroupIdList);
+ List<BattInf> binfList = battInfService.getBattgroupIdListByDevId(data.getDevId());
+ data.setBinfList(binfList);
});
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鑾峰彇璁惧瀹炴椂鍛婅淇℃伅");
diff --git a/src/main/java/com/whyc/service/PwrdevAlarmService.java b/src/main/java/com/whyc/service/PwrdevAlarmService.java
index fe61803..4a79045 100644
--- a/src/main/java/com/whyc/service/PwrdevAlarmService.java
+++ b/src/main/java/com/whyc/service/PwrdevAlarmService.java
@@ -21,6 +21,7 @@
import com.whyc.pojo.db_param.AppParam;
import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarm;
import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmParam;
+import com.whyc.pojo.db_station.BattInf;
import com.whyc.pojo.web_site.AlarmInspection;
import com.whyc.util.ActionUtil;
import com.whyc.util.DateUtil;
@@ -114,8 +115,8 @@
for (PwrdevAlarm pwrAlm:list) {
pwrAlm.setAlmName(PowerAlarmEnum.getValue(pwrAlm.getAlmId()));
//鏌ヨ鐢垫簮涓嬫墍鏈夌殑鐢垫睜缁刬d
- List<Integer> battgroupIdList = battInfService.getBattgroupIdListByPowerId(pwrAlm.getPowerId());
- pwrAlm.setBattgroupIdList(battgroupIdList);
+ List<BattInf> binfList = battInfService.getBattgroupIdListByPowerId(pwrAlm.getPowerId());
+ pwrAlm.setBinfList(binfList);
}
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list!=null,pageInfo,"鐢垫簮鍛婅鍒嗘瀽");
diff --git a/src/main/resources/mapper/BattInfMapper.xml b/src/main/resources/mapper/BattInfMapper.xml
index f572667..3ddd7c3 100644
--- a/src/main/resources/mapper/BattInfMapper.xml
+++ b/src/main/resources/mapper/BattInfMapper.xml
@@ -476,16 +476,16 @@
</where>
limit 1
</select>
- <select id="getBattgroupIdListByPowerId" resultType="java.lang.Integer">
- select distinct tb_batt_inf.battgroup_id
+ <select id="getBattgroupIdListByPowerId" resultType="com.whyc.pojo.db_station.BattInf">
+ select distinct tb_batt_inf.*
from db_station.tb_batt_inf
<where>
tb_batt_inf.power_id=#{powerId}
</where>
order by battgroup_num asc
</select>
- <select id="getBattgroupIdListByDevId" resultType="java.lang.Integer">
- select distinct tb_batt_inf.battgroup_id
+ <select id="getBattgroupIdListByDevId" resultType="com.whyc.pojo.db_station.BattInf">
+ select distinct tb_batt_inf.*
from db_station.tb_batt_inf
<where>
tb_batt_inf.dev_id=#{devId}
--
Gitblit v1.9.1