From 2a3878853abe5e914f59aca08b3cc4a855713d6e Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.8>
Date: 星期一, 29 十月 2018 13:29:59 +0800
Subject: [PATCH] 基站流量统计+基站问题录入+battinf_ex信息的显示

---
 gx_tieta/src/com/fgkj/actions/Battinf_exAction.java        |   31 +
 gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java     |  159 ++++++
 gx_tieta/src/com/fgkj/actions/StationtrafficAction.java    |   29 +
 gx_tieta/src/com/fgkj/services/Deverror_recordService.java |   46 ++
 gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java   |   42 +
 gx_tieta/src/com/fgkj/dao/impl/Battinf_exImpl.java         |  128 +++++
 gx_tieta/src/com/fgkj/dto/Deverror_record.java             |  113 ++++
 gx_tieta/.settings/org.jboss.tools.jst.web.xml             |   68 +-
 gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java              |    6 
 gx_tieta/src/com/fgkj/dto/Battinf_ex.java                  |  444 +++++++++++++++++++
 gx_tieta/src/com/fgkj/services/StationtrafficService.java  |   32 +
 gx_tieta/src/com/fgkj/dao/BaseDAO.java                     |    6 
 gx_tieta/src/com/fgkj/dto/Stationtraffic.java              |  117 +++++
 gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java    |  118 +++++
 gx_tieta/src/com/fgkj/services/Battinf_exService.java      |   31 +
 15 files changed, 1,336 insertions(+), 34 deletions(-)

diff --git a/gx_tieta/.settings/org.jboss.tools.jst.web.xml b/gx_tieta/.settings/org.jboss.tools.jst.web.xml
index ab7f92f..7ad3e7b 100644
--- a/gx_tieta/.settings/org.jboss.tools.jst.web.xml
+++ b/gx_tieta/.settings/org.jboss.tools.jst.web.xml
@@ -9,73 +9,73 @@
  <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>
  <file-system NAME="fuguang" location="%eclipse.project%" model-entity="FileSystemFolder"/>
  <file-system NAME="lib-javaee.jar"
-  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>
+  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-jsf-impl.jar"
-  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>
+  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-jsf-api.jar"
-  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>
+  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-jstl-1.2.jar"
-  location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>
+  location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-c3p0-0.9.5.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-c3p0-oracle-thin-extras-0.9.5.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-mchange-commons-java-0.2.9.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-resources.jar"
-  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>
+  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-dnsns.jar"
-  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>
+  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-localedata.jar"
-  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>
+  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-sunjce_provider.jar"
-  location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>
+  location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-commons-beanutils-1.7.0.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-commons-codec-1.10.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-commons-collections-3.1.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-commons-dbcp-1.2.1.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-commons-fileupload-1.2.2.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-commons-io-2.0.1.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-commons-lang-2.5.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-commons-pool-1.2.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-dom4j-1.6.1.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-ezmorph-1.0.3.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-freemarker-2.3.16.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-gson-2.2.4.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-javassist-3.11.0.GA.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-json-lib-2.1-jdk15.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-mysql-connector-java-5.1.33-bin.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-ognl-3.0.1.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-poi-3.10.1-20140818.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-sqljdbc.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-struts2-core-2.2.3.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-struts2-json-plugin-2.2.3.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-struts2-sunspoter-stream-1.0.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-xwork-core-2.2.3.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>
  <file-system NAME="lib-jacob.jar"
-  location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>
+  location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>
  <web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml">
   <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule"
    model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/>
diff --git a/gx_tieta/src/com/fgkj/actions/Battinf_exAction.java b/gx_tieta/src/com/fgkj/actions/Battinf_exAction.java
new file mode 100644
index 0000000..b0eddce
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/actions/Battinf_exAction.java
@@ -0,0 +1,31 @@
+package com.fgkj.actions;
+
+import com.fgkj.dto.BattInf;
+import com.fgkj.dto.ServiceModel;
+import com.fgkj.services.Battinf_exService;
+import com.opensymphony.xwork2.ActionSupport;
+
+public class Battinf_exAction extends ActionUtil{
+	private Battinf_exService service=new Battinf_exService();
+	private String json;
+	private String result;
+	
+	
+	
+	//鏍规嵁鐢垫睜缁勭殑淇℃伅stationid鏌ヨ
+	public String serchByCondition(){
+		BattInf binf=getGson().fromJson(json, BattInf.class);
+		ServiceModel model=service.serchByCondition(binf);
+		result=tojson(model);
+		return SUCCESS;
+	}
+	
+	public String getResult() {
+		return result;
+	}
+	public void setJson(String json) {
+		this.json = json;
+	}
+	
+
+}
diff --git a/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java b/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
new file mode 100644
index 0000000..5b7b313
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
@@ -0,0 +1,42 @@
+package com.fgkj.actions;
+
+import java.util.List;
+
+import com.fgkj.dto.BattInf;
+import com.fgkj.dto.Deverror_record;
+import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_inf;
+import com.fgkj.services.Deverror_recordService;
+
+public class Deverror_recordAction extends ActionUtil{
+	private Deverror_recordService service=new Deverror_recordService();
+	private String json;
+	private String result;
+	//鐢ㄦ埛鎵嬪姩娣诲姞闂
+	public String add(){
+		Deverror_record dev_record=getGson("yyyy-MM-dd").fromJson(json, Deverror_record.class);
+		User_inf uinf=(User_inf) getUser();
+		dev_record.setUid(uinf.getUId());
+		ServiceModel model=service.add(dev_record);
+		result=tojson(model);
+		return SUCCESS;
+	}
+	//鏍规嵁stationid鏌ヨ璁惧鐨勯棶棰樿褰�
+	public String serchByCondition(){
+		BattInf binf=getGson().fromJson(json, BattInf.class);
+		User_inf uinf=(User_inf) getUser();
+		binf.setNum(uinf.getUId());
+		ServiceModel model=service.serchByCondition(binf);
+		result=tojson(model);
+		return SUCCESS;
+	}
+	
+	public String getResult() {
+		return result;
+	}
+	public void setJson(String json) {
+		this.json = json;
+	}
+	
+
+}
diff --git a/gx_tieta/src/com/fgkj/actions/StationtrafficAction.java b/gx_tieta/src/com/fgkj/actions/StationtrafficAction.java
new file mode 100644
index 0000000..7dbd3fe
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/actions/StationtrafficAction.java
@@ -0,0 +1,29 @@
+package com.fgkj.actions;
+
+import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.Stationtraffic;
+import com.fgkj.services.StationtrafficService;
+
+
+public class StationtrafficAction extends ActionUtil{
+	private StationtrafficService service=new StationtrafficService();
+	private String json;
+	private String result;
+	
+	
+	//缁熻鍩虹珯娴侀噺
+	public String serchByCondition() {
+		Stationtraffic st=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Stationtraffic.class);
+		ServiceModel model=service.serchByCondition(st);
+		result=tojson(model);
+		return SUCCESS;
+	}
+	public String getResult() {
+		return result;
+	}
+	public void setJson(String json) {
+		this.json = json;
+	}
+	
+	
+}
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAO.java b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
index 812d302..5bbfbd7 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAO.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
@@ -188,6 +188,12 @@
 	
 	public static final int ECHARTS_USR=92;
 	
