From b6b7c9ea2b2b3ca9b4a2c62b5496f78909900491 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 10 十二月 2024 16:27:23 +0800
Subject: [PATCH] 告警
---
src/main/java/com/whyc/mapper/BattAlarmHisMapper.java | 4 +-
src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java | 4 +
src/main/java/com/whyc/service/SubTableService.java | 36 +++++++++---------
src/main/java/com/whyc/service/BattAlarmHisService.java | 4 +-
src/main/java/com/whyc/util/SubTablePageInfoUtil.java | 34 ++++++++--------
5 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/whyc/mapper/BattAlarmHisMapper.java b/src/main/java/com/whyc/mapper/BattAlarmHisMapper.java
index df5e63b..a32e8e5 100644
--- a/src/main/java/com/whyc/mapper/BattAlarmHisMapper.java
+++ b/src/main/java/com/whyc/mapper/BattAlarmHisMapper.java
@@ -1,6 +1,6 @@
package com.whyc.mapper;
-import com.whyc.pojo.db_alarm.BattAlarmHis;
+import com.whyc.pojo.db_alarm.BattAlarmHistory;
-public interface BattAlarmHisMapper extends CustomMapper<BattAlarmHis>{
+public interface BattAlarmHisMapper extends CustomMapper<BattAlarmHistory>{
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHis.java b/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
similarity index 91%
rename from src/main/java/com/whyc/pojo/db_alarm/BattAlarmHis.java
rename to src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
index c99c97e..1e05daf 100644
--- a/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHis.java
+++ b/src/main/java/com/whyc/pojo/db_alarm/BattAlarmHistory.java
@@ -1,6 +1,7 @@
package com.whyc.pojo.db_alarm;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@@ -15,7 +16,8 @@
@NoArgsConstructor
@ToString
@ApiModel(value="鍛婅鍘嗗彶璁板綍", description="")
-public class BattAlarmHis {
+@TableName(schema = "db_alarm",value = "batt_alarm_history")
+public class BattAlarmHistory {
@TableField("num")
@ApiModelProperty("涓婚敭缂栧彿")
private Integer num;
diff --git a/src/main/java/com/whyc/service/BattAlarmHisService.java b/src/main/java/com/whyc/service/BattAlarmHisService.java
index 6bb1e2c..7e2f5a3 100644
--- a/src/main/java/com/whyc/service/BattAlarmHisService.java
+++ b/src/main/java/com/whyc/service/BattAlarmHisService.java
@@ -2,7 +2,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
-import com.whyc.pojo.db_alarm.BattAlarmHis;
+import com.whyc.pojo.db_alarm.BattAlarmHistory;
import com.whyc.util.SubTablePageInfoUtil;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +17,7 @@
//鏌ヨ鐢垫睜缁勫巻鍙叉椂闂村憡璀�
public Response getHisAlatm(int binfId, String startTime, String endTime,int pageNum,int pageSize)throws ParseException, InterruptedException {
- BattAlarmHis his=new BattAlarmHis();
+ BattAlarmHistory his=new BattAlarmHistory();
his.setBinfId(binfId);
PageInfo pageInfo=util.getPageInfoByMonthTable(pageNum,pageSize, ThreadLocalUtil.parse(startTime,1),ThreadLocalUtil.parse(endTime,1)
,"db_alarm","batt_alarm",his);
diff --git a/src/main/java/com/whyc/service/SubTableService.java b/src/main/java/com/whyc/service/SubTableService.java
index db86242..6cb66dd 100644
--- a/src/main/java/com/whyc/service/SubTableService.java
+++ b/src/main/java/com/whyc/service/SubTableService.java
@@ -1,7 +1,7 @@
package com.whyc.service;
import com.whyc.mapper.CallBack;
-import com.whyc.pojo.db_alarm.BattAlarmHis;
+import com.whyc.pojo.db_alarm.BattAlarmHistory;
import com.whyc.pojo.db_dis_batt.BattTestInfData;
import com.whyc.util.ActionUtil;
import com.whyc.util.ThreadLocalUtil;
@@ -53,14 +53,14 @@
return list;
}
//鍛婅鍘嗗彶瀹炴椂璁＄畻姣忓紶琛ㄦ煡璇㈡�绘暟
- public int getBattHisCount(BattAlarmHis battAlarmHis) {
- String sql="SELECT count(*) as number FROM db_alarm."+battAlarmHis.getRecordYear()+" history " +
- " where history.binf_id="+battAlarmHis.getBinfId() ;
- if(battAlarmHis.getAlmStartTime()!=null){
- sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHis.getAlmStartTime(),1)+"' ";
+ public int getBattHisCount(BattAlarmHistory battAlarmHistory) {
+ String sql="SELECT count(*) as number FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history " +
+ " where history.binf_id="+ battAlarmHistory.getBinfId() ;
+ if(battAlarmHistory.getAlmStartTime()!=null){
+ sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHistory.getAlmStartTime(),1)+"' ";
}
- if(battAlarmHis.getAlmEndTime()!=null){
- sql+=" and alm_start_time <='"+ThreadLocalUtil.format(battAlarmHis.getAlmEndTime(),1)+"' ";
+ if(battAlarmHistory.getAlmEndTime()!=null){
+ sql+=" and alm_start_time <='"+ThreadLocalUtil.format(battAlarmHistory.getAlmEndTime(),1)+"' ";
}
List list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
@@ -82,22 +82,22 @@
return num;
}
//鍛婅鍘嗗彶瀹炴椂
- public List<BattAlarmHis> getBattHisList(BattAlarmHis battAlarmHis) {
- String sql="SELECT * FROM db_alarm."+battAlarmHis.getRecordYear()+" history " +
- " where history.binf_id="+battAlarmHis.getBinfId() ;
- if(battAlarmHis.getAlmStartTime()!=null){
- sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHis.getAlmStartTime(),1)+"' ";
+ public List<BattAlarmHistory> getBattHisList(BattAlarmHistory battAlarmHistory) {
+ String sql="SELECT * FROM db_alarm."+ battAlarmHistory.getRecordYear()+" history " +
+ " where history.binf_id="+ battAlarmHistory.getBinfId() ;
+ if(battAlarmHistory.getAlmStartTime()!=null){
+ sql+=" and alm_start_time >='"+ ThreadLocalUtil.format(battAlarmHistory.getAlmStartTime(),1)+"' ";
}
- if(battAlarmHis.getAlmEndTime()!=null){
- sql+=" and alm_start_time <='"+ThreadLocalUtil.format(battAlarmHis.getAlmEndTime(),1)+"' ";
+ if(battAlarmHistory.getAlmEndTime()!=null){
+ sql+=" and alm_start_time <='"+ThreadLocalUtil.format(battAlarmHistory.getAlmEndTime(),1)+"' ";
}
- sql+=" ORDER BY alm_start_time asc limit "+battAlarmHis.getLimitStart()+","+battAlarmHis.getLimitEnd()+" ";
- List<BattAlarmHis> list=sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ sql+=" ORDER BY alm_start_time asc limit "+ battAlarmHistory.getLimitStart()+","+ battAlarmHistory.getLimitEnd()+" ";
+ List<BattAlarmHistory> list=sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
public List getResults(ResultSet rs) throws SQLException {
List list=new ArrayList();
while (rs.next()){
- BattAlarmHis data=new BattAlarmHis();
+ BattAlarmHistory data=new BattAlarmHistory();
data.setNum(rs.getInt("num"));
data.setBinfId(rs.getInt("binf_id"));
data.setAlmStartTime(rs.getTimestamp("alm_start_time"));
diff --git a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
index 9b5ba2b..016e37d 100644
--- a/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
+++ b/src/main/java/com/whyc/util/SubTablePageInfoUtil.java
@@ -3,7 +3,7 @@
import com.github.pagehelper.PageInfo;
import com.whyc.factory.ThreadPoolExecutorFactory;
import com.whyc.mapper.CommonMapper;
-import com.whyc.pojo.db_alarm.BattAlarmHis;
+import com.whyc.pojo.db_alarm.BattAlarmHistory;
import com.whyc.service.SubTableService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,13 +68,13 @@
}
pool.execute(()-> {
//====== 鏍规嵁涓嶅悓绫诲瀷绫诲瀷瀵硅薄瀵瑰簲璋冩暣 ======
- if (pojo instanceof BattAlarmHis) {
- BattAlarmHis battAlarmHis = new BattAlarmHis();
- BeanUtils.copyProperties(pojo,battAlarmHis);
- battAlarmHis.setAlmStartTime(queryTime.get(0));
- battAlarmHis.setAlmEndTime(queryTime.get(1));
- battAlarmHis.setRecordYear(tableName);
- int currentCount = service.getBattHisCount(battAlarmHis);
+ if (pojo instanceof BattAlarmHistory) {
+ BattAlarmHistory battAlarmHistory = new BattAlarmHistory();
+ BeanUtils.copyProperties(pojo, battAlarmHistory);
+ battAlarmHistory.setAlmStartTime(queryTime.get(0));
+ battAlarmHistory.setAlmEndTime(queryTime.get(1));
+ battAlarmHistory.setRecordYear(tableName);
+ int currentCount = service.getBattHisCount(battAlarmHistory);
queryCountMap.put(tableYear, currentCount);
}
latch.countDown();
@@ -115,16 +115,16 @@
List<Date> queryTime = queryTimeForSubTables.get(key);
//====== 鏍规嵁涓嶅悓绫诲瀷绫诲瀷瀵硅薄瀵瑰簲璋冩暣 ======
String recordYear = key.equals("default") ? tablePrefix : tablePrefix + "_" + key;
- if(pojo instanceof BattAlarmHis) {
- BattAlarmHis battAlarmHis = new BattAlarmHis();
- BeanUtils.copyProperties(pojo,battAlarmHis);
- battAlarmHis.setAlmStartTime(queryTime.get(0));
- battAlarmHis.setAlmEndTime(queryTime.get(1));
- battAlarmHis.setRecordYear(recordYear);
+ if(pojo instanceof BattAlarmHistory) {
+ BattAlarmHistory battAlarmHistory = new BattAlarmHistory();
+ BeanUtils.copyProperties(pojo, battAlarmHistory);
+ battAlarmHistory.setAlmStartTime(queryTime.get(0));
+ battAlarmHistory.setAlmEndTime(queryTime.get(1));
+ battAlarmHistory.setRecordYear(recordYear);
List<Integer> limitList = tableAndLimitMap.get(key);
- battAlarmHis.setLimitStart(limitList.get(0));
- battAlarmHis.setLimitEnd(limitList.get(1));
- List<BattAlarmHis> list = service.getBattHisList(battAlarmHis);
+ battAlarmHistory.setLimitStart(limitList.get(0));
+ battAlarmHistory.setLimitEnd(limitList.get(1));
+ List<BattAlarmHistory> list = service.getBattHisList(battAlarmHistory);
dataList.addAll(list);
}
}
--
Gitblit v1.9.1