From 8432a8e816cfc48e8f3d50b97c1d90806d2195b7 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 十二月 2018 11:13:54 +0800
Subject: [PATCH] 手机端设备实时告警和设备历史告警页面中添加采集线告警和SD卡故障告警选项
---
gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
index 87a204a..e1066eb 100644
--- a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
@@ -110,14 +110,25 @@
//鏌ヨ褰撳墠鏈�澶х殑鐢垫睜缁刬d
public static int searchMaxBattgroupId(){
int battgroupid=0;
- int BattgroupId_inf=(new Batt_rtstateDAOImpl()).searchMaxBattgroupId();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
+ int BattgroupId_rtstate=(new Batt_rtstateDAOImpl()).searchMaxBattgroupId();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
int BattgroupId_apply=(new Battinf_applyImpl()).searchMaxBattgroupId_apply();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
+ int BattgroupId_inf=(new BattInfImpl()).searchMaxBattgroupId();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
if(BattgroupId_inf>=BattgroupId_apply){
- battgroupid=BattgroupId_inf+1;
+ battgroupid=BattgroupId_inf;
+ if(battgroupid>=BattgroupId_rtstate) {
+ battgroupid=battgroupid;
+ }else {
+ battgroupid=BattgroupId_rtstate;
+ }
}else{
- battgroupid=BattgroupId_apply+1;
+ battgroupid=BattgroupId_apply;
+ if(battgroupid>=BattgroupId_rtstate) {
+ battgroupid=battgroupid;
+ }else {
+ battgroupid=BattgroupId_rtstate;
+ }
}
- return battgroupid;
+ return battgroupid+1;
}
//鏌ヨ褰撳墠鏈�澶х殑stationid
public static int searchStationId(){
--
Gitblit v1.9.1