From 82614438a300523cc13e22b6d175586a3ec8ed71 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 24 三月 2025 15:46:04 +0800
Subject: [PATCH] 电池告警实时和历史
---
src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java | 2
src/main/java/com/whyc/service/SubTableService.java | 12 ++++-
src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java | 8 +++-
src/main/java/com/whyc/service/BattAlarmService.java | 12 +++---
src/main/java/com/whyc/mapper/BattAlarmMapper.java | 4 +-
src/main/java/com/whyc/service/BattAlarmHisService.java | 6 +-
src/main/resources/mapper/BattAlarmMapper.xml | 6 +-
src/main/java/com/whyc/controller/BattAlarmController.java | 40 +++++++++-----------
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | 1
9 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BattAlarmController.java b/src/main/java/com/whyc/controller/BattAlarmController.java
index 95a2e77..33bd114 100644
--- a/src/main/java/com/whyc/controller/BattAlarmController.java
+++ b/src/main/java/com/whyc/controller/BattAlarmController.java
@@ -16,7 +16,7 @@
@RestController
@Api(tags = "鐢垫睜瀹炴椂鍛婅")
-@RequestMapping("battalarm")
+@RequestMapping("battAlarm")
public class BattAlarmController {
@Autowired
private BattAlarmService service;
@@ -24,39 +24,35 @@
@Autowired
private BattAlarmHisService hisService;
- @ApiOperation("鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�")
+ /*@ApiOperation("鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�")
@GetMapping("getResBattAlm")
- public Response getResBattAlm(@RequestParam(required = false) int binfId){
- Response res=service.getResBattAlm(binfId);
+ public Response getResBattAlm(@RequestParam(required = false) int battGroupId){
+ Response res=service.getResBattAlm(battGroupId);
return res;
- }
+ }*/
- @ApiOperation("鏌ヨ鐢垫睜鍛婅")
- @GetMapping("getBattAlarm")
- public Response getBattAlarm(@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.getBattAlarm(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 binfId,@RequestParam String startTime,@RequestParam String endTime
+ @ApiOperation("鏌ヨ鐢垫睜鍛婅鍘嗗彶-鍒嗛〉")
+ @GetMapping("getHistoryPage")
+ public Response getHistoryPage(@RequestParam(required = false) Integer almLevel,@RequestParam String startTime,@RequestParam String endTime
, @RequestParam int pageNum, @RequestParam int pageSize) throws ParseException, InterruptedException {
- Response res=hisService.getHisAlarm(binfId,startTime,endTime,pageNum,pageSize);
- return res;
+ return hisService.getHistoryPage(almLevel,startTime,endTime,pageNum,pageSize);
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/mapper/BattAlarmMapper.java b/src/main/java/com/whyc/mapper/BattAlarmMapper.java
index 539f0af..ee230e4 100644
--- a/src/main/java/com/whyc/mapper/BattAlarmMapper.java
+++ b/src/main/java/com/whyc/mapper/BattAlarmMapper.java
@@ -8,9 +8,9 @@
public interface BattAlarmMapper extends CustomMapper<BattAlarm>{
//鏌ヨ鐢垫睜鍛婅
- List<BattAlarm> getBattAlarm(int almLevel, Date startTime, Date endTime);
+ List<BattAlarm> getList(Integer almLevel, Date startTime, Date endTime);
//鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�
- List<BattAlarm> getResBattAlm(int binfId);
+ List<BattAlarm> getResBattAlm(int battGroupId);
//鏌ヨ鐢垫睜鍛婅(2024銆�4.15淇敼)
List<BattAlarm> getAlm2(Integer battGroupId);
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java b/src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java
index a824150..c20020c 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattAlarm.java
@@ -25,7 +25,7 @@
@TableField("binf_id")
@ApiModelProperty("鐢垫睜缁刬d")
- private Integer binfId;
+ private Integer battGroupId;
@TableField("alm_start_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -68,5 +68,9 @@
@TableField(exist = false)
@ApiModelProperty("鐢垫睜缁勫悕绉�")
- private String binfName;
+ private String battGroupName;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鐢垫簮鍚嶇О")
+ private String powerName;
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java b/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
index 65a31e0..367fac4 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
@@ -23,7 +23,7 @@
@TableField("binf_id")
@ApiModelProperty("鐢垫睜缁刬d")
- private Integer binfId;
+ private Integer battGroupId;
@TableField("alm_start_time")
@ApiModelProperty("鍛婅寮�濮嬫椂闂�")
diff --git a/src/main/java/com/whyc/service/BattAlarmHisService.java b/src/main/java/com/whyc/service/BattAlarmHisService.java
index 08fd8eb..a20114d 100644
--- a/src/main/java/com/whyc/service/BattAlarmHisService.java
+++ b/src/main/java/com/whyc/service/BattAlarmHisService.java
@@ -16,11 +16,11 @@
private SubTablePageInfoUtil util;
//鏌ヨ鐢垫睜缁勫巻鍙叉椂闂村憡璀�
- public Response getHisAlarm(int binfId, String startTime, String endTime,int pageNum,int pageSize)throws ParseException, InterruptedException {
+ public Response getHistoryPage(Integer almLevel, String startTime, String endTime,int pageNum,int pageSize)throws ParseException, InterruptedException {
BattAlarmHistory his=new BattAlarmHistory();
- his.setBinfId(binfId);
+ his.setAlmLevel(almLevel);
PageInfo pageInfo=util.getPageInfo(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
,"db_alarm","batt_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/BattAlarmService.java b/src/main/java/com/whyc/service/BattAlarmService.java
index b5231b2..014518e 100644
--- a/src/main/java/com/whyc/service/BattAlarmService.java
+++ b/src/main/java/com/whyc/service/BattAlarmService.java
@@ -22,16 +22,16 @@
/*
鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�
**/
- public Response getResBattAlm(int binfId) {
- List<BattAlarm> list=mapper.getResBattAlm(binfId);
+ public Response getResBattAlm(int battGroupId) {
+ List<BattAlarm> list=mapper.getResBattAlm(battGroupId);
return new Response().setII(1,list!=null,list,"鍦ㄧ敤鐢垫睜缁勫疄鏃舵帹閫佸憡璀︿俊鎭�");
}
//鏌ヨ鐢垫睜鍛婅
- public Response getBattAlarm(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<BattAlarm> list=mapper.getBattAlarm(almLevel, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1));
+ List<BattAlarm> 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) {
@@ -42,7 +42,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 d446bc7..ae4e32e 100644
--- a/src/main/java/com/whyc/service/SubTableService.java
+++ b/src/main/java/com/whyc/service/SubTableService.java
@@ -58,7 +58,10 @@
//鐢垫睜鍛婅鍘嗗彶瀹炴椂璁＄畻姣忓紶琛ㄦ煡璇㈡�绘暟
public int getBattHisCount(BattAlarmHistory battAlarmHistory) {
String sql="SELECT count(*) as number FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history " +
- " where history.binf_id="+ battAlarmHistory.getBinfId() ;
+ " where 1=1" ;
+ if (battAlarmHistory.getAlmLevel()!=null){
+ sql+=" and history.alm_level="+ battAlarmHistory.getAlmLevel();
+ }
if(battAlarmHistory.getAlmStartTime()!=null){
sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHistory.getAlmStartTime(),1)+"' ";
}
@@ -87,7 +90,10 @@
//鐢垫睜鍛婅鍘嗗彶瀹炴椂
public List<BattAlarmHistory> getBattHisList(BattAlarmHistory battAlarmHistory) {
String sql="SELECT * FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history " +
- " where history.binf_id="+ battAlarmHistory.getBinfId() ;
+ " where 1=1";
+ if(battAlarmHistory.getAlmLevel()!=null){
+ sql+=" and history.alm_level="+ battAlarmHistory.getAlmLevel();
+ }
if(battAlarmHistory.getAlmStartTime()!=null){
sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHistory.getAlmStartTime(),1)+"' ";
}
@@ -102,7 +108,7 @@
while (rs.next()){
BattAlarmHistory data=new BattAlarmHistory();
data.setNum(rs.getInt("num"));
- data.setBinfId(rs.getInt("binf_id"));
+ data.setBattGroupId(rs.getInt("binf_id"));
data.setAlmStartTime(rs.getTimestamp("alm_start_time"));
data.setAlmEndTime(rs.getTimestamp("alm_end_time"));
data.setMonNum(rs.getInt("mon_num"));
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
index c32da4f..0b78efc 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -41,7 +41,6 @@
@Autowired
private UserInfService userInfService;
- //鎸夊勾鏈堝垎琛�
/**鎸夊勾浠借〃鍒嗛〉鏌ヨ*/
public PageInfo<Object> getPageInfo(int pageNum,int pageSize,
Date startTime,Date endTime,
diff --git a/src/main/resources/mapper/BattAlarmMapper.xml b/src/main/resources/mapper/BattAlarmMapper.xml
index 3da2159..4103e8b 100644
--- a/src/main/resources/mapper/BattAlarmMapper.xml
+++ b/src/main/resources/mapper/BattAlarmMapper.xml
@@ -2,8 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.BattAlarmMapper">
- <select id="getBattAlarm" resultType="com.whyc.pojo.db_alarm.BattAlarm">
- select batt_alarm.*,power_inf.binf_name from db_alarm.batt_alarm,db_batt.power_inf
+ <select id="getList" resultType="com.whyc.pojo.db_alarm.BattAlarm">
+ select batt_alarm.*,batt_alarm.binf_id as battGroupId,power_inf.binf_name as battGroupName,power_inf.power_name from db_alarm.batt_alarm,db_batt.power_inf
<where>
batt_alarm.binf_id=power_inf.binf_id
and batt_alarm.alm_start_time>=#{startTime}
@@ -18,7 +18,7 @@
select batt_alarm.*,power_inf.binf_name from db_alarm.batt_alarm,db_batt.power_inf
<where>
batt_alarm.binf_id=power_inf.binf_id
- and batt_alarm.binf_id=#{binfId}
+ and batt_alarm.binf_id=#{battGroupId}
order by batt_alarm.alm_start_time desc
</where>
</select>
--
Gitblit v1.9.1