From b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
index 12b5793..2c7b294 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
@@ -9,6 +9,7 @@
 import com.fgkj.dao.impl.BattDischarge_planImpl;
 import com.fgkj.dao.impl.BattInfAgainImpl;
 import com.fgkj.dao.impl.BattInfImpl;
+import com.fgkj.dao.impl.BattInf_RebuildImpl;
 import com.fgkj.dao.impl.BattMap_informationImpl;
 import com.fgkj.dao.impl.BattPower_offImpl;
 import com.fgkj.dao.impl.BattTest_ResImpl;
@@ -18,6 +19,7 @@
 import com.fgkj.dao.impl.Batt_devalarm_data_historyImpl;
 import com.fgkj.dao.impl.Batt_devdischarge_paramImpl;
 import com.fgkj.dao.impl.Batt_electricityImpl;
+import com.fgkj.dao.impl.Batt_enduranceImpl;
 import com.fgkj.dao.impl.Batt_historyImpl;
 import com.fgkj.dao.impl.Batt_maint_infAgainImpl;
 import com.fgkj.dao.impl.Batt_maint_infImpl;
@@ -29,21 +31,26 @@
 import com.fgkj.dao.impl.Battalarm_dataDAOImpl;
 import com.fgkj.dao.impl.Battalarm_data_historyImpl;
 import com.fgkj.dao.impl.BattinfThirdImpl;
+import com.fgkj.dao.impl.Battinf_exImpl;
 import com.fgkj.dao.impl.BattresdataDAOImpl;
 import com.fgkj.dao.impl.Battresdata_infDAOImpl;
 import com.fgkj.dao.impl.BatttestdataDAOImpl;
 import com.fgkj.dao.impl.Batttestdata_infDAOImpl;
 import com.fgkj.dao.impl.BatttestdatastopDAOImpl;
+import com.fgkj.dao.impl.Bts_station_eventImpl;
 import com.fgkj.dao.impl.Chart_ColorImpl;
 import com.fgkj.dao.impl.Cmcc_Power_DataImpl;
 import com.fgkj.dao.impl.CustompageImpl;
 import com.fgkj.dao.impl.Database_backupImpl;
 import com.fgkj.dao.impl.Dev_paramImpl;
+import com.fgkj.dao.impl.Deverror_recordImpl;
 import com.fgkj.dao.impl.Devstate_usrImpl;
+import com.fgkj.dao.impl.Echarts_usrImpl;
 import com.fgkj.dao.impl.Fbsdev_Statechange_infImpl;
 import com.fgkj.dao.impl.MapImpl;
 import com.fgkj.dao.impl.Positiomap_usrImpl;
 import com.fgkj.dao.impl.Process_surveyImpl;
+import com.fgkj.dao.impl.StationtrafficImpl;
 import com.fgkj.dao.impl.UserDAOImpl;
 import com.fgkj.dao.impl.User_ChartImpl;
 import com.fgkj.dao.impl.User_battgroup_baojigroupImpl;
@@ -74,9 +81,12 @@
 import com.fgkj.dao.impl.Ld9.Ld9testdatastopImpl;
 import com.fgkj.dao.impl.bts61850.BTS_61850_setparamImpl;
 import com.fgkj.dao.impl.bts61850.BTS_61850_stateImpl;
+import com.fgkj.dao.impl.ram.Bts_station_stateImpl;
 import com.fgkj.dao.impl.ram.Fbs9100_setparamImpl;
 import com.fgkj.dao.impl.ram.Fbs9100_stateImpl;
+import com.fgkj.dao.impl.ram.Fbs9100_sysparamImpl;
 import com.fgkj.dao.impl.ram.Fbs9100s_dcdc_stateImpl;
+import com.fgkj.dao.impl.ram.Fbs9100s_dfu_stateImpl;
 import com.fgkj.dao.impl.ram.Fbs9600_stateImpl;
 import com.fgkj.dao.impl.ram.Hard_dev_sms_stateImpl;
 import com.fgkj.dao.impl.ram.Server_stateImpl;
@@ -182,6 +192,16 @@
 			case 84:return new Positiomap_usrImpl();
 			case 85:return new Battalarm_data_historyImpl();
 			case 86:return new Batt_devalarm_data_historyImpl();
+			case 87:return new Batt_enduranceImpl();
+			case 88:return new BattInf_RebuildImpl();
+			case 89:return new Bts_station_stateImpl();
+			case 90:return new Fbs9100s_dfu_stateImpl();
+			case 91:return new Bts_station_eventImpl();
+			case 92:return new Echarts_usrImpl();
+			case 93:return new Battinf_exImpl();
+			case 94:return new Deverror_recordImpl();
+			case 95:return new  StationtrafficImpl();
+			case 96:return new  Fbs9100_sysparamImpl();
 			default :return null;
 		}
 	}

--
Gitblit v1.9.1