+	public static final int BATTINF_EX=93;
+	
+	public static final int  DEVERROR_RECORD=94;
+	
+	public static final int  STATIONTRAFFIC=95;
+	
 	public boolean add(Object obj); // 娣诲姞
 
 	public boolean update(Object obj); // 鏇存柊
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
index e742d57..d3fafa5 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
@@ -31,6 +31,7 @@
 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;
@@ -42,12 +43,14 @@
 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;
@@ -194,6 +197,9 @@
 			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();
 			default :return null;
 		}
 	}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_exImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_exImpl.java
new file mode 100644
index 0000000..cef1cbd
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_exImpl.java
@@ -0,0 +1,128 @@
+package com.fgkj.dao.impl;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.CallBack;
+import com.fgkj.dao.DAOHelper;
+import com.fgkj.db.DBUtil;
+import com.fgkj.dto.BattInf;
+import com.fgkj.dto.Battinf_ex;
+
+public class Battinf_exImpl implements BaseDAO,CallBack{
+
+	public List getResults(ResultSet rs) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean add(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean update(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean del(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public List searchAll() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+    //鏍规嵁鐢垫睜缁勭殑淇℃伅stationid鏌ヨ
+	public List serchByCondition(Object obj) {
+		BattInf binf=(BattInf) obj;
+		String sql=" select * from db_battinf.tb_battinf_ex where stationId=? ";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getStationId()}, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				try {
+					while(rs.next()){
+						Battinf_ex binf_ex=new Battinf_ex();
+						binf_ex.setNum(rs.getInt("num"));
+						binf_ex.setStationId(rs.getString("stationId"));
+						binf_ex.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+						binf_ex.setStationName(rs.getString("stationName"));
+						binf_ex.setStationCode(rs.getString("stationCode"));
+						binf_ex.setStationRegion(rs.getString("stationRegion"));
+						binf_ex.setKeyWords(rs.getString("keyWords"));
+						binf_ex.setAffiliation(rs.getString("affiliation"));
+						binf_ex.setDataSources(rs.getString("dataSources"));
+						binf_ex.setStationType(rs.getString("stationType"));
+						binf_ex.setLongitude(rs.getDouble("longitude"));
+						binf_ex.setLatitude(rs.getInt("latitude"));
+						binf_ex.setStationAddr(rs.getString("stationAddr"));
+						binf_ex.setStationLevel(rs.getString("stationLevel"));
+						binf_ex.setMaintenanceState(rs.getString("maintenanceState"));
+						binf_ex.setBlockedState(rs.getString("blockedState"));
+						binf_ex.setMaintenanceCompany(rs.getString("maintenanceCompany"));
+						binf_ex.setBusinessScenario(rs.getString("businessScenario"));
+						binf_ex.setCoverScenario(rs.getString("coverScenario"));
+						binf_ex.setSiteTerrain(rs.getString("siteTerrain"));
+						binf_ex.setPropertyRights(rs.getString("propertyRights"));
+						binf_ex.setPropertyUnit(rs.getString("propertyUnit"));
+						binf_ex.setIsShare(rs.getString("isShare"));
+						binf_ex.setUseUnit(rs.getString("useUnit"));
+						binf_ex.setSiteCode(rs.getString("siteCode"));
+						binf_ex.setHistorySiteCode(rs.getString("historySiteCode"));
+						binf_ex.setSiteInternalNumber(rs.getString("siteInternalNumber"));
+						binf_ex.setSitePinyinReferred(rs.getString("sitePinyinReferred"));
+						binf_ex.setSiteChineseReferred(rs.getString("siteChineseReferred"));
+						binf_ex.setSiteMergeRecord(rs.getString("siteMergeRecord"));
+						binf_ex.setIsOpenBusiness(rs.getString("isOpenBusiness"));
+						binf_ex.setSchoolPersonnel(rs.getString("schoolPersonnel"));
+						binf_ex.setEntryTime(rs.getString("entryTime"));
+						binf_ex.setModifyPeople(rs.getString("modifyPeople"));
+						binf_ex.setModifyTime(rs.getString("modifyTime"));
+						binf_ex.setNote(rs.getString("note"));
+						binf_ex.setSiteReceivesMark(rs.getString("siteReceivesMark"));
+						binf_ex.setSiteValidity(rs.getString("siteValidity"));
+						binf_ex.setSiteNameCMCC(rs.getString("siteNameCMCC"));
+						binf_ex.setSiteNameCUCC(rs.getString("siteNameCUCC"));
+						binf_ex.setSiteNameCTC(rs.getString("siteNameCTC"));
+						binf_ex.setProducer(rs.getString("producer"));
+						binf_ex.setLastTimeLong(rs.getDouble("lastTimeLong"));
+						binf_ex.setLastTimeType(rs.getString("lastTimeType"));
+						binf_ex.setLastTimeDate(rs.getTimestamp("lastTimeDate"));
+						binf_ex.setShareInfo(rs.getString("shareInfo"));
+						binf_ex.setElectPowerCMCC(rs.getInt("electPowerCMCC"));
+						binf_ex.setElectPowerCUCC(rs.getInt("electPowerCUCC"));
+						binf_ex.setElectPowerCTC(rs.getInt("electPowerCTC"));
+						binf_ex.setIsCanElectPower(rs.getInt("isCanElectPower"));
+						binf_ex.setUpperStationRoute(rs.getDouble("upperStationRoute"));
+						binf_ex.setUpperStationDifficult(rs.getString("upperStationDifficult"));
+						binf_ex.setClienteleErrorService(rs.getString("clienteleErrorService"));
+						list.add(binf_ex);
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		return list;
+	}
+
+	public List serchByInfo(Object obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+    public static void main(String[] args) {
+		Battinf_exImpl bimpl=new Battinf_exImpl();
+		BattInf binf=new BattInf();
+		binf.setStationId("42000001");
+		List list=bimpl.serchByCondition(binf);
+		System.out.println(list.size());
+	}
+}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
new file mode 100644
index 0000000..e8f42a8
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -0,0 +1,118 @@
+package com.fgkj.dao.impl;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.CallBack;
+import com.fgkj.dao.DAOHelper;
+import com.fgkj.dao.LimitNumberFactory;
+import com.fgkj.db.DBUtil;
+import com.fgkj.dto.BattInf;
+import com.fgkj.dto.Deverror_record;
+import com.fgkj.dto.Page;
+
+public class Deverror_recordImpl implements BaseDAO,CallBack{
+
+	public List getResults(ResultSet rs) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+   //鐢ㄦ埛鎵嬪姩娣诲姞闂
+	public boolean add(Object obj) {
+		Deverror_record dev_record=(Deverror_record) obj;
+		String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,uid) values(?,?,?,?)";
+		boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dev_record.getStationId(),dev_record.getRecord_time(),dev_record.getError_descript(),dev_record.getUid()});
+		return bl;
+	}
+
+	public boolean update(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean del(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public List searchAll() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+    //鏍规嵁stationid鏌ヨ璁惧鐨勯棶棰樿褰�
+	public List serchByCondition(Object obj) {
+		BattInf binf=(BattInf) obj;
+		Page p=binf.getPage();
+		Connection conn=DBUtil.getConn();
+		String numberSql=" SELECT FOUND_ROWS() number";
+		String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en " +
+				"  ,db_battinf.tb_battinf.stationname,stationname1,stationname2,stationname3,stationname5 " +
+				"  from db_battinf.tb_deverror_record,db_battinf.tb_battinf " +
+				" where tb_deverror_record.stationid=tb_battinf.stationid " +
+				" and tb_deverror_record.stationid like ? and stationname1 like ? and stationname2 like ? and stationname5 like ?  " +
+				" and tb_deverror_record.uid=? and error_en=0 " +
+				" order by record_time desc " +
+				" limit ?,? ";
+		List<Deverror_record> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{"%"+binf.getStationId()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName5()+"%"
+				,binf.getNum(),(p.getPageCurr()-1)*p.getPageSize(),p.getPageSize()}, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				try {
+					while(rs.next()){
+						Deverror_record dev_record=new Deverror_record();
+						dev_record.setNum(rs.getInt("num"));
+						dev_record.setStationId(rs.getString("stationId"));
+						dev_record.setStationName(rs.getString("stationName"));
+						dev_record.setStationName1(rs.getString("stationName1"));
+						dev_record.setStationName2(rs.getString("stationName2"));
+						dev_record.setStationName3(rs.getString("stationName3"));
+						dev_record.setStationName5(rs.getString("stationName5"));
+						dev_record.setRecord_time(rs.getTimestamp("record_time"));
+						dev_record.setError_descript(rs.getString("error_descript"));
+						dev_record.setError_en(rs.getInt("error_en"));
+						Page page=new Page();
+						dev_record.setPage(page);
+						list.add(dev_record);
+					}
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		//鍘绘帀limit鏉′欢鍚庣殑鎬绘暟
+		int number=LimitNumberFactory.GetLimtitNumber(conn, numberSql);
+		if(list!=null&&list.size()>0){
+			list.get(list.size()-1).getPage().setPageSize(number);
+		}
+		return list;
+	}
+
+	public List serchByInfo(Object obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	public static void main(String[] args) {
+		 Deverror_recordImpl dimpl=new Deverror_recordImpl();
+		 BattInf binf=new BattInf();
+		 binf.setNum(1002);
+		 binf.setStationName("");
+		 binf.setStationName1("");
+		 binf.setStationName2("");
+		 binf.setStationName3("");
+		 binf.setStationName5("");
+		 binf.setStationId("");
+		 Page p=new Page();
+		 p.setPageCurr(1);
+		 p.setPageSize(10);
+		 binf.setPage(p);
+		 dimpl.serchByCondition(binf);
+	}
+
+}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java b/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
new file mode 100644
index 0000000..c4fe854
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dao/impl/StationtrafficImpl.java
@@ -0,0 +1,159 @@
+package com.fgkj.dao.impl;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import com.fgkj.actions.ActionUtil;
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.CallBack;
+import com.fgkj.dao.DAOHelper;
+import com.fgkj.db.DBUtil;
+import com.fgkj.dto.Stationtraffic;
+
+public class StationtrafficImpl implements BaseDAO,CallBack{
+
+	public List getResults(ResultSet rs) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public boolean add(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean update(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public boolean del(Object obj) {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	public List searchAll() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+    //缁熻鍩虹珯娴侀噺
+	public List serchByCondition(Object obj) {
+		final Stationtraffic straffic=(Stationtraffic) obj;
+		String sql=" select distinct tb_stationtraffic.num,dev_id,record_time,dayflow,nowflow" +
+				"  ,tb_battinf.stationName,tb_battinf.stationName1,tb_battinf.stationName2,tb_battinf.stationName3,tb_battinf.stationName5 " +
+				"  from web_site.tb_stationtraffic,db_battinf.tb_battinf " +
+				"  where web_site.tb_stationtraffic.dev_id=db_battinf.tb_battinf.fBSDeviceId  " +
+				"  and record_time>? and record_time<? " +
+				"  and dev_id=? " +
+				"  order by dev_id,record_time asc ";
+		List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{straffic.getRecord_time(),straffic.getRecord_time1(),straffic.getDev_id()}, new CallBack() {
+			
+			public List getResults(ResultSet rs) {
+				List list=new ArrayList();
+				// 鏃堕棿娈�
+				String perid_Time = ""; 
+				Calendar now = Calendar.getInstance();
+				int nowflow=0;
+				try {
+					while(rs.next()){
+						
+						int nowflows=rs.getInt("nowflow");
+						// 骞翠唤锛屽搴︼紝鏈堜唤
+						Date dev_recordtime = rs.getTimestamp("record_time");
+						// 鑾峰彇鍏蜂綋骞翠唤锛屾湀浠藉拰璇ユ湀鐨勬�诲ぉ鏁�
+						/*int year = dev_recordtime.getYear() + 1900;
+						int month = dev_recordtime.getMonth() + 1;*/
+						now.setTime(dev_recordtime);
+						int year = now.get(Calendar.YEAR);
+				        int month = now.get(Calendar.MONTH) + 1; // 0-based!
+				        int day = now.get(Calendar.DAY_OF_MONTH);
+						//System.out.println(dev_recordtime+"   "+day);
+						String perid_Times="";
+                        if(straffic.getNum()==1){//鏈堢粺璁�
+                        	perid_Times = ActionUtil.getFirstDayOfMonth(year, month - 1);
+        					perid_Times += "~";
+        					perid_Times += ActionUtil.getLastDayOfMonth(year, month - 1);
+						}else if (straffic.getNum()==3) {// 鎸夊勾浠�
+							perid_Times = ActionUtil.getFirstDayOfMonth(year, 0);
+							perid_Times += "~";
+							perid_Times += ActionUtil.getLastDayOfMonth(year, 11);
+						}else if(straffic.getNum()==2){ //鏃ョ粺璁�
+							perid_Times = ActionUtil.getDayTime(year, month-1, day, 1);
+        					perid_Times += "~";
+        					perid_Times += ActionUtil.getDayTime(year, month-1, day, 4);
+						}
+                        //System.out.println(perid_Times+" "+perid_Time+" "+nowflows);
+						if(perid_Times.equals(perid_Time)){
+							nowflow+=nowflows;
+						}else{
+							if(perid_Time.equals("")){
+							     perid_Time=perid_Times;
+							     nowflow+=nowflows;
+							     continue;
+							}
+							Stationtraffic st=new Stationtraffic();
+							st.setDev_id(rs.getInt("dev_id"));
+							st.setNowflow(nowflow);
+							st.setStationName(rs.getString("stationName"));
+							st.setStationName1(rs.getString("stationName1"));
+							st.setStationName2(rs.getString("stationName2"));
+							st.setStationName3(rs.getString("stationName3"));
+							st.setStationName5(rs.getString("stationName5"));
+							st.setNote(perid_Time);
+							list.add(st);
+							nowflow=0;
+							nowflow+=nowflows;
+							perid_Time=perid_Times;
+							
+						}
+					if(rs.isLast()){
+						Stationtraffic st=new Stationtraffic();
+						st.setDev_id(rs.getInt("dev_id"));
+						st.setNowflow(nowflow);
+						st.setStationName(rs.getString("stationName"));
+						st.setStationName1(rs.getString("stationName1"));
+						st.setStationName2(rs.getString("stationName2"));
+						st.setStationName3(rs.getString("stationName3"));
+						st.setStationName5(rs.getString("stationName5"));
+						st.setNote(perid_Time);
+						list.add(st);
+					}
+					}
+					
+				} catch (SQLException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				return list;
+			}
+		});
+		return list;
+	}
+
+	public List serchByInfo(Object obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+   public static void main(String[] args) throws ParseException {
+	     StationtrafficImpl simpl=new StationtrafficImpl();
+	     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		 Date date1 = sdf.parse("2000-01-01 00:00:00");
+		 Date date2 = sdf.parse("2020-01-01 00:00:00");
+		 
+	     Stationtraffic st=new Stationtraffic();
+	     st.setNum(3);
+	     st.setDev_id(910000001);
+	     st.setRecord_time(ActionUtil.getSimpDate(date1));
+	     st.setRecord_time1(ActionUtil.getSimpDate(date2));
+	     List<Stationtraffic> list=simpl.serchByCondition(st);
+	     for (Stationtraffic s : list) {
+			System.out.println(s);
+		}
+}
+}
diff --git a/gx_tieta/src/com/fgkj/dto/Battinf_ex.java b/gx_tieta/src/com/fgkj/dto/Battinf_ex.java
new file mode 100644
index 0000000..83ef2ec
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dto/Battinf_ex.java
@@ -0,0 +1,444 @@
+package com.fgkj.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Battinf_ex implements Serializable{
+	private int num;
+	public String stationId;			//鏈烘埧id
+	public int FBSDeviceId;					//璁惧id
+	public String stationName;			//鏈烘埧鍚嶇О
+	public String stationCode;			//绔欏潃缂栫爜						*
+	public String stationRegion;		//鎵�灞炲尯鍩�						*
+	public String keyWords;				//鍏抽敭瀛�						*
+	public String affiliation;			//鎵�灞炵粍缁�						*
+	public String dataSources;			//鏁版嵁鏉ユ簮						*
+	public String stationType;			//绔欏潃绫诲瀷						*
+	public double longitude;			//缁忓害						*
+	public double latitude;				//绾害						*
+	public String stationAddr;			//鎵�鍦ㄥ湴鍧�						*
+	public String stationLevel;			//绔欏潃绛夌骇						*
+	public String maintenanceState;		//缁存姢鐘舵��						*
+	public String blockedState;			//灏侀攣鐘舵��						*
+	public String maintenanceCompany;	//缁存姢鍗曚綅						*
+	public String businessScenario;		//涓氬姟鍦烘櫙						*
+	public String CoverScenario;		//瑕嗙洊鍦烘櫙						*
+	public String siteTerrain;			//绔欏潃鍦板舰						*
+	public String propertyRights;		//浜ф潈鎬ц川						*
+	public String propertyUnit;			//浜ф潈鍗曚綅						*
+	public String isShare;				//鏄惁鍏变韩						*
+	public String useUnit;				//浣跨敤鍗曚綅						*
+	public String siteCode;				//鐗╃悊绔欏潃缂栫爜					*
+	public String historySiteCode;		//鍘嗗彶鐗╃悊绔欏潃缂栫爜				*
+	public String siteInternalNumber;	//绔欏潃鍐呴儴缂栧彿					*
+	public String sitePinyinReferred;	//绔欏潃鎷奸煶绠�绉�					*
+	public String siteChineseReferred;	//涓枃绠�绉�						*
+	public String siteMergeRecord;		//绔欏潃鍚堝苟璁板綍					*
+	public String isOpenBusiness;		//鏄惁寮�閫氫笟鍔�					*
+	public String schoolPersonnel;		//褰曞叆浜哄憳						*
+	public String entryTime;			//褰曞叆鏃堕棿						*
+	public String modifyPeople;			//淇敼浜�						*
+	public String modifyTime;			//淇敼鏃堕棿						*
+	public String note;					//澶囨敞						*	
+	public String siteReceivesMark;		//绔欏潃鎺ユ敹鏍囪					*
+	public String siteValidity;			//鏄惁鏈夋晥						*
+	public String siteNameCMCC;			//绉诲姩绔欏潃鍚嶇О					*
+	public String siteNameCUCC;			//鑱旈�氱珯鍧�鍚嶇О					*
+	public String siteNameCTC;			//鐢典俊绔欏潃鍚嶇О					*
+	
+	public String producer;				//鐢熶骇鍘傚晢						*
+	/*public String battBrand;			//鐢垫睜鍝佺墝						*
+	public String battModel;			//鐢垫睜鍨嬪彿
+	public String battCapStd;			//鏍囩О瀹归噺
+	
+	
+	
+	public int battCount;				//鐢垫睜缁勬暟
+	public int isElectLose;				//鏄惁澶囩數涓嶈冻
+	public int isUpError;				//鏄惁鑴辨満涓婃姤寮傚父
+	public int isNotElect;				//鏄惁鐤戜技鏃犲鐢�
+*/	public double lastTimeLong;			//缁埅娴嬬畻鏃堕暱
+	public String lastTimeType;			//缁埅娴嬬畻绫诲埆
+	public Date lastTimeDate;			//缁埅鍙戠敓鏃堕棿
+	
+	/*public String februaryOutTimeLong;	//浜屾湀閫�鏈嶆椂闀�
+	public String marchOutTimeLong;		//涓夋湀閫�鏈嶆椂闀�
+	public String aprilOutTimeLong;		//鍥涙湀閫�鏈嶆椂闀�
+	public String mayOutTimeLong;		//浜旀湀閫�鏈嶆椂闀�
+	public String februaryOutTimeCount;	//浜屾湀閫�鏈嶆鏁�
+	public String marchOutTimeCount;		//涓夋湀閫�鏈嶆鏁�
+	public String aprilOutTimeCount;		//鍥涙湀閫�鏈嶆鏁�
+	public String mayOutTimeCount;			//浜旀湀閫�鏈嶆鏁�
+*/	
+	public String shareInfo;			//鍏变韩鎯呭喌
+	
+	public int electPowerCMCC;		//绉诲姩鏄惁璐拱鍙戠數鏈嶅姟
+	public int electPowerCUCC;		//鑱旈�氭槸鍚﹁喘涔板彂鐢垫湇鍔�
+	public int electPowerCTC;		//鐢典俊鏄惁璐拱鍙戠數鏈嶅姟
+	public int isCanElectPower;		//鏄惁鍏峰鍙戠數鏈嶅姟
+	public double upperStationRoute;	//涓婄珯璺▼
+	public String upperStationDifficult; //涓婄珯闅炬槗绋嬪害
+	public String clienteleErrorService; //瀹㈡埛闂搴撴湭瀹屾垚钃勭數姹犵淮淇�
+	/*public String verifyStationExist;	 //鍒嗗叕鍙告牳瀹炵珯鍧�鏄惁瀹為檯瀛樺湪
+	public String verifyIsDisCharge;	 //鍒嗗叕鍙� 鏍稿疄2018骞存槸鍚﹀凡杩涜杩囩數姹犳暣娌�
+	public String devletOrAdd;			 //鍒犻櫎鎴栧鍔�
+	public String islastTime;			 //鏄惁鍦ㄧ數姹犵粍缁埅鑳藉姏鍐�
+   */
+	public int getNum() {
+		return num;
+	}
+	public void setNum(int num) {
+		this.num = num;
+	}
+	public String getStationId() {
+		return stationId;
+	}
+	public void setStationId(String stationId) {
+		this.stationId = stationId;
+	}
+	public int getFBSDeviceId() {
+		return FBSDeviceId;
+	}
+	public void setFBSDeviceId(int fBSDeviceId) {
+		FBSDeviceId = fBSDeviceId;
+	}
+	public String getStationName() {
+		return stationName;
+	}
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+	public String getStationCode() {
+		return stationCode;
+	}
+	public void setStationCode(String stationCode) {
+		this.stationCode = stationCode;
+	}
+	public String getStationRegion() {
+		return stationRegion;
+	}
+	public void setStationRegion(String stationRegion) {
+		this.stationRegion = stationRegion;
+	}
+	public String getKeyWords() {
+		return keyWords;
+	}
+	public void setKeyWords(String keyWords) {
+		this.keyWords = keyWords;
+	}
+	public String getAffiliation() {
+		return affiliation;
+	}
+	public void setAffiliation(String affiliation) {
+		this.affiliation = affiliation;
+	}
+	public String getDataSources() {
+		return dataSources;
+	}
+	public void setDataSources(String dataSources) {
+		this.dataSources = dataSources;
+	}
+	public String getStationType() {
+		return stationType;
+	}
+	public void setStationType(String stationType) {
+		this.stationType = stationType;
+	}
+	public double getLongitude() {
+		return longitude;
+	}
+	public void setLongitude(double longitude) {
+		this.longitude = longitude;
+	}
+	public double getLatitude() {
+		return latitude;
+	}
+	public void setLatitude(double latitude) {
+		this.latitude = latitude;
+	}
+	public String getStationAddr() {
+		return stationAddr;
+	}
+	public void setStationAddr(String stationAddr) {
+		this.stationAddr = stationAddr;
+	}
+	public String getStationLevel() {
+		return stationLevel;
+	}
+	public void setStationLevel(String stationLevel) {
+		this.stationLevel = stationLevel;
+	}
+	public String getMaintenanceState() {
+		return maintenanceState;
+	}
+	public void setMaintenanceState(String maintenanceState) {
+		this.maintenanceState = maintenanceState;
+	}
+	public String getBlockedState() {
+		return blockedState;
+	}
+	public void setBlockedState(String blockedState) {
+		this.blockedState = blockedState;
+	}
+	public String getMaintenanceCompany() {
+		return maintenanceCompany;
+	}
+	public void setMaintenanceCompany(String maintenanceCompany) {
+		this.maintenanceCompany = maintenanceCompany;
+	}
+	public String getBusinessScenario() {
+		return businessScenario;
+	}
+	public void setBusinessScenario(String businessScenario) {
+		this.businessScenario = businessScenario;
+	}
+	public String getCoverScenario() {
+		return CoverScenario;
+	}
+	public void setCoverScenario(String coverScenario) {
+		CoverScenario = coverScenario;
+	}
+	public String getSiteTerrain() {
+		return siteTerrain;
+	}
+	public void setSiteTerrain(String siteTerrain) {
+		this.siteTerrain = siteTerrain;
+	}
+	public String getPropertyRights() {
+		return propertyRights;
+	}
+	public void setPropertyRights(String propertyRights) {
+		this.propertyRights = propertyRights;
+	}
+	public String getPropertyUnit() {
+		return propertyUnit;
+	}
+	public void setPropertyUnit(String propertyUnit) {
+		this.propertyUnit = propertyUnit;
+	}
+	public String getIsShare() {
+		return isShare;
+	}
+	public void setIsShare(String isShare) {
+		this.isShare = isShare;
+	}
+	public String getUseUnit() {
+		return useUnit;
+	}
+	public void setUseUnit(String useUnit) {
+		this.useUnit = useUnit;
+	}
+	public String getSiteCode() {
+		return siteCode;
+	}
+	public void setSiteCode(String siteCode) {
+		this.siteCode = siteCode;
+	}
+	public String getHistorySiteCode() {
+		return historySiteCode;
+	}
+	public void setHistorySiteCode(String historySiteCode) {
+		this.historySiteCode = historySiteCode;
+	}
+	public String getSiteInternalNumber() {
+		return siteInternalNumber;
+	}
+	public void setSiteInternalNumber(String siteInternalNumber) {
+		this.siteInternalNumber = siteInternalNumber;
+	}
+	public String getSitePinyinReferred() {
+		return sitePinyinReferred;
+	}
+	public void setSitePinyinReferred(String sitePinyinReferred) {
+		this.sitePinyinReferred = sitePinyinReferred;
+	}
+	public String getSiteChineseReferred() {
+		return siteChineseReferred;
+	}
+	public void setSiteChineseReferred(String siteChineseReferred) {
+		this.siteChineseReferred = siteChineseReferred;
+	}
+	public String getSiteMergeRecord() {
+		return siteMergeRecord;
+	}
+	public void setSiteMergeRecord(String siteMergeRecord) {
+		this.siteMergeRecord = siteMergeRecord;
+	}
+	public String getIsOpenBusiness() {
+		return isOpenBusiness;
+	}
+	public void setIsOpenBusiness(String isOpenBusiness) {
+		this.isOpenBusiness = isOpenBusiness;
+	}
+	public String getSchoolPersonnel() {
+		return schoolPersonnel;
+	}
+	public void setSchoolPersonnel(String schoolPersonnel) {
+		this.schoolPersonnel = schoolPersonnel;
+	}
+	public String getEntryTime() {
+		return entryTime;
+	}
+	public void setEntryTime(String entryTime) {
+		this.entryTime = entryTime;
+	}
+	public String getModifyPeople() {
+		return modifyPeople;
+	}
+	public void setModifyPeople(String modifyPeople) {
+		this.modifyPeople = modifyPeople;
+	}
+	public String getModifyTime() {
+		return modifyTime;
+	}
+	public void setModifyTime(String modifyTime) {
+		this.modifyTime = modifyTime;
+	}
+	public String getNote() {
+		return note;
+	}
+	public void setNote(String note) {
+		this.note = note;
+	}
+	public String getSiteReceivesMark() {
+		return siteReceivesMark;
+	}
+	public void setSiteReceivesMark(String siteReceivesMark) {
+		this.siteReceivesMark = siteReceivesMark;
+	}
+	public String getSiteValidity() {
+		return siteValidity;
+	}
+	public void setSiteValidity(String siteValidity) {
+		this.siteValidity = siteValidity;
+	}
+	public String getSiteNameCMCC() {
+		return siteNameCMCC;
+	}
+	public void setSiteNameCMCC(String siteNameCMCC) {
+		this.siteNameCMCC = siteNameCMCC;
+	}
+	public String getSiteNameCUCC() {
+		return siteNameCUCC;
+	}
+	public void setSiteNameCUCC(String siteNameCUCC) {
+		this.siteNameCUCC = siteNameCUCC;
+	}
+	public String getSiteNameCTC() {
+		return siteNameCTC;
+	}
+	public void setSiteNameCTC(String siteNameCTC) {
+		this.siteNameCTC = siteNameCTC;
+	}
+	public String getProducer() {
+		return producer;
+	}
+	public void setProducer(String producer) {
+		this.producer = producer;
+	}
+	public double getLastTimeLong() {
+		return lastTimeLong;
+	}
+	public void setLastTimeLong(double lastTimeLong) {
+		this.lastTimeLong = lastTimeLong;
+	}
+	public String getLastTimeType() {
+		return lastTimeType;
+	}
+	public void setLastTimeType(String lastTimeType) {
+		this.lastTimeType = lastTimeType;
+	}
+	public Date getLastTimeDate() {
+		return lastTimeDate;
+	}
+	public void setLastTimeDate(Date lastTimeDate) {
+		this.lastTimeDate = lastTimeDate;
+	}
+	public String getShareInfo() {
+		return shareInfo;
+	}
+	public void setShareInfo(String shareInfo) {
+		this.shareInfo = shareInfo;
+	}
+	public int getElectPowerCMCC() {
+		return electPowerCMCC;
+	}
+	public void setElectPowerCMCC(int electPowerCMCC) {
+		this.electPowerCMCC = electPowerCMCC;
+	}
+	public int getElectPowerCUCC() {
+		return electPowerCUCC;
+	}
+	public void setElectPowerCUCC(int electPowerCUCC) {
+		this.electPowerCUCC = electPowerCUCC;
+	}
+	public int getElectPowerCTC() {
+		return electPowerCTC;
+	}
+	public void setElectPowerCTC(int electPowerCTC) {
+		this.electPowerCTC = electPowerCTC;
+	}
+	public int getIsCanElectPower() {
+		return isCanElectPower;
+	}
+	public void setIsCanElectPower(int isCanElectPower) {
+		this.isCanElectPower = isCanElectPower;
+	}
+	public double getUpperStationRoute() {
+		return upperStationRoute;
+	}
+	public void setUpperStationRoute(double upperStationRoute) {
+		this.upperStationRoute = upperStationRoute;
+	}
+	public String getUpperStationDifficult() {
+		return upperStationDifficult;
+	}
+	public void setUpperStationDifficult(String upperStationDifficult) {
+		this.upperStationDifficult = upperStationDifficult;
+	}
+	public String getClienteleErrorService() {
+		return clienteleErrorService;
+	}
+	public void setClienteleErrorService(String clienteleErrorService) {
+		this.clienteleErrorService = clienteleErrorService;
+	}
+	@Override
+	public String toString() {
+		return "Battinf_ex [num=" + num + ", stationId=" + stationId
+				+ ", FBSDeviceId=" + FBSDeviceId + ", stationName="
+				+ stationName + ", stationCode=" + stationCode
+				+ ", stationRegion=" + stationRegion + ", keyWords=" + keyWords
+				+ ", affiliation=" + affiliation + ", dataSources="
+				+ dataSources + ", stationType=" + stationType + ", longitude="
+				+ longitude + ", latitude=" + latitude + ", stationAddr="
+				+ stationAddr + ", stationLevel=" + stationLevel
+				+ ", maintenanceState=" + maintenanceState + ", blockedState="
+				+ blockedState + ", maintenanceCompany=" + maintenanceCompany
+				+ ", businessScenario=" + businessScenario + ", CoverScenario="
+				+ CoverScenario + ", siteTerrain=" + siteTerrain
+				+ ", propertyRights=" + propertyRights + ", propertyUnit="
+				+ propertyUnit + ", isShare=" + isShare + ", useUnit="
+				+ useUnit + ", siteCode=" + siteCode + ", historySiteCode="
+				+ historySiteCode + ", siteInternalNumber="
+				+ siteInternalNumber + ", sitePinyinReferred="
+				+ sitePinyinReferred + ", siteChineseReferred="
+				+ siteChineseReferred + ", siteMergeRecord=" + siteMergeRecord
+				+ ", isOpenBusiness=" + isOpenBusiness + ", schoolPersonnel="
+				+ schoolPersonnel + ", entryTime=" + entryTime
+				+ ", modifyPeople=" + modifyPeople + ", modifyTime="
+				+ modifyTime + ", note=" + note + ", siteReceivesMark="
+				+ siteReceivesMark + ", siteValidity=" + siteValidity
+				+ ", siteNameCMCC=" + siteNameCMCC + ", siteNameCUCC="
+				+ siteNameCUCC + ", siteNameCTC=" + siteNameCTC + ", producer="
+				+ producer + ", lastTimeLong=" + lastTimeLong
+				+ ", lastTimeType=" + lastTimeType + ", lastTimeDate="
+				+ lastTimeDate + ", shareInfo=" + shareInfo
+				+ ", electPowerCMCC=" + electPowerCMCC + ", electPowerCUCC="
+				+ electPowerCUCC + ", electPowerCTC=" + electPowerCTC
+				+ ", isCanElectPower=" + isCanElectPower
+				+ ", upperStationRoute=" + upperStationRoute
+				+ ", upperStationDifficult=" + upperStationDifficult
+				+ ", clienteleErrorService=" + clienteleErrorService + "]";
+	}
+	
+}
diff --git a/gx_tieta/src/com/fgkj/dto/Deverror_record.java b/gx_tieta/src/com/fgkj/dto/Deverror_record.java
new file mode 100644
index 0000000..b43f6d9
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dto/Deverror_record.java
@@ -0,0 +1,113 @@
+package com.fgkj.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+public class Deverror_record implements Serializable{
+	private int num;
+	private String stationId;
+	private String stationName;
+	private String stationName1;
+	private String stationName2;
+	private String stationName3;
+	private String stationName5;
+	private Date record_time;
+	private String error_descript;//闂鎻忚堪
+	private int uid;
+	private int error_en;         //闂鏄惁瑙e喅
+	private String note;
+	private Page page;
+	public int getNum() {
+		return num;
+	}
+	public void setNum(int num) {
+		this.num = num;
+	}
+	
+	public String getStationId() {
+		return stationId;
+	}
+	public void setStationId(String stationId) {
+		this.stationId = stationId;
+	}
+	public String getStationName() {
+		return stationName;
+	}
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+	public String getStationName1() {
+		return stationName1;
+	}
+	public void setStationName1(String stationName1) {
+		this.stationName1 = stationName1;
+	}
+	public String getStationName2() {
+		return stationName2;
+	}
+	public void setStationName2(String stationName2) {
+		this.stationName2 = stationName2;
+	}
+	public String getStationName3() {
+		return stationName3;
+	}
+	public void setStationName3(String stationName3) {
+		this.stationName3 = stationName3;
+	}
+	public String getStationName5() {
+		return stationName5;
+	}
+	public void setStationName5(String stationName5) {
+		this.stationName5 = stationName5;
+	}
+	public Date getRecord_time() {
+		return record_time;
+	}
+	public void setRecord_time(Date record_time) {
+		this.record_time = record_time;
+	}
+	public String getError_descript() {
+		return error_descript;
+	}
+	public void setError_descript(String error_descript) {
+		this.error_descript = error_descript;
+	}
+	public int getUid() {
+		return uid;
+	}
+	public void setUid(int uid) {
+		this.uid = uid;
+	}
+	public int getError_en() {
+		return error_en;
+	}
+	public void setError_en(int error_en) {
+		this.error_en = error_en;
+	}
+	public String getNote() {
+		return note;
+	}
+	public void setNote(String note) {
+		this.note = note;
+	}
+	public Page getPage() {
+		return page;
+	}
+	public void setPage(Page page) {
+		this.page = page;
+	}
+	@Override
+	public String toString() {
+		return "Deverror_record [num=" + num + ", stationId=" + stationId
+				+ ", stationName=" + stationName + ", stationName1="
+				+ stationName1 + ", stationName2=" + stationName2
+				+ ", stationName3=" + stationName3 + ", stationName5="
+				+ stationName5 + ", record_time=" + record_time
+				+ ", error_descript=" + error_descript + ", uid=" + uid
+				+ ", error_en=" + error_en + ", note=" + note + ", page="
+				+ page + "]";
+	}
+	
+	
+}
diff --git a/gx_tieta/src/com/fgkj/dto/Stationtraffic.java b/gx_tieta/src/com/fgkj/dto/Stationtraffic.java
new file mode 100644
index 0000000..e117a16
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/dto/Stationtraffic.java
@@ -0,0 +1,117 @@
+package com.fgkj.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Stationtraffic implements Serializable{
+	private int num;
+	private int dev_id;
+	private Date record_time;
+	private Date record_time1;
+	private int dayflow;
+	private int nowflow;
+	private String note;
+	
+	private String stationName;
+	private String stationName1;
+	private String stationName2;
+	private String stationName3;
+	private String stationName5;
+	
+	private Page page;
+	
+	public int getNum() {
+		return num;
+	}
+	public void setNum(int num) {
+		this.num = num;
+	}
+	public int getDev_id() {
+		return dev_id;
+	}
+	public void setDev_id(int dev_id) {
+		this.dev_id = dev_id;
+	}
+	public Date getRecord_time() {
+		return record_time;
+	}
+	public void setRecord_time(Date record_time) {
+		this.record_time = record_time;
+	}
+	
+	public Date getRecord_time1() {
+		return record_time1;
+	}
+	public void setRecord_time1(Date record_time1) {
+		this.record_time1 = record_time1;
+	}
+	public int getDayflow() {
+		return dayflow;
+	}
+	public void setDayflow(int dayflow) {
+		this.dayflow = dayflow;
+	}
+	public int getNowflow() {
+		return nowflow;
+	}
+	public void setNowflow(int nowflow) {
+		this.nowflow = nowflow;
+	}
+	public String getNote() {
+		return note;
+	}
+	public void setNote(String note) {
+		this.note = note;
+	}
+	public String getStationName() {
+		return stationName;
+	}
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+	public String getStationName1() {
+		return stationName1;
+	}
+	public void setStationName1(String stationName1) {
+		this.stationName1 = stationName1;
+	}
+	public String getStationName2() {
+		return stationName2;
+	}
+	public void setStationName2(String stationName2) {
+		this.stationName2 = stationName2;
+	}
+	public String getStationName3() {
+		return stationName3;
+	}
+	public void setStationName3(String stationName3) {
+		this.stationName3 = stationName3;
+	}
+	public String getStationName5() {
+		return stationName5;
+	}
+	public void setStationName5(String stationName5) {
+		this.stationName5 = stationName5;
+	}
+	public Page getPage() {
+		return page;
+	}
+	public void setPage(Page page) {
+		this.page = page;
+	}
+	@Override
+	public String toString() {
+		return "Stationtraffic [num=" + num + ", dev_id=" + dev_id
+				+ ", record_time=" + record_time + ", record_time1="
+				+ record_time1 + ", dayflow=" + dayflow + ", nowflow="
+				+ nowflow + ", note=" + note + ", stationName=" + stationName
+				+ ", stationName1=" + stationName1 + ", stationName2="
+				+ stationName2 + ", stationName3=" + stationName3
+				+ ", stationName5=" + stationName5 + ", page=" + page + "]";
+	}
+	
+	
+	
+	
+
+}
diff --git a/gx_tieta/src/com/fgkj/services/Battinf_exService.java b/gx_tieta/src/com/fgkj/services/Battinf_exService.java
new file mode 100644
index 0000000..7616c90
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/services/Battinf_exService.java
@@ -0,0 +1,31 @@
+package com.fgkj.services;
+
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dto.ServiceModel;
+
+public class Battinf_exService {
+	private ServiceModel model;
+	private BaseDAO dao;
+	public Battinf_exService() {
+		super();
+		model=new ServiceModel();
+		dao=BaseDAOFactory.getBaseDAO(BaseDAO.BATTINF_EX);
+	}
+	//鏍规嵁鐢垫睜缁勭殑淇℃伅stationid鏌ヨ
+	public ServiceModel serchByCondition(Object obj){
+		List list=dao.serchByCondition(obj);
+		if (list!=null&&list.size()>0) {
+			model.setCode(1);
+			model.setData(list);
+			model.setMsg("鏌ヨ鎴愬姛!");
+		} else {
+			model.setCode(0);
+			model.setMsg("鏌ヨ澶辫触!");
+		}
+		return model;
+	}
+
+}
diff --git a/gx_tieta/src/com/fgkj/services/Deverror_recordService.java b/gx_tieta/src/com/fgkj/services/Deverror_recordService.java
new file mode 100644
index 0000000..3b03f10
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/services/Deverror_recordService.java
@@ -0,0 +1,46 @@
+package com.fgkj.services;
+
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dto.ServiceModel;
+
+public class Deverror_recordService {
+	private ServiceModel model;
+	private BaseDAO dao;
+	
+	public Deverror_recordService() {
+		super();
+		model=new ServiceModel();
+		dao=BaseDAOFactory.getBaseDAO(BaseDAO.DEVERROR_RECORD);
+		
+	}
+	//鐢ㄦ埛鎵嬪姩娣诲姞闂
+	public ServiceModel add(Object obj){
+		boolean bl=dao.add(obj);
+		if (bl) {
+			model.setCode(1);
+			model.setMsg("娣诲姞鎴愬姛!");
+		} else {
+			model.setCode(0);
+			model.setMsg("娣诲姞澶辫触!");
+		}
+		return model;
+	}
+	//鏍规嵁stationid鏌ヨ璁惧鐨勯棶棰樿褰�
+	public ServiceModel serchByCondition(Object obj){
+		List list=dao.serchByCondition(obj);
+		if (list!=null&&list.size()>0) {
+			model.setCode(1);
+			model.setData(list);
+			model.setMsg("鏌ヨ鎴愬姛!");
+		} else {
+			model.setCode(0);
+			model.setMsg("鏌ヨ澶辫触!");
+		}
+		return model;
+	}
+	
+
+}
diff --git a/gx_tieta/src/com/fgkj/services/StationtrafficService.java b/gx_tieta/src/com/fgkj/services/StationtrafficService.java
new file mode 100644
index 0000000..c30b6c7
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/services/StationtrafficService.java
@@ -0,0 +1,32 @@
+package com.fgkj.services;
+
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dto.ServiceModel;
+
+public class StationtrafficService {
+	private BaseDAO dao;
+	private ServiceModel model;
+	public StationtrafficService() {
+		super();
+		dao=BaseDAOFactory.getBaseDAO(BaseDAO.STATIONTRAFFIC);
+		model=new ServiceModel();
+	}
+	//缁熻鍩虹珯娴侀噺
+	public ServiceModel serchByCondition(Object obj) {
+		List list=dao.serchByCondition(obj);
+		if(list!=null&&list.size()>0){
+			model.setCode(1);
+			model.setData(list);
+			model.setMsg("鏌ヨ鎴愬姛!");
+		}else{
+			model.setCode(0);
+			model.setMsg("鏌ヨ澶辫触!");
+		}
+		return model;
+	}
+	
+
+}

--
Gitblit v1.9.1