From b81c329ac5c9885f7c1b79b7aea9f8a0a5c8d18a Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 24 三月 2025 16:23:46 +0800
Subject: [PATCH] 电源告警实时和历史
---
src/main/java/com/whyc/mapper/PowerAlarmMapper.java | 2
src/main/resources/mapper/PowerAlarmMapper.xml | 2
src/main/java/com/whyc/service/SubTableService.java | 14 +++++--
src/main/java/com/whyc/service/PowerAlarmHistoryService.java | 6 +-
src/main/java/com/whyc/controller/PowerAlarmController.java | 37 ++++++++----------
src/main/java/com/whyc/service/PowerAlarmService.java | 8 ++--
6 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/whyc/controller/PowerAlarmController.java b/src/main/java/com/whyc/controller/PowerAlarmController.java
index e6c9403..eef9e7f 100644
--- a/src/main/java/com/whyc/controller/PowerAlarmController.java
+++ b/src/main/java/com/whyc/controller/PowerAlarmController.java
@@ -14,8 +14,8 @@
import java.text.ParseException;
@RestController
-@Api(tags = "鐢垫簮瀹炴椂鍛婅")
-@RequestMapping("poweralarm")
+@Api(tags = "鐢垫簮鍛婅")
+@RequestMapping("powerAlarm")
public class PowerAlarmController {
@Autowired
@@ -24,40 +24,37 @@
@Autowired
private PowerAlarmHistoryService hisService;
- @ApiOperation("鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�")
+ /*@ApiOperation("鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�")
@GetMapping("getResPowerAlm")
public Response getResPowerAlm(@RequestParam(required = false) int pinfId){
Response res=service.getResPowerAlm(pinfId);
return res;
- }
+ }*/
- @ApiOperation("鏌ヨ鐢垫簮鍛婅")
- @GetMapping("getPowerAlarm")
- public Response getPowerAlarm(@RequestParam(required = false) int almLevel, @RequestParam String startTime, @RequestParam String endTime
+ @ApiOperation("鏌ヨ-鍒嗛〉")
+ @GetMapping("getPage")
+ public Response getPage(@RequestParam(required = false) Integer almLevel, @RequestParam String startTime, @RequestParam String endTime
, @RequestParam int pageNum, @RequestParam int pageSize){
- Response res=service.getPowerAlarm(almLevel,startTime,endTime,pageNum,pageSize);
- return res;
+ return service.getPage(almLevel,startTime,endTime,pageNum,pageSize);
}
@ApiOperation("纭鍛婅")
@GetMapping("confirmAlarm")
public Response confirmAlarm(@RequestParam int num){
- Response res=service.confirmAlarm(num);
- return res;
+ return service.confirmAlarm(num);
}
- @ApiOperation("鍙栨秷鍛婅")
- @GetMapping("cancleAlarm")
- public Response cancleAlarm(@RequestParam int num){
- Response res=service.cancleAlarm(num);
- return res;
+ @ApiOperation("纭鍛婅鍙栨秷")
+ @GetMapping("cancelAlarm")
+ public Response cancelAlarm(@RequestParam int num){
+ return service.cancelAlarm(num);
}
- @ApiOperation("鏌ヨ鐢垫簮鍘嗗彶鏃堕棿鍛婅")
- @GetMapping("getHisAlarm")
- public Response getHisAlarm(@RequestParam int pinfId,@RequestParam String startTime,@RequestParam String endTime
+ @ApiOperation("鏌ヨ鍘嗗彶-鍒嗛〉")
+ @GetMapping("getHisPage")
+ public Response getHisPage(@RequestParam(required = false) Integer almLevel,@RequestParam String startTime,@RequestParam String endTime
, @RequestParam int pageNum, @RequestParam int pageSize) throws ParseException, InterruptedException {
- Response res=hisService.getHisAlarm(pinfId,startTime,endTime,pageNum,pageSize);
+ Response res=hisService.getHisPage(almLevel,startTime,endTime,pageNum,pageSize);
return res;
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/PowerAlarmMapper.java b/src/main/java/com/whyc/mapper/PowerAlarmMapper.java
index 2713c26..f9b52d5 100644
--- a/src/main/java/com/whyc/mapper/PowerAlarmMapper.java
+++ b/src/main/java/com/whyc/mapper/PowerAlarmMapper.java
@@ -8,7 +8,7 @@
public interface PowerAlarmMapper extends CustomMapper<PowerAlarm>{
//鏌ヨ鐢垫簮鍛婅
- List<PowerAlarm> getPowerAlarm(int almLevel, Date startTime, Date endTime);
+ List<PowerAlarm> getList(Integer almLevel, Date startTime, Date endTime);
//鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�
List<PowerAlarm> getResPowerAlm(int pinfId);
diff --git a/src/main/java/com/whyc/service/PowerAlarmHistoryService.java b/src/main/java/com/whyc/service/PowerAlarmHistoryService.java
index 4a0e2d0..38d3f19 100644
--- a/src/main/java/com/whyc/service/PowerAlarmHistoryService.java
+++ b/src/main/java/com/whyc/service/PowerAlarmHistoryService.java
@@ -16,11 +16,11 @@
private SubTablePageInfoUtil util;
//鏌ヨ鐢垫簮鍘嗗彶鏃堕棿鍛婅
- public Response getHisAlarm(int pinfId, String startTime, String endTime, int pageNum, int pageSize) throws ParseException {
+ public Response getHisPage(Integer almLevel, String startTime, String endTime, int pageNum, int pageSize) throws ParseException {
PowerAlarmHistory his=new PowerAlarmHistory();
- his.setPowerId(pinfId);
+ his.setAlmLevel(almLevel);
PageInfo pageInfo=util.getPageInfo(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
,"db_power_alarm","power_alarm_history",his);
- return new Response().setII(1,pageInfo.getList()!=null,pageInfo,"鏌ヨ鐢垫簮鍘嗗彶鏃堕棿鍛婅");
+ return new Response().setII(1,pageInfo.getList()!=null,pageInfo,"鏌ヨ鍘嗗彶-鍒嗛〉");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/PowerAlarmService.java b/src/main/java/com/whyc/service/PowerAlarmService.java
index 0c43814..92abe99 100644
--- a/src/main/java/com/whyc/service/PowerAlarmService.java
+++ b/src/main/java/com/whyc/service/PowerAlarmService.java
@@ -28,11 +28,11 @@
return new Response().setII(1,list!=null,list,"鍦ㄧ敤鐢垫簮瀹炴椂鎺ㄩ�佸憡璀︿俊鎭�");
}
//鏌ヨ鐢垫簮鍛婅
- public Response getPowerAlarm(int almLevel, String startTime, String endTime ,int pageNum, int pageSize) {
+ public Response getPage(Integer almLevel, String startTime, String endTime ,int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
- List<PowerAlarm> list=mapper.getPowerAlarm(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
+ List<PowerAlarm> list=mapper.getList(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
PageInfo pageInfo=new PageInfo(list);
- return new Response().setII(1,list!=null,pageInfo,"鏌ヨ鐢垫簮鍛婅");
+ return new Response().setII(1,list!=null,pageInfo,"鏌ヨ-鍒嗛〉");
}
//纭鍛婅
public Response confirmAlarm(int num) {
@@ -43,7 +43,7 @@
return new Response().set(1,flag>0);
}
//鍙栨秷鍛婅
- public Response cancleAlarm(int num) {
+ public Response cancelAlarm(int num) {
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("num",num);
wrapper.set("alm_confirm",0);
diff --git a/src/main/java/com/whyc/service/SubTableService.java b/src/main/java/com/whyc/service/SubTableService.java
index ae4e32e..11dddcd 100644
--- a/src/main/java/com/whyc/service/SubTableService.java
+++ b/src/main/java/com/whyc/service/SubTableService.java
@@ -100,7 +100,7 @@
if(battAlarmHistory.getAlmEndTime()!=null){
sql+=" and alm_start_time <='"+ThreadLocalUtil.format(battAlarmHistory.getAlmEndTime(),1)+"' ";
}
- sql+=" ORDER BY alm_start_time asc limit "+ battAlarmHistory.getLimitStart()+","+ battAlarmHistory.getLimitEnd()+" ";
+ sql+=" ORDER BY alm_start_time desc limit "+ battAlarmHistory.getLimitStart()+","+ battAlarmHistory.getLimitEnd()+" ";
List<BattAlarmHistory> list=sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
public List getResults(ResultSet rs) throws SQLException {
@@ -126,7 +126,10 @@
//鐢垫簮鍛婅鍘嗗彶瀹炴椂璁＄畻姣忓紶琛ㄦ煡璇㈡�绘暟
public int getPowerHisCount(PowerAlarmHistory powerAlarmHistory) {
String sql="SELECT count(*) as number FROM db_power_alarm."+ powerAlarmHistory.getRecordYear()+" history " +
- " where history.power_id="+ powerAlarmHistory.getPowerId() ;
+ " where 1=1";
+ if(powerAlarmHistory.getAlmLevel()!=null){
+ sql+= " and history.alm_level="+ powerAlarmHistory.getAlmLevel();
+ }
if(powerAlarmHistory.getAlmStartTime()!=null){
sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(powerAlarmHistory.getAlmStartTime(),1)+"' ";
}
@@ -155,14 +158,17 @@
//鐢垫簮鍛婅鍘嗗彶瀹炴椂
public List<PowerAlarmHistory> getPowerHisList(PowerAlarmHistory powerAlarmHistory) {
String sql="SELECT * FROM db_power_alarm."+ powerAlarmHistory.getRecordYear()+" history " +
- " where history.power_id="+ powerAlarmHistory.getPowerId() ;
+ " where 1=1";
+ if(powerAlarmHistory.getAlmLevel()!=null){
+ sql+= " and history.alm_level="+ powerAlarmHistory.getAlmLevel();
+ }
if(powerAlarmHistory.getAlmStartTime()!=null){
sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(powerAlarmHistory.getAlmStartTime(),1)+"' ";
}
if(powerAlarmHistory.getAlmEndTime()!=null){
sql+=" and alm_start_time <='"+ThreadLocalUtil.format(powerAlarmHistory.getAlmEndTime(),1)+"' ";
}
- sql+=" ORDER BY alm_start_time asc limit "+ powerAlarmHistory.getLimitStart()+","+ powerAlarmHistory.getLimitEnd()+" ";
+ sql+=" ORDER BY alm_start_time desc limit "+ powerAlarmHistory.getLimitStart()+","+ powerAlarmHistory.getLimitEnd()+" ";
List<PowerAlarmHistory> list=sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
public List getResults(ResultSet rs) throws SQLException {
diff --git a/src/main/resources/mapper/PowerAlarmMapper.xml b/src/main/resources/mapper/PowerAlarmMapper.xml
index 9dcd4f5..f5cb602 100644
--- a/src/main/resources/mapper/PowerAlarmMapper.xml
+++ b/src/main/resources/mapper/PowerAlarmMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.PowerAlarmMapper">
- <select id="getPowerAlarm" resultType="com.whyc.pojo.db_power_alarm.PowerAlarm">
+ <select id="getList" resultType="com.whyc.pojo.db_power_alarm.PowerAlarm">
select power_alarm.*,power_inf.power_name from db_power_alarm.power_alarm,db_batt.power_inf
<where>
power_alarm.power_id=power_inf.power_id
--
Gitblit v1.9.1