From ab7d139745ab0e1d447c1d7e9e74e8c590636922 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 十二月 2018 14:15:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
index 5024dc6..e1066eb 100644
--- a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
@@ -5,6 +5,7 @@
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dao.impl.Batt_rtstateDAOImpl;
+import com.fgkj.dao.impl.Battinf_applyImpl;
import com.fgkj.dao.impl.Database_backupImpl;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Database_backup;
@@ -108,17 +109,51 @@
}
//鏌ヨ褰撳墠鏈�澶х殑鐢垫睜缁刬d
public static int searchMaxBattgroupId(){
- int BattgroupId_max=(new Batt_rtstateDAOImpl()).searchMaxBattgroupId();//褰撳墠鍐呭瓨涓渶澶х殑鐢垫睜缁刬d
- int BattgroupId_next=BattgroupId_max+1;
- return BattgroupId_next;
+ int battgroupid=0;
+ 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;
+ if(battgroupid>=BattgroupId_rtstate) {
+ battgroupid=battgroupid;
+ }else {
+ battgroupid=BattgroupId_rtstate;
+ }
+ }else{
+ battgroupid=BattgroupId_apply;
+ if(battgroupid>=BattgroupId_rtstate) {
+ battgroupid=battgroupid;
+ }else {
+ battgroupid=BattgroupId_rtstate;
+ }
+ }
+ return battgroupid+1;
}
//鏌ヨ褰撳墠鏈�澶х殑stationid
public static int searchStationId(){
- int station_max=(new BattInfImpl()).searchMaxId();//褰撳墠鏈�澶х殑stationid
- int station_next=station_max+1;
- return station_next;
+ int stationid=0;
+ int stationid_inf=(new BattInfImpl()).searchMaxId();//褰撳墠鏈�澶х殑stationid
+ int stationid_apply=(new Battinf_applyImpl()).searchMaxId_apply();//褰撳墠鏈�澶х殑stationid
+ if(stationid_inf>=stationid_apply){
+ stationid=stationid_inf+1;
+ }else{
+ stationid=stationid_apply+1;
+ }
+ return stationid;
}
-
+ //鏌ヨ褰撳墠鏈�澶х殑dev_id
+ public static int searchmaxdev_id(){
+ int dev_id=0;
+ int devid_inf=(new BattInfImpl()).searchMaxdevId_binf();
+ int devid_apply=(new Battinf_applyImpl()).searchMaxdevId_apply();
+ if(devid_inf>=devid_apply){
+ dev_id=devid_inf+1;
+ }else{
+ dev_id=devid_apply+1;
+ }
+ return dev_id;
+ }
//褰撳battinf琛ㄤ腑鏁版嵁杩涜澧炲垹鏀圭殑鎿嶄綔鏃讹紝鍏堝浠絛b_battinf.tb_battinf
public static boolean backup_battinf(){
boolean en=false;
--
Gitblit v1.9.1