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/service/SubTableService.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

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"));

--
Gitblit v1.9.1