Sfoglia il codice sorgente

氢气充装查询导出。

杨秀河 3 anni fa
parent
commit
013f43e7a7
32 ha cambiato i file con 2006 aggiunte e 1701 eliminazioni
  1. 38 34
      .classpath
  2. 3 3
      .settings/org.eclipse.a.wst.html.webresources.core.prefs
  3. 1 0
      .settings/org.eclipse.core.resources.prefs
  4. 8 0
      .settings/org.eclipse.jdt.core.prefs
  5. 7 1
      .settings/org.eclipse.wst.common.component
  6. 2 1
      .settings/org.eclipse.wst.common.project.facet.core.xml
  7. 8 0
      WebRoot/WEB-INF/classes/.gitignore
  8. BIN
      WebRoot/WEB-INF/classes/com/runzhixing/action/FillingDataQueryAction.class
  9. BIN
      WebRoot/WEB-INF/classes/com/runzhixing/action/SpeStationAction.class
  10. BIN
      WebRoot/WEB-INF/classes/com/runzhixing/bean/CHGFillLog.class
  11. 6 2
      WebRoot/WEB-INF/classes/com/runzhixing/config/config.properties
  12. BIN
      WebRoot/WEB-INF/classes/com/runzhixing/filter/MyFilter.class
  13. BIN
      WebRoot/WEB-INF/classes/com/runzhixing/packageProcedure/FillingDataQueryProcedure.class
  14. BIN
      WebRoot/WEB-INF/classes/com/runzhixing/servlet/LoginServlet.class
  15. BIN
      WebRoot/WEB-INF/classes/com/runzhixing/tool/Tool.class
  16. 22 4
      WebRoot/jsp/rzx/bgman.jsp
  17. 23 6
      WebRoot/jsp/rzx/bgman_carauth.jsp
  18. 23 6
      WebRoot/jsp/rzx/bgman_carinput.jsp
  19. 23 3
      WebRoot/jsp/rzx/bgman_carinputauth.jsp
  20. 223 182
      WebRoot/jsp/rzx/dataQuery/HcngFillingdataQuery.jsp
  21. 28 4
      WebRoot/jsp/rzx/fillingbgman.jsp
  22. 12 4
      WebRoot/jsp/rzx/modifybgman.jsp
  23. 12 5
      WebRoot/jsp/rzx/specialuserman.jsp
  24. 12 4
      WebRoot/jsp/rzx/testingbgman.jsp
  25. 371 371
      src/com/runzhixing/action/FillingDataQueryAction.java
  26. 3 4
      src/com/runzhixing/action/SpeStationAction.java
  27. 536 503
      src/com/runzhixing/bean/CHGFillLog.java
  28. 6 2
      src/com/runzhixing/config/config.properties
  29. 12 1
      src/com/runzhixing/filter/MyFilter.java
  30. 555 553
      src/com/runzhixing/packageProcedure/FillingDataQueryProcedure.java
  31. 8 8
      src/com/runzhixing/servlet/LoginServlet.java
  32. 64 0
      src/com/runzhixing/tool/Tool.java

+ 38 - 34
.classpath

@@ -1,61 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="melibrary.com.genuitec.eclipse.j2eedt.core.MYECLIPSE_JAVAEE_5_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-httpclient-3.1.jar" sourcepath="C:/Users/it5/AppData/Local/Temp/.org.sf.feeling.decompiler1644886766389/source/commons-httpclient-3.1-sources.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_172">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="D:/rzx/maven/servlet-api.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/batik-all-1.7.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-beanutils-1.9.4.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-codec-1.15.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-collections-3.2.2.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-fileupload-1.4.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-httpclient-3.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-io-2.6.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-lang-2.4.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-lang3-3.11.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-logging-1.2.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/core-3.4.0.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/core-3.4.0-sources.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ezmorph-1.0.3.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/fastjson-1.2.83.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/freemarker-2.3.28.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/httpclient-4.2.2.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/httpcore-4.2.2.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/itext-asian-5.2.0.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/itextpdf-5.5.6.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/javase-3.4.0.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/javassist-3.20.0-GA.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jcommon-1.0.12.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jfreechart-1.0.8a.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jsf-api.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jsf-impl.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/json-20210307.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/json-lib-2.2.3-jdk15.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jstl-1.2.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/junit.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j-1.2.17.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j-api-2.12.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j-core-2.12.1.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mybatis-3.3.0.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mysql-connector-java-5.1.7-bin.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ognl-3.1.17.jar" sourcepath="C:/Users/it5/AppData/Local/Temp/.org.sf.feeling.decompiler1663570344232/source/ognl-3.1.17-sources.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ojdbc14.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/org.apache.oltu.oauth2.client-1.0.2.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/org.hamcrest.core_1.1.0.v20090501071000.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/struts2-ssl-plugin-1.2.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/pdfbox-2.0.21.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/pdf-transcoder.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/poi-3.8-20120326.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/fastjson-1.2.83.jar" sourcepath="C:/Users/it5/AppData/Local/Temp/.org.sf.feeling.decompiler1653361533799/source/fastjson-1.2.83-sources.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-beanutils-1.9.4.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-collections-3.2.2.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-fileupload-1.4.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-io-2.6.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-lang-2.4.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-lang3-3.11.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-logging-1.2.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/freemarker-2.3.28.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/javassist-3.20.0-GA.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j-api-2.12.1.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ognl-3.1.17.jar" sourcepath="C:/Users/it5/AppData/Local/Temp/.org.sf.feeling.decompiler1652230434839/source/ognl-3.1.17-sources.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-api-2.0.0-alpha1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-log4j12-2.0.0-alpha1.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/struts2-core-2.5.22.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/struts2-json-plugin-2.5.22.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/commons-codec-1.15.jar"/>
-	<classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.generic_5.0">
-		<attributes>
-			<attribute name="owner.project.facets" value="jst.web"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="com.genuitec.runtime.library/com.genuitec.jstl_1.2">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="WEB-INF/lib"/>
-			<attribute name="owner.project.facets" value="jst.web.jstl"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_172">
-		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="D:/rzx/apache-tomcat-8.5.73/lib/servlet-api.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/struts2-ssl-plugin-1.2.1.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/xml-apis-1.3.04.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/xml-apis-ext-1.3.04.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
 </classpath>

+ 3 - 3
.settings/org.eclipse.a.wst.html.webresources.core.prefs

@@ -2,7 +2,7 @@ css-class-unkwown=2
 css-id-unkwown=-1
 eclipse.preferences.version=1
 external-url-unkwown=false
-file-css-unkwown=2
-file-img-unkwown=2
-file-js-unkwown=2
+file-css-unkwown=1
+file-img-unkwown=1
+file-js-unkwown=1
 validation-use-project-settings=true

+ 1 - 0
.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
+encoding//src/com/runzhixing/config/config.properties=UTF-8
 encoding/<project>=UTF-8

+ 8 - 0
.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.7

+ 7 - 1
.settings/org.eclipse.wst.common.component

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+        
     <wb-module deploy-name="CNG">
+                
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+                
         <wb-resource deploy-path="/" source-path="/WebRoot"/>
-        <property name="context-root" value="CNG"/>
+                
         <property name="java-output-path" value="/CNG/build/classes"/>
+        <property name="context-root" value="/"/>
+            
     </wb-module>
+    
 </project-modules>

+ 2 - 1
.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
+  <runtime name="Apache Tomcat v8.5 (原)"/>
   <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="2.5"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>

+ 8 - 0
WebRoot/WEB-INF/classes/.gitignore

@@ -0,0 +1,8 @@
+/META-INF/
+/com/
+/global.properties
+/junit/
+/log4j.properties
+/mess_zh_CN.properties
+/struts-login.xml
+/struts.xml

BIN
WebRoot/WEB-INF/classes/com/runzhixing/action/FillingDataQueryAction.class


BIN
WebRoot/WEB-INF/classes/com/runzhixing/action/SpeStationAction.class


BIN
WebRoot/WEB-INF/classes/com/runzhixing/bean/CHGFillLog.class


+ 6 - 2
WebRoot/WEB-INF/classes/com/runzhixing/config/config.properties

@@ -2,8 +2,7 @@ driver=oracle.jdbc.OracleDriver
 #url=jdbc:oracle:thin:@//61.188.37.164:3355/SCJGQPBQ
 #username=cngdba
 #password=nxBot*5087
-#url=jdbc:oracle:thin:@//192.168.1.8:1521/cng
-url=jdbc:oracle:thin:@//110.185.196.36:11521/cng
+url=jdbc:oracle:thin:@//192.168.1.8:1521/cng
 username=cngdba
 password=temp1234
 whitelist=localhost;127.0.0.1;218.95.174.32;nx.cngrfid.com;111.51.123.243;192.168.1.110;110.185.196.36;110.185.230.12;110.185.229.196;61.188.37.164;192.168.1.1;
@@ -29,3 +28,8 @@ statistics_path=D://statistics
 secret_key=nxycxzywt
 nx_user=ningxia
 nx_pwd=nx123456
+
+#默认false,不显示
+chg_start=true
+#默认true显示
+place_start=true

BIN
WebRoot/WEB-INF/classes/com/runzhixing/filter/MyFilter.class


BIN
WebRoot/WEB-INF/classes/com/runzhixing/packageProcedure/FillingDataQueryProcedure.class


BIN
WebRoot/WEB-INF/classes/com/runzhixing/servlet/LoginServlet.class


BIN
WebRoot/WEB-INF/classes/com/runzhixing/tool/Tool.class


+ 22 - 4
WebRoot/jsp/rzx/bgman.jsp

@@ -112,7 +112,6 @@
     <script type="text/javascript">
     var info_publish = '<%=MyFilter.info_publish %>';
 	$(document).ready(function(){
-		
 			
 			var newAnnTitle = document.getElementById("newAnnTitle").value;
 			var newAnnID = document.getElementById("newAnnID").value;
@@ -246,12 +245,14 @@
 								"icon": "icon-search",
 								"url": "jsp/rzx/dataQuery/FillingdataQuery.jsp"
 							},
+							<% if(MyFilter.chgStart){ %>
 							{
 								"menuid": "185",
 								"menuname": "氢气充装查询",
 								"icon": "icon-search",
 								"url": "jsp/rzx/dataQuery/HcngFillingdataQuery.jsp"
 							},
+							<% } %>
 							{
 								"menuid": "195",
 								"menuname": "检验数据查询",
@@ -483,6 +484,14 @@
 								"icon": "icon-search",
 								"url": "jsp/rzx/dataQuery/FillingdataQuery.jsp"
 							},
+							<% if(MyFilter.chgStart){ %>
+							{
+								"menuid": "185",
+								"menuname": "氢气充装查询",
+								"icon": "icon-search",
+								"url": "jsp/rzx/dataQuery/HcngFillingdataQuery.jsp"
+							},
+							<% } %>
 							{
 								"menuid": "195",
 								"menuname": "检验数据查询",
@@ -802,7 +811,11 @@
         background: url(images/rzx/layout-browser-hd-bg12.gif) #817865 repeat-x center 50%;
         line-height: 20px;color: #fff; font-family: Verdana, 微软雅黑,黑体">
         <span style="float:right; padding-right:20px;" class="head">欢迎您 <%=username%>  <a href="#" id="editpass">修改密码</a> <a href="javaScript:void(0);" onclick="sExit();return false;">安全退出</a></span>
-        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place1%></span>
+        <% if(MyFilter.placeStart){ %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place1%></span>
+        <% }else { %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %></span>
+        <% }%>
         <span style="padding-left:100px; font-size: 12px; ">
         	<marquee scrollAmount=2 width="780px">
 				<span style="font-size: 12px;">
@@ -824,8 +837,13 @@
     <div id="mainPanle" region="center" style="background: #eee; overflow-y:hidden;" >
         <div id="tabs" class="easyui-tabs"  fit="true" border="false"  >
 			<div title="欢迎使用" style="padding:20px;overflow:hidden; color:#f08300; " >
-				
-<center><h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place1%></h1></center>
+				<center>
+					<% if(MyFilter.placeStart){ %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place1%></h1>
+			        <% }else { %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %></h1>
+			        <% }%>
+				</center>
 			</div>
 			
 		</div>

+ 23 - 6
WebRoot/jsp/rzx/bgman_carauth.jsp

@@ -108,7 +108,7 @@
     <script type="text/javascript">
     var info_publish = '<%=MyFilter.info_publish %>';
 	$(document).ready(function(){
-		
+			console.log('<%=s %>');
 			
 			var newAnnTitle = document.getElementById("newAnnTitle").value;
 			var newAnnID = document.getElementById("newAnnID").value;
@@ -244,12 +244,14 @@
 							"icon": "icon-search",
 							"url": "jsp/rzx/dataQuery/FillingdataQuery.jsp"
 						},
+						<% if(MyFilter.chgStart){ %>
 						{
 							"menuid": "185",
 							"menuname": "氢气充装查询",
 							"icon": "icon-search",
 							"url": "jsp/rzx/dataQuery/HcngFillingdataQuery.jsp"
 						},
+						<% } %>
 						{
 							"menuid": "195",
 							"menuname": "检验数据查询",
@@ -475,6 +477,14 @@
 							"icon": "icon-search",
 							"url": "jsp/rzx/dataQuery/FillingdataQuery.jsp"
 						},
+						<% if(MyFilter.chgStart){ %>
+						{
+							"menuid": "185",
+							"menuname": "氢气充装查询",
+							"icon": "icon-search",
+							"url": "jsp/rzx/dataQuery/HcngFillingdataQuery.jsp"
+						},
+						<% } %>
 						{
 							"menuid": "195",
 							"menuname": "检验数据查询",
@@ -807,7 +817,11 @@
         background: url(images/rzx/layout-browser-hd-bg12.gif) #817865 repeat-x center 50%;
         line-height: 20px;color: #fff; font-family: Verdana, 微软雅黑,黑体">
         <span style="float:right; padding-right:20px;" class="head">欢迎您 <%=username%>  <a href="#" id="editpass">修改密码</a> <a href="javaScript:void(0);" onclick="sExit();return false;">安全退出</a></span>
-        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place1%></span>
+       	<% if(MyFilter.placeStart){ %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place1%></span>
+        <% }else { %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %></span>
+        <% }%>
         <span style="padding-left:100px; font-size: 12px; ">
         	<marquee scrollAmount=2 width="780px">
 				<span style="font-size: 12px;">
@@ -829,12 +843,15 @@
     <div id="mainPanle" region="center" style="background: #eee; overflow-y:hidden;" >
         <div id="tabs" class="easyui-tabs"  fit="true" border="false"  >
 			<div title="欢迎使用" style="padding:20px;overflow:hidden; color:#f08300; " >
-				
-<center><h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place1%></h1></center>
+				<center>
+					<% if(MyFilter.placeStart){ %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place1%></h1>
+			        <% }else { %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %></h1>
+			        <% }%>
+				</center>
 			</div>
-			
 		</div>
-		
     </div>
     
     

+ 23 - 6
WebRoot/jsp/rzx/bgman_carinput.jsp

@@ -108,7 +108,7 @@
     <script type="text/javascript">
     var info_publish = '<%=MyFilter.info_publish %>';
 	$(document).ready(function(){
-		
+			console.log('<%=s %>');
 			
 			var newAnnTitle = document.getElementById("newAnnTitle").value;
 			var newAnnID = document.getElementById("newAnnID").value;
@@ -243,12 +243,14 @@
 							"icon": "icon-search",
 							"url": "jsp/rzx/dataQuery/FillingdataQuery.jsp"
 						},
+						<% if(MyFilter.chgStart){ %>
 						{
 							"menuid": "185",
 							"menuname": "氢气充装查询",
 							"icon": "icon-search",
 							"url": "jsp/rzx/dataQuery/HcngFillingdataQuery.jsp"
 						},
+						<% } %>
 						{
 							"menuid": "195",
 							"menuname": "检验数据查询",
@@ -474,6 +476,14 @@
 							"icon": "icon-search",
 							"url": "jsp/rzx/dataQuery/FillingdataQuery.jsp"
 						},
+						<% if(MyFilter.chgStart){ %>
+						{
+							"menuid": "185",
+							"menuname": "氢气充装查询",
+							"icon": "icon-search",
+							"url": "jsp/rzx/dataQuery/HcngFillingdataQuery.jsp"
+						},
+						<% } %>
 						{
 							"menuid": "195",
 							"menuname": "检验数据查询",
@@ -803,7 +813,11 @@
         background: url(images/rzx/layout-browser-hd-bg12.gif) #817865 repeat-x center 50%;
         line-height: 20px;color: #fff; font-family: Verdana, 微软雅黑,黑体">
         <span style="float:right; padding-right:20px;" class="head">欢迎您 <%=username%>  <a href="#" id="editpass">修改密码</a> <a href="javaScript:void(0);" onclick="sExit();return false;">安全退出</a></span>
-        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place1%></span>
+        <% if(MyFilter.placeStart){ %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place1%></span>
+        <% }else { %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %></span>
+        <% }%>
         <span style="padding-left:100px; font-size: 12px; ">
         	<marquee scrollAmount=2 width="780px">
 				<span style="font-size: 12px;">
@@ -825,12 +839,15 @@
     <div id="mainPanle" region="center" style="background: #eee; overflow-y:hidden;" >
         <div id="tabs" class="easyui-tabs"  fit="true" border="false"  >
 			<div title="欢迎使用" style="padding:20px;overflow:hidden; color:#f08300; " >
-				
-<center><h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place1%></h1></center>
+				<center>
+					<% if(MyFilter.placeStart){ %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place1%></h1>
+			        <% }else { %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %></h1>
+			        <% }%>
+				</center>
 			</div>
-			
 		</div>
-		
     </div>
     
     

+ 23 - 3
WebRoot/jsp/rzx/bgman_carinputauth.jsp

@@ -243,12 +243,14 @@
 							"icon": "icon-search",
 							"url": "jsp/rzx/dataQuery/FillingdataQuery.jsp"
 						},
+						<% if(MyFilter.chgStart){ %>
 						{
 							"menuid": "185",
 							"menuname": "氢气充装查询",
 							"icon": "icon-search",
 							"url": "jsp/rzx/dataQuery/HcngFillingdataQuery.jsp"
 						},
+						<% } %>
 						{
 							"menuid": "195",
 							"menuname": "检验数据查询",
@@ -479,6 +481,14 @@
 							"icon": "icon-search",
 							"url": "jsp/rzx/dataQuery/FillingdataQuery.jsp"
 						},
+						<% if(MyFilter.chgStart){ %>
+						{
+							"menuid": "185",
+							"menuname": "氢气充装查询",
+							"icon": "icon-search",
+							"url": "jsp/rzx/dataQuery/HcngFillingdataQuery.jsp"
+						},
+						<% } %>
 						{
 							"menuid": "195",
 							"menuname": "检验数据查询",
@@ -814,7 +824,12 @@
         background: url(images/rzx/layout-browser-hd-bg12.gif) #817865 repeat-x center 50%;
         line-height: 20px;color: #fff; font-family: Verdana, 微软雅黑,黑体">
         <span style="float:right; padding-right:20px;" class="head">欢迎您 <%=username%>  <a href="#" id="editpass">修改密码</a> <a href="javaScript:void(0);" onclick="sExit();return false;">安全退出</a></span>
-        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place1%></span>
+        <% if(MyFilter.placeStart){ %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place1%></span>
+        <% }else { %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %></span>
+        <% }%>
+        
         <span style="padding-left:100px; font-size: 12px; ">
         	<marquee scrollAmount=2 width="780px">
 				<span style="font-size: 12px;">
@@ -836,8 +851,13 @@
     <div id="mainPanle" region="center" style="background: #eee; overflow-y:hidden;" >
         <div id="tabs" class="easyui-tabs"  fit="true" border="false"  >
 			<div title="欢迎使用" style="padding:20px;overflow:hidden; color:#f08300; " >
-				
-<center><h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place1%></h1></center>
+				<center>
+					<% if(MyFilter.placeStart){ %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place1%></h1>
+			        <% }else { %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %></h1>
+			        <% }%>
+				</center>
 			</div>
 			
 		</div>

+ 223 - 182
WebRoot/jsp/rzx/dataQuery/HcngFillingdataQuery.jsp

@@ -92,15 +92,10 @@ String ssid = (String) session.getAttribute(Constant.Privilege);
 		var totalpage;//总页数
 		$(document).ready(function(){
 			pageSize = $('#pageSize').val();
-			
 			selectCountry();
 			selectstation();
 			fLoadTable();
-			
-			
-			$('#btnadd').linkbutton('disable');
-			$('#btnadd1').linkbutton('disable');
-			//fLoadData(i,pageSize);
+			fLoadData(i,pageSize);
 			
 		});
 		
@@ -113,8 +108,8 @@ String ssid = (String) session.getAttribute(Constant.Privilege);
 	            });  
 	        }
 		function fLoadTable(){
-				grid=$('#tt').datagrid({
-				  fit: true,//自动大小   
+			grid=$('#tt').datagrid({
+				    fit: true,//自动大小   
 					title: '',
 					width: '100%',
 					height: 580,
@@ -129,86 +124,127 @@ String ssid = (String) session.getAttribute(Constant.Privilege);
 	            	fitColumns:true,//允许表格自动缩放,以适应父容器
 	            	rownumbers:true,
 	            	pagination:true,//分页控件
-	            	
+	            	pageList: [10,20,30,100,200,400,500,1000,5000],//可以设置每页记录条数的列表 
 					columns:[[
-						{field:'guid',align:'left',title:'UID',width:'160px',rowspan:'2'},
-						{field:'stationNo',align:'left',title:'站编号',width:'160px',rowspan:'2'},
-						{field:'stationName',align:'left',title:'站名称',width:'160px',rowspan:'2'},
-						{field:'carNo',align:'left',title:'车牌号',width:'120px',rowspan:'2'},
-						{field:'plateType',align:'left',title:'车牌类型',width:'120px',rowspan:'2'},
-						{field:'plateColor',align:'left',title:'车牌颜色',width:'120px',rowspan:'2'},
-						{field:'medium',align:'left',title:'充装介质',width:'120px',rowspan:'2'},
-						{field:'regNo',align:'left',title:'使用登记证号',width:'120px',rowspan:'2'},
-						{field:'regDate',align:'left',title:'发证时间',width:'120px',rowspan:'2'},
-						{field:'regValidity',align:'left',title:'证件有效期',width:'120px',rowspan:'2'},
-						{field:'regUnit',align:'left',title:'发证单位',width:'120px',rowspan:'2'},
-						{field:'cylinderType',align:'left',title:'气瓶类型',width:'120px',rowspan:'2'},
-						{field:'cylinderNo',align:'left',title:'气瓶出厂编号',width:'120px',rowspan:'2'},
-						{field:'productName',align:'left',title:'生产厂家',width:'120px',rowspan:'2'},
-						{field:'productDate',align:'left',title:'生产日期',width:'120px',rowspan:'2'},
-						{field:'startuseDate',align:'left',title:'投用日期',width:'120px',rowspan:'2'},
-						{field:'yearLimit',align:'left',title:'使用年限',width:'120px',rowspan:'2'},
-						{field:'productLicence',align:'left',title:'生产许可',width:'120px',rowspan:'2'},
-						{field:'productType',align:'left',title:'气瓶产品型号',width:'120px',rowspan:'2'},
-						{field:'weight',align:'left',title:'重量',width:'120px',rowspan:'2'},
-						{field:'vol',align:'left',title:'容积',width:'120px',rowspan:'2'},
-						{field:'thickness',align:'left',title:'壁厚',width:'120px',rowspan:'2'},
-						{field:'press',align:'left',title:'压力',width:'120px',rowspan:'2'},
-						{field:'material',align:'left',title:'材质',width:'120px',rowspan:'2'},
-						{field:'installStation',align:'left',title:'安装单位',width:'120px',rowspan:'2'},
-						{field:'installCert',align:'left',title:'安装合格证',width:'120px',rowspan:'2'},
-						{field:'installDate',align:'left',title:'安装时间',width:'120px',rowspan:'2'},
-						{field:'monitorStation',align:'left',title:'监检单位',width:'120px',rowspan:'2'},
-						{field:'monitorCert',align:'left',title:'监检合格证',width:'120px',rowspan:'2'},
-						{field:'monitorDate',align:'left',title:'监检时间',width:'120px',rowspan:'2'},
-						{field:'checkStation',align:'left',title:'检验单位',width:'120px',rowspan:'2'},
-						{field:'checkCert',align:'left',title:'检验合格证',width:'120px',rowspan:'2'},
-						{field:'checkDate',align:'left',title:'检验时间',width:'120px',rowspan:'2'},
-						{field:'nextCheckDate',align:'left',title:'下次检验时间',width:'120px',rowspan:'2'},
-						{field:'beforeChecker',align:'left',title:'充装检查人员',width:'120px',rowspan:'2'},
-						{field:'beforeTime',align:'left',title:'充半检查时间',width:'120px',rowspan:'2'},
-						{field:'beforeItems',align:'left',title:'充装前检查项目',width:'120px',rowspan:'2'},
-						{field:'beforeResult',align:'left',title:'充前检查结果',width:'120px',rowspan:'2'},
-						{field:'beforeException',align:'left',title:'充前检查异常项目',width:'120px',rowspan:'2'},
-						{field:'carRemark',align:'left',title:'车辆其它信息',width:'120px',rowspan:'2'},
-						{field:'cylinderRemark',align:'left',title:'气瓶其它信息',width:'120px',rowspan:'2'},
-						{field:'beforeVerifier',align:'left',title:'充前审核人员',width:'120px',rowspan:'2'},
-						{field:'operatorName',align:'left',title:'操作人员姓名',width:'120px',rowspan:'2'},
-						{field:'operatorId',align:'left',title:'操作人员身份证号',width:'120px',rowspan:'2'},
-						{field:'operatorNo',align:'left',title:'操作人员编号',width:'120px',rowspan:'2'},
-						{field:'operatorType',align:'left',title:'操作人员类型',width:'120px',rowspan:'2'},
-						{field:'operatorDoc',align:'left',title:'操作人员档案号',width:'120px',rowspan:'2'},
-						{field:'operatorCert',align:'left',title:'操作人员班证书',width:'120px',rowspan:'2'},
-						{field:'operatorLicDate',align:'left',title:'发证时间',width:'120px',rowspan:'2'},
-						{field:'operatorLicValidity',align:'left',title:'证书有效期',width:'120px',rowspan:'2'},
-						{field:'machineFactory',align:'left',title:'充装设备厂家',width:'120px',rowspan:'2'},
-						{field:'machineNo',align:'left',title:'充装设备编号',width:'120px',rowspan:'2'},
-						{field:'machineName',align:'left',title:'充装设备名称',width:'120px',rowspan:'2'},
-						{field:'gunNo',align:'left',title:'充装枪号',width:'120px',rowspan:'2'},
-						{field:'fillStartTime',align:'left',title:'充装时间',width:'120px',rowspan:'2'},
-						{field:'FillBeforePress',align:'left',title:'充前压力',width:'120px',rowspan:'2'},
-						{field:'fillEndTime',align:'left',title:'充装结束时间',width:'120px',rowspan:'2'},
-						{field:'FillEndPress',align:'left',title:'充装结束压力',width:'120px',rowspan:'2'},
-						{field:'FillUnit',align:'left',title:'充装量单位',width:'120px',rowspan:'2'},
-						{field:'FillNum',align:'left',title:'充装量',width:'120px',rowspan:'2'},
-						{field:'FillDensity',align:'left',title:'充装密度',width:'120px',rowspan:'2'},
-						{field:'money',align:'left',title:'金额',width:'120px',rowspan:'2'},
-						{field:'afterChecker',align:'left',title:'充后检查人员',width:'120px',rowspan:'2'},
-						{field:'afterTime',align:'left',title:'充后检查时间',width:'120px',rowspan:'2'},
-						{field:'afterTimes',align:'left',title:'充后检查项目',width:'120px',rowspan:'2'},
-						{field:'afterResult',align:'left',title:'充后结果',width:'120px',rowspan:'2'},
-						{field:'afterException',align:'left',title:'充后检查异常项目',width:'120px',rowspan:'2'},
-						{field:'afterVerifier',align:'left',title:'充后审核人员',width:'120px',rowspan:'2'},
-						{field:'remark',align:'left',title:'备注',width:'120px',rowspan:'2'}
-						
+						{field:'guid',align:'left',title:'UID',width:'160px'},
+						{field:'stationNo',align:'left',title:'站编号',width:'160px'},
+						{field:'stationName',align:'left',title:'站名称',width:'160px'},
+						{field:'carNo',align:'left',title:'车牌号',width:'120px'},
+						{field:'plateTypeName',align:'left',title:'车牌类型',width:'120px'},
+						{field:'plateColorName',align:'left',title:'车牌颜色',width:'120px'},
+						{field:'medium',align:'left',title:'充装介质',width:'120px'},
+						{field:'regNo',align:'left',title:'使用登记证号',width:'120px'},
+						{field:'regDate',align:'left',title:'发证时间',width:'120px'},
+						{field:'regValidity',align:'left',title:'证件有效期',width:'120px'},
+						{field:'regUnit',align:'left',title:'发证单位',width:'120px'},
+						{field:'cylinderTypeName',align:'left',title:'气瓶类型',width:'120px'},
+						{field:'cylinderNo',align:'left',title:'气瓶出厂编号',width:'120px'},
+						{field:'productName',align:'left',title:'生产厂家',width:'120px'},
+						{field:'productDate',align:'left',title:'生产日期',width:'120px'},
+						{field:'startuseDate',align:'left',title:'投用日期',width:'120px'},
+						{field:'yearLimit',align:'left',title:'使用年限',width:'120px'},
+						{field:'productLicence',align:'left',title:'生产许可',width:'120px'},
+						{field:'productType',align:'left',title:'气瓶产品型号',width:'120px'},
+						{field:'weight',align:'left',title:'重量',width:'120px',formatter: function(value, row, index){
+							if (value) {
+								return parseFloat(value).toFixed(2);	
+							}
+							return "";		
+						}},
+						{field:'vol',align:'left',title:'容积',width:'120px',formatter: function(value, row, index){
+							if (value) {
+								return parseFloat(value).toFixed(2);	
+							}
+							return "";		
+						}},
+						{field:'thickness',align:'left',title:'壁厚',width:'120px',formatter: function(value, row, index){
+							if (value) {
+								return parseFloat(value).toFixed(2);	
+							}
+							return "";	
+						}},
+						{field:'press',align:'left',title:'压力',width:'120px',formatter: function(value, row, index){
+							if (value) {
+								return parseFloat(value).toFixed(2);	
+							}
+							return "";	
+						}},
+						{field:'material',align:'left',title:'材质',width:'120px'},
+						{field:'installStation',align:'left',title:'安装单位',width:'120px'},
+						{field:'installCert',align:'left',title:'安装合格证',width:'120px'},
+						{field:'installDate',align:'left',title:'安装时间',width:'120px'},
+						{field:'monitorStation',align:'left',title:'监检单位',width:'120px'},
+						{field:'monitorCert',align:'left',title:'监检合格证',width:'120px'},
+						{field:'monitorDate',align:'left',title:'监检时间',width:'120px'},
+						{field:'checkStation',align:'left',title:'检验单位',width:'120px'},
+						{field:'checkCert',align:'left',title:'检验合格证',width:'120px'},
+						{field:'checkDate',align:'left',title:'检验时间',width:'120px'},
+						{field:'nextCheckDate',align:'left',title:'下次检验时间',width:'120px'},
+						{field:'beforeChecker',align:'left',title:'充装检查人员',width:'120px'},
+						{field:'beforeTime',align:'left',title:'充半检查时间',width:'120px'},
+						{field:'beforeItems',align:'left',title:'充装前检查项目',width:'120px'},
+						{field:'beforeResult',align:'left',title:'充前检查结果',width:'120px',formatter: function(value, row, index){
+							if (value == 0) {
+								return "正常";
+							}else if(value == 1){
+								return "异常";	
+							}
+							return "";	
+						}},
+						{field:'beforeException',align:'left',title:'充前检查异常项目',width:'120px'},
+						{field:'carRemark',align:'left',title:'车辆其它信息',width:'120px'},
+						{field:'cylinderRemark',align:'left',title:'气瓶其它信息',width:'120px'},
+						{field:'beforeVerifier',align:'left',title:'充前审核人员',width:'120px'},
+						{field:'operatorName',align:'left',title:'操作人员姓名',width:'120px'},
+						{field:'operatorId',align:'left',title:'操作人员身份证号',width:'120px'},
+						{field:'operatorNo',align:'left',title:'操作人员编号',width:'120px'},
+						{field:'operatorType',align:'left',title:'操作人员类型',width:'120px'},
+						{field:'operatorDoc',align:'left',title:'操作人员档案号',width:'120px'},
+						{field:'operatorCert',align:'left',title:'操作人员班证书',width:'120px'},
+						{field:'operatorLicDate',align:'left',title:'发证时间',width:'120px'},
+						{field:'operatorLicValidity',align:'left',title:'证书有效期',width:'120px'},
+						{field:'machineFactory',align:'left',title:'充装设备厂家',width:'120px'},
+						{field:'machineNo',align:'left',title:'充装设备编号',width:'120px'},
+						{field:'machineName',align:'left',title:'充装设备名称',width:'120px'},
+						{field:'gunNo',align:'left',title:'充装枪号',width:'120px'},
+						{field:'fillStartTime',align:'left',title:'充装时间',width:'120px'},
+						{field:'fillBeforePress',align:'left',title:'充前压力',width:'120px'},
+						{field:'fillEndTime',align:'left',title:'充装结束时间',width:'120px'},
+						{field:'fillEndPress',align:'left',title:'充装结束压力',width:'120px'},
+						{field:'fillUnit',align:'left',title:'充装量单位',width:'120px',formatter: function(value, row, index){
+							if (value == 1) {
+								return "KG";
+							}else if(value == 2){
+								return "L";	
+							}else if(value == 3){
+								return "M³";	
+							}
+							return "";	
+						}},
+						{field:'fillNum',align:'left',title:'充装量',width:'120px'},
+						{field:'fillDensity',align:'left',title:'充装密度',width:'120px'},
+						{field:'money',align:'left',title:'金额',width:'120px',formatter: function(value, row, index){
+							if (value) {
+								return parseFloat(value).toFixed(2);	
+							}
+							return "";	
+						}},
+						{field:'afterChecker',align:'left',title:'充后检查人员',width:'120px'},
+						{field:'afterTime',align:'left',title:'充后检查时间',width:'120px'},
+						{field:'afterTimes',align:'left',title:'充后检查项目',width:'120px'},
+						{field:'afterResult',align:'left',title:'充后结果',width:'120px',formatter: function(value, row, index){
+							if (value == 0) {
+								return "正常";
+							}else if(value == 1){
+								return "异常";	
+							}
+							return "";	
+						}},
+						{field:'afterException',align:'left',title:'充后检查异常项目',width:'120px'},
+						{field:'afterVerifier',align:'left',title:'充后审核人员',width:'120px'},
+						{field:'remark',align:'left',title:'备注',width:'120px'}
 					]]
 				});	
-				if(ssid.substring(0, 2)!="51"){
-					$('#tt').datagrid('hideColumn','lowPress');
-					$('#tt').datagrid('hideColumn','highPress');
-					$('#tt').datagrid('hideColumn','flux');
-					$('#tt').datagrid('hideColumn','money');
-				}
 		}
 		
 		
@@ -227,7 +263,7 @@ String ssid = (String) session.getAttribute(Constant.Privilege);
 			type:"POST",
 			contentType: "application/x-www-form-urlencoded; charset=UTF-8",
 			data:$('#fillingform').serialize(),
-			url:"ajax/fillingDataQuery?page="+page+"&psize="+rows,
+			url:"ajax/chgFillingDataQuery?page="+page+"&psize="+rows,
 			success:function (data){
 					$.messager.progress('close'); 
 					var vData = $.parseJSON(data);
@@ -239,7 +275,7 @@ String ssid = (String) session.getAttribute(Constant.Privilege);
 					$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
 					var p = $('#tt').datagrid('getPager'); 
 					$(p).pagination({ 
-				        pageList: [10,20,30,100,200,400],//可以设置每页记录条数的列表 
+				        pageList: [10,20,30,100,200,400,500,1000,5000],//可以设置每页记录条数的列表 
 				        beforePageText: '第',//页数文本框前显示的汉字 
 				        afterPageText: '页    共 {pages} 页', 
 				        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
@@ -258,18 +294,18 @@ String ssid = (String) session.getAttribute(Constant.Privilege);
 			select.options.remove(i);
 		}
 		$.ajax({
-				type:"POST",
-				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-				url:"ajax/hiddenCity?cityId="+id,
-				success:function (data){
-					var obj=eval("(" + data + ")");
-					if(obj.rows.length==1){
+			type:"POST",
+			contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+			url:"ajax/hiddenCity?cityId="+id,
+			success:function (data){
+				var obj=eval("(" + data + ")");
+				if(obj.rows.length==1){
 					select.options.add(new Option("请选择县", ""));
-					}
-					$.each(obj.rows, function(i,item){      
-						select.options.add(new Option(item.name, item.id));
- 						});
 				}
+				$.each(obj.rows, function(i,item){      
+					select.options.add(new Option(item.name, item.id));
+					});
+			}
 		});
 	}
 		
@@ -290,22 +326,19 @@ String ssid = (String) session.getAttribute(Constant.Privilege);
 			select.options.remove(i);
 		}
 		$.ajax({
-				type:"POST",
-				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-				data:$('#fillingform').serialize(),
-				//url:"ajax/hiddenCNGStation?cityId="+id,
-				url:"ajax/hiddenspeStation2?type=7",
-				success:function (data){
-					var obj=eval("(" + data + ")");
-					select.options.add(new Option("全部", ""));
-					$.each(obj.rows, function(i,item){  
-					     
-						select.options.add(new Option(item.name, item.id));
- 						});
-					      
-						
-				}
-			});
+			type:"POST",
+			contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+			data:$('#fillingform').serialize(),
+			//url:"ajax/hiddenCNGStation?cityId="+id,
+			url:"ajax/hiddenspeStation2?type=7",
+			success:function (data){
+				var obj=eval("(" + data + ")");
+				select.options.add(new Option("全部", ""));
+				$.each(obj.rows, function(i,item){  
+					select.options.add(new Option(item.name, item.id));
+					});
+			}
+		});
 	}
 	
 	
@@ -315,7 +348,6 @@ String ssid = (String) session.getAttribute(Constant.Privilege);
 		//changeSize();
 	}
 	
-	
 	function exptSingle(){
 		if(!grid){
 			alert("数据为空");
@@ -330,78 +362,86 @@ String ssid = (String) session.getAttribute(Constant.Privilege);
 	}
 	
 	function fLoadDataAll(page,rows){
-				var startTime1 = $('#startTime').datebox('getValue');
-				var endTime1 = $('#endTime').datebox('getValue');
-				document.getElementById("pageNumber").innerText = i;
-				document.getElementById("from").innerText = (page-1)*rows;
-				document.getElementById("to").innerText = page*rows;
-			    $.messager.progress({ 
-			        title: '请等待', 
-			        msg: '正在加载数据...', 
-			        text: '查询中.......' 
-			    }); 
-				$.ajax({
-					type:"POST",
-					contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-					data:$('#fillingform').serialize(),
-					url:"ajax/fillingDataQuery?page="+page+"&psize="+rows,
-					success:function (data){
-							$.messager.progress('close'); 
-							var vData = $.parseJSON(data);
-							sum = vData.total;
-							
-							if(sum==0){
-								show("没有查询到相关信息!!!");
-							}
-							totalpage = Math.ceil(sum/rows);
-							document.getElementById("total").innerText = sum;
-							document.getElementById("totalpage").innerText = totalpage;
-							var vData = $.parseJSON(data);
-							$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
-							var p = $('#tt').datagrid('getPager'); 
-							$(p).pagination({ 
-						        pageList: [10,20,30,100,200,400],//可以设置每页记录条数的列表 
-						        beforePageText: '第',//页数文本框前显示的汉字 
-						        afterPageText: '页    共 {pages} 页', 
-						        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
-								onSelectPage: function (pageNumber, pageSize) { 
-					                fLoadData(pageNumber, pageSize); 
-           						 } 
-							});
-							
-							if(!grid){
-								alert("数据为空");
-								return false;
-							}else{
-								expt(grid);
-							}
+			var startTime1 = $('#startTime').datebox('getValue');
+			var endTime1 = $('#endTime').datebox('getValue');
+			document.getElementById("pageNumber").innerText = i;
+			document.getElementById("from").innerText = (page-1)*rows;
+			document.getElementById("to").innerText = page*rows;
+		    $.messager.progress({ 
+		        title: '请等待', 
+		        msg: '正在加载数据...', 
+		        text: '查询中.......' 
+		    }); 
+			$.ajax({
+				type:"POST",
+				contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+				data:$('#fillingform').serialize(),
+				url:"ajax/chgFillingDataQuery?page="+page+"&psize="+rows,
+				success:function (data){
+						$.messager.progress('close'); 
+						var vData = $.parseJSON(data);
+						sum = vData.total;
+						if(sum==0){
+							show("没有查询到相关信息!!!");
 						}
-				});
-	
-			
+						totalpage = Math.ceil(sum/rows);
+						document.getElementById("total").innerText = sum;
+						document.getElementById("totalpage").innerText = totalpage;
+						var vData = $.parseJSON(data);
+						$('#tt').datagrid('loadData', vData); //将数据绑定到datagrid   
+						var p = $('#tt').datagrid('getPager'); 
+						$(p).pagination({ 
+					        pageList: [10,20,30,100,200,400,500,1000,5000],//可以设置每页记录条数的列表 
+					        beforePageText: '第',//页数文本框前显示的汉字 
+					        afterPageText: '页    共 {pages} 页', 
+					        displayMsg: '当前显示 {from} - {to} 条记录   共 {total} 条记录', 
+							onSelectPage: function (pageNumber, pageSize) { 
+				                fLoadData(pageNumber, pageSize); 
+          						 } 
+						});
+						
+						if(!grid){
+							alert("数据为空");
+							return false;
+						}else{
+							expt(grid);
+						}
+					}
+			});
 		}
 		
 
-
-//判断字符是否为空的方法
-function isEmpty(obj){
-    if(typeof obj == "undefined" || obj == null || obj == ""){
-        return true;
-    }else{
-        return false;
-    }
-}
-
-//比较两个时间大小
-function compareDate(date1,date2){
-    var oDate1 = new Date(date1);
-    var oDate2 = new Date(date2);
-    if(oDate1.getTime() > oDate2.getTime()){
-        return true; //第一个大
-    } else {
-        return false; //第二个大
-    }
-}
+		function selectpage(){
+			var selectpage = $('#selectpage').val();
+			if(selectpage>=1&&selectpage<=totalpage){
+				i = selectpage;
+				$("#selectpage").val("");
+				pageSize = $('#pageSize').val();
+				fLoadData(i,pageSize);
+			}else{
+				$("#selectpage").val("");
+				return false;
+			}
+		}
+		//判断字符是否为空的方法
+		function isEmpty(obj){
+		    if(typeof obj == "undefined" || obj == null || obj == ""){
+		        return true;
+		    }else{
+		        return false;
+		    }
+		}
+		
+		//比较两个时间大小
+		function compareDate(date1,date2){
+		    var oDate1 = new Date(date1);
+		    var oDate2 = new Date(date2);
+		    if(oDate1.getTime() > oDate2.getTime()){
+		        return true; //第一个大
+		    } else {
+		        return false; //第二个大
+		    }
+		}
 	</script>
 	
   </head>
@@ -491,5 +531,6 @@ function compareDate(date1,date2){
 			</table>
 		</form>	
 	</div>
+	<div id="dialog2"></div> 
   </body>
 </html>

+ 28 - 4
WebRoot/jsp/rzx/fillingbgman.jsp

@@ -152,6 +152,14 @@ User uu = (User)session.getAttribute(Constant.userMark);
 								"icon": "icon-search",
 								"url": "jsp/rzx/dataQuery/FillingdataQueryfilling.jsp"
 							},
+							<% if(MyFilter.chgStart){ %>
+							{
+								"menuid": "145",
+								"menuname": "氢气充装查询",
+								"icon": "icon-search",
+								"url": "jsp/rzx/dataQuery/HcngFillingdataQuery.jsp"
+							},
+							<% } %>
 							{
 								"menuid": "155",
 								"menuname": "考勤数据查询",
@@ -399,6 +407,14 @@ User uu = (User)session.getAttribute(Constant.userMark);
 								"icon": "icon-search",
 								"url": "jsp/rzx/dataQuery/FillingdataQueryfilling.jsp"
 							},
+							<% if(MyFilter.chgStart){ %>
+							{
+								"menuid": "145",
+								"menuname": "氢气充装查询",
+								"icon": "icon-search",
+								"url": "jsp/rzx/dataQuery/HcngFillingdataQuery.jsp"
+							},
+							<% } %>
 							{
 								"menuid": "155",
 								"menuname": "考勤数据查询",
@@ -841,7 +857,11 @@ User uu = (User)session.getAttribute(Constant.userMark);
         background: url(images/rzx/layout-browser-hd-bg12.gif) #817865 repeat-x center 50%;
         line-height: 20px;color: #fff; font-family: Verdana, 微软雅黑,黑体">
         <span style="float:right; padding-right:20px;" class="head">欢迎您 <%=username %>  <a href="#" id="editpass">修改密码</a> <a href="javaScript:void(0);" onclick="sExit();return false;">安全退出</a></span>
-        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place %>  充装站管理</span>
+        <% if(MyFilter.placeStart){ %>
+	        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place %>  充装站管理</span>
+        <% }else { %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-充装站管理</span>
+        <% }%>
         <span style="padding-left:100px; font-size: 12px; ">
         	<marquee scrollAmount=2 width="780px">
 				<span style="font-size: 12px;">
@@ -863,11 +883,15 @@ User uu = (User)session.getAttribute(Constant.userMark);
     <div id="mainPanle" region="center" style="background: #eee; overflow-y:hidden">
         <div id="tabs" class="easyui-tabs"  fit="true" border="false" >
 			<div title="欢迎使用" style="padding:20px;overflow:hidden; color:#f08300; " >
-<center><h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place %>  充装站管理</h1></center>
+				<center>
+					<% if(MyFilter.placeStart){ %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place %>  充装站管理</h1>
+			        <% }else { %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-充装站管理</h1>
+			        <% }%>
+				</center>
 			</div>
-			
 		</div>
-		
     </div>
     
     

+ 12 - 4
WebRoot/jsp/rzx/modifybgman.jsp

@@ -549,7 +549,11 @@ User uu = (User)session.getAttribute(Constant.userMark);
         background: url(images/rzx/layout-browser-hd-bg12.gif) #817865 repeat-x center 50%;
         line-height: 20px;color: #fff; font-family: Verdana, 微软雅黑,黑体">
         <span style="float:right; padding-right:20px;" class="head">欢迎您 <%=username %>  <a href="#" id="editpass">修改密码</a> <a href="javaScript:void(0);" onclick="sExit();return false;">安全退出</a></span>
-        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place %>  改装厂管理</span>
+        <% if(MyFilter.placeStart){ %>
+	        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place %>  改装厂管理</span>
+        <% }else { %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-改装厂管理</span>
+        <% }%>
         <span style="padding-left:100px; font-size: 12px; ">
         	<marquee scrollAmount=2 width="780px">
 				<span style="font-size: 12px;">
@@ -571,11 +575,15 @@ User uu = (User)session.getAttribute(Constant.userMark);
     <div id="mainPanle" region="center" style="background: #eee; overflow-y:hidden">
         <div id="tabs" class="easyui-tabs"  fit="true" border="false" >
 			<div title="欢迎使用" style="padding:20px;overflow:hidden; color:#f08300; " >
-<center><h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place %>  改装厂管理</h1></center>
+				<center>
+					<% if(MyFilter.placeStart){ %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place %>  改装厂管理</h1>
+			        <% }else { %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-改装厂管理</h1>
+			        <% }%>
+				</center>
 			</div>
-			
 		</div>
-		
     </div>
     
     

+ 12 - 5
WebRoot/jsp/rzx/specialuserman.jsp

@@ -369,7 +369,11 @@
         background: url(images/rzx/layout-browser-hd-bg12.gif) #817865 repeat-x center 50%;
         line-height: 20px;color: #fff; font-family: Verdana, 微软雅黑,黑体">
         <span style="float:right; padding-right:20px;" class="head">欢迎您 <%=username%>  <a href="#" id="editpass">修改密码</a> <a href="javaScript:void(0);" onclick="sExit();return false;">安全退出</a></span>
-        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place1%></span>
+        <% if(MyFilter.placeStart){ %>
+	        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place1%></span>
+        <% }else { %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %></span>
+        <% }%>
         <span style="padding-left:100px; font-size: 12px; ">
         	<marquee scrollAmount=2 width="780px">
 				<span style="font-size: 12px;">
@@ -391,12 +395,15 @@
     <div id="mainPanle" region="center" style="background: #eee; overflow-y:hidden;" >
         <div id="tabs" class="easyui-tabs"  fit="true" border="false"  >
 			<div title="欢迎使用" style="padding:20px;overflow:hidden; color:#f08300; " >
-				
-<center><h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place1%></h1></center>
+				<center>
+					<% if(MyFilter.placeStart){ %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place1%></h1>
+			        <% }else { %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %></h1>
+			        <% }%>
+				</center>
 			</div>
-			
 		</div>
-		
     </div>
     
     

+ 12 - 4
WebRoot/jsp/rzx/testingbgman.jsp

@@ -581,7 +581,11 @@ User uu = (User)session.getAttribute(Constant.userMark);
         background: url(images/rzx/layout-browser-hd-bg12.gif) #817865 repeat-x center 50%;
         line-height: 20px;color: #fff; font-family: Verdana, 微软雅黑,黑体">
         <span style="float:right; padding-right:20px;" class="head">欢迎您 <%=username %>  <a href="#" id="editpass">修改密码</a> <a href="javaScript:void(0);" onclick="sExit();return false;">安全退出</a></span>
-        <span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place %>  检验站管理</span>
+        <% if(MyFilter.placeStart){ %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-<%=place %>  检验站管理</span>
+        <% }else { %>
+        	<span style="padding-left:10px; font-size: 16px; "><img src="images/rzx/blocks.gif" width="20" height="20" align="absmiddle" /><%=MyFilter.man_prefix %>-检验站管理</span>
+        <% }%>
         <span style="padding-left:100px; font-size: 12px; ">
         	<marquee scrollAmount=2 width="780px">
 				<span style="font-size: 12px;">
@@ -603,11 +607,15 @@ User uu = (User)session.getAttribute(Constant.userMark);
     <div id="mainPanle" region="center" style="background: #eee; overflow-y:hidden">
         <div id="tabs" class="easyui-tabs"  fit="true" border="false" >
 			<div title="欢迎使用" style="padding:20px;overflow:hidden; color:#f08300; " >
-<center><h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place %>  检验站管理</h1></center>
+				<center>
+					<% if(MyFilter.placeStart){ %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-<%=place %>  检验站管理</h1>
+			        <% }else { %>
+						<h1 style="font-size:24px;">* <%=MyFilter.man_prefix %>-检验站管理</h1>
+			        <% }%>
+				</center>
 			</div>
-			
 		</div>
-		
     </div>
     
     

+ 371 - 371
src/com/runzhixing/action/FillingDataQueryAction.java

@@ -1,371 +1,371 @@
-package com.runzhixing.action;
-
-import java.io.PrintWriter;
-import java.sql.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.json.JSONObject;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.struts2.ServletActionContext;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.runzhixing.bean.CHGFillLog;
-import com.runzhixing.bean.CNGFillLog;
-import com.runzhixing.bean.User;
-import com.runzhixing.bean.page.Page;
-import com.runzhixing.constant.Constant;
-import com.runzhixing.packageProcedure.FillingDataQueryProcedure;
-import com.runzhixing.tool.Tool;
-import com.runzhixing.tool.Util;
-/**
- * 告警参数设置
- * @author 小黄
- *
- */
-@SuppressWarnings("serial")
-public class FillingDataQueryAction extends ActionSupport {
-	//设置新的告警参数
-	@SuppressWarnings({ "unchecked", "static-access" })
-	public void fillingDataQuery() throws Exception{
-		HttpServletResponse response = ServletActionContext.getResponse();
-		HttpServletRequest req = ServletActionContext.getRequest();
-		Map<String,Object> map=new HashMap<String,Object>();
-		User user = (User)req.getSession().getAttribute(Constant.userMark); 
-		
-		int moudel = user.getModule();
-		String ssid = (String) req.getSession().getAttribute(Constant.Privilege);
-		
-		//获取地址,默认全部
-		String province = req.getParameter("province");
-		String city = req.getParameter("city");
-		String country = req.getParameter("country");
-		if(province==null){
-			province = "";
-		}
-		if(city==null){
-			city = "";
-		}
-		if(country==null){
-			country = "";
-		}
-		String regionNo = province+city+country;//地区编号
-		regionNo = regionNo.replaceAll("(00)*$", "");
-		String operatorNo = req.getParameter("operatorNo");//操作员编号
-		String stationNo = req.getParameter("station");//充装点编号
-		String machineNo = req.getParameter("jqj");//设备编号
-		String gunNo = req.getParameter("gunNo");//气枪编号
-		String carNo = req.getParameter("carNo");//车牌号
-		int appType = Integer.parseInt(req.getParameter("appType"));//应用类型
-		int fillState = Integer.parseInt(req.getParameter("fillState"));//充装状态
-		int cylinderType= Integer.parseInt(req.getParameter("cylinderType")); //加气机	
-		
-		//开始时间
-		String sTime=req.getParameter("startTime");
-		String eTime=req.getParameter("endTime");
-		
-		Date startsTime = null;
-		//结束时间
-		Date endsTime = null;
-		// 0:时间无效 1:开始时间有效 2:结束时间有效 3:都有效
-		if(sTime!=null&&!sTime.equals("")){
-			startsTime = Util.dateChange(sTime);
-		}
-		if(eTime!=null&&!eTime.equals("")){
-			endsTime = Util.dateChange(eTime);
-		}
-		Long l = new java.util.Date().getTime();
-		if(startsTime==null){
-			startsTime= new java.sql.Date(l);
-		}
-		if(endsTime==null){
-			endsTime= new java.sql.Date(l+1000 * 3600 * 24L);
-		}
-		
-		
-		//根据地址获取地址编号
-		int pagesize = Integer.parseInt(req.getParameter("psize"));
-		int pageno = Integer.parseInt(req.getParameter("page"));
-		
-		if(stationNo==null||stationNo.equals("")){
-			stationNo =regionNo ;
-		}
-		if(ssid.length()==12&&moudel!=1){
-			stationNo = ssid;
-		}
-		int fillCheck2 = Integer.parseInt(req.getParameter("fillCheck2") != null?req.getParameter("fillCheck2"):"-1");
-		List<CNGFillLog>  list1 = new FillingDataQueryProcedure().fillingDataQuery(pagesize, pageno, operatorNo,stationNo,machineNo,gunNo,carNo,appType,fillState,startsTime,endsTime,cylinderType,fillCheck2);
-		if (list1 != null && list1.size() > 0) {
-			for(CNGFillLog log:list1){
-				String fillchecknNo1 = log.getFILLCHECKNNo1();
-				String operatorName = log.getOperatorName();
-				String fillchecknName1 = log.getFILLCHECKNName1();
-				if (StringUtils.isEmpty(fillchecknNo1) && StringUtils.isNotEmpty(operatorName) && !"未知工作人员".equals(operatorName)) {
-					log.setFILLCHECKNName1(operatorName);
-				}else if(StringUtils.isNotEmpty(fillchecknName1) && !"未知工作人员".equals(fillchecknName1)) {
-					log.setFILLCHECKNName1(fillchecknName1);
-				}else {
-					log.setFILLCHECKNName1("");
-				}
-				
-				String fillchecknNo2 = log.getFILLCHECKNNo2();
-				String fillchecknName2 = log.getFILLCHECKNName2();
-				
-				if (log.getFillStateNum() == 21 
-						|| ("成功充装".equals(log.getFillState()) && StringUtils.isEmpty(fillchecknNo2) && StringUtils.isEmpty(log.getFillTime1())
-								&& StringUtils.isEmpty(log.getEndTime1()) &&  log.getFillTime1().equals(log.getEndTime1())   )) {
-					log.setFILLCHECKNName2("");
-				}else if(StringUtils.isEmpty(fillchecknNo2) &&  StringUtils.isEmpty(log.getFillTime1()) && StringUtils.isEmpty(log.getEndTime1()) 
-						&& Util.str2Date(log.getEndTime1(), "yyyy-MM-dd HH:mm:ss").getTime() > Util.str2Date(log.getFillTime1(), "yyyy-MM-dd HH:mm:ss").getTime() 
-						&& StringUtils.isNotEmpty(operatorName) && !"未知工作人员".equals(operatorName)) {
-					log.setFILLCHECKNName2(operatorName);
-				}else if(StringUtils.isNotEmpty(fillchecknName2) && !"未知工作人员".equals(fillchecknName2)) {
-					log.setFILLCHECKNName2(fillchecknName2);
-				}else {
-					log.setFILLCHECKNName2("");
-				}
-				
-				String fillMonitorName = log.getFillMonitorName();
-				if (StringUtils.isEmpty(log.getFillMonitorNo())) {
-					if (StringUtils.isNotEmpty(fillchecknNo2) &&  !"未知工作人员".equals(fillchecknName2)) {
-						log.setFillMonitorName(fillchecknName2);
-					}else if (StringUtils.isNotEmpty(fillchecknNo1) &&  !"未知工作人员".equals(fillchecknName1)) {
-						log.setFillMonitorName(fillchecknName1);
-					}else if ( StringUtils.isNotEmpty(operatorName) &&  !"未知工作人员".equals(operatorName)) {
-						log.setFillMonitorName(operatorName);
-					}
-				}else {
-					if ("未知工作人员".equals(fillMonitorName)) {
-						log.setFillMonitorName("");
-					}
-				}
-				
-				if (StringUtils.isEmpty(log.getFillMonitorNo()) && StringUtils.isNotEmpty(fillchecknNo2) &&  !"未知工作人员".equals(fillchecknName2)) {
-					log.setFillMonitorName(fillchecknName2);
-				}else if (StringUtils.isEmpty(log.getFillMonitorNo()) && StringUtils.isNotEmpty(fillchecknNo1) &&  !"未知工作人员".equals(fillchecknName1)) {
-					log.setFillMonitorName(fillchecknName1);
-				}else if (StringUtils.isEmpty(log.getFillMonitorNo()) && StringUtils.isNotEmpty(operatorName) &&  !"未知工作人员".equals(operatorName)) {
-					log.setFillMonitorName(operatorName);
-				}else if(StringUtils.isNotEmpty(log.getFillMonitorNo()) && "未知工作人员".equals(fillMonitorName)){
-					log.setFillMonitorName("");
-				}
-				
-				String fillcheckstr = log.getFillcheckstr();
-				int fillStateNum = log.getFillStateNum();
-				String task1 = "✔";
-				String task2 = "✔";
-				String task3 = "✔";
-				String task4 = "✔";
-				String task5 = "✔";
-				String task6 = "✔";
-				if(!Util.isEmpty(fillcheckstr)){
-					if(fillStateNum<=0||fillStateNum>=21){
-						if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
-							task1 = "×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
-							task2 = "×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
-							task3 = "×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-4,fillcheckstr.length()-3).equals("1")){
-							task4 = "×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-5,fillcheckstr.length()-4).equals("1")){
-							task5 = "×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-6,fillcheckstr.length()-5).equals("1")){
-							task6 = "×";
-						}
-						if(fillStateNum==31){
-							task1 = "✔";
-							task2 = "✔";
-							task3 = "✔";
-							task4 = "✔";
-							task5 = "✔";
-							task6 = "✔";
-						}
-					}
-				}
-				log.setTaskNo1(task1);
-				log.setTaskNo2(task2);
-				log.setTaskNo3(task3);
-				log.setTaskNo4(task4);
-				log.setTaskNo5(task5);
-				log.setTaskNo6(task6);
-				
-				//当充装状态为充前检验失败时,充后检查必须为空
-				//当充装状态为充装成功且充后人员FILLCHECKNO2为空时,充装时间等于充后时间,充后检查没上来,充后必须填空
-				//FILLCHECKNO2为空时,充装时间不等于充后时间,充后已经上来,用当前充装人员CngOperatorName填充
-				String task7 = "";
-				String task8 = "";
-				String task9 = "";
-				String task10 = "";
-				String task11 = "";
-				String task12 = "";
-				if(Util.isEmpty(log.getFILLCHECKNNo2())&&!Util.isEmpty(log.getFillTime1())&&!Util.isEmpty(log.getEndTime1())&&Tool.compare_date2(log.getEndTime1(), log.getFillTime1())){
-					if(!Util.isEmpty(log.getOperatorName()) && !"未知工作人员".equals(log.getOperatorName()) && !Util.isEmpty(fillcheckstr)){
-						task7 = "✔";
-						task8 = "✔";
-						task9 = "✔";
-						task10 = "✔";
-						task11 = "✔";
-						task12 = "✔";
-						if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
-							task7="×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
-							task8="×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
-							task9="×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-6,fillcheckstr.length()-5).equals("1")){
-							task10="×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-7,fillcheckstr.length()-6).equals("1")){
-							task11="×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-8,fillcheckstr.length()-7).equals("1")){
-							task12="×";
-						}
-					}
-				}else if(!Util.isEmpty(log.getFILLCHECKNNo2())){
-					if(!"未知工作人员".equals(log.getFILLCHECKNName2()) && !Util.isEmpty(fillcheckstr)){
-						task7="✔";
-						task8="✔";
-						task9="✔";
-						task10 = "✔";
-						task11 = "✔";
-						task12 = "✔";
-						if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
-							task7="×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
-							task8="×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
-							task9="×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-6,fillcheckstr.length()-5).equals("1")){
-							task10="×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-7,fillcheckstr.length()-6).equals("1")){
-							task11="×";
-						}
-						if(fillcheckstr.substring(fillcheckstr.length()-8,fillcheckstr.length()-7).equals("1")){
-							task12="×";
-						}
-					}
-				}
-				
-				log.setTaskNo7(task7);
-				log.setTaskNo8(task8);
-				log.setTaskNo9(task9);
-				log.setTaskNo10(task10);
-				log.setTaskNo11(task11);
-				log.setTaskNo12(task12);
-				
-			}
-		}
-		User u = (User) req.getSession().getAttribute(Constant.fillingSum);
-		
-		map.put("total", u.getFillingSum());
-		map.put("rows", list1);
-		String result = new JSONObject().fromObject(map).toString();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter out = response.getWriter();
-		out.write(result);
-	}
-	
-	/**
-	 * 氢气充装数据查询
-	 * @throws Exception 
-	 * @return void 
-	 * @author yxh
-	 * @date 2022年9月17日下午8:13:01
-	 * @throws
-	 */
-	public void chgFillingDataQuery() throws Exception{
-		HttpServletResponse response = ServletActionContext.getResponse();
-		HttpServletRequest req = ServletActionContext.getRequest();
-		Map<String,Object> map=new HashMap<String,Object>();
-		User user = (User)req.getSession().getAttribute(Constant.userMark); 
-		int moudel = user.getModule();
-		String ssid = (String) req.getSession().getAttribute(Constant.Privilege);
-		
-		//获取地址,默认全部
-		String province = req.getParameter("province");
-		String city = req.getParameter("city");
-		String country = req.getParameter("country");
-		if(province==null){
-			province = "";
-		}
-		if(city==null){
-			city = "";
-		}
-		if(country==null){
-			country = "";
-		}
-		String regionNo = province+city+country;//地区编号
-		regionNo = regionNo.replaceAll("(00)*$", "");
-		
-		String stationNo = req.getParameter("station");//充装点编号
-		String carNo = req.getParameter("carNo");//车牌号
-		//开始时间
-		String sTime=req.getParameter("startTime");
-		String eTime=req.getParameter("endTime");
-		Date startsTime = null;
-		//结束时间
-		Date endsTime = null;
-		// 0:时间无效 1:开始时间有效 2:结束时间有效 3:都有效
-		if(sTime!=null&&!sTime.equals("")){
-			startsTime = Util.dateChange(sTime);
-		}
-		if(eTime!=null&&!eTime.equals("")){
-			endsTime = Util.dateChange(eTime);
-		}
-		Long l = new java.util.Date().getTime();
-		if(startsTime==null){
-			startsTime= new java.sql.Date(l);
-		}
-		if(endsTime==null){
-			endsTime= new java.sql.Date(l+1000 * 3600 * 24L);
-		}
-		//根据地址获取地址编号
-		int pagesize = Integer.parseInt(req.getParameter("psize"));
-		int pageno = Integer.parseInt(req.getParameter("page"));
-		
-		if(stationNo==null||stationNo.equals("")){
-			stationNo =regionNo ;
-		}
-		if(ssid.length()==12&&moudel!=1){
-			stationNo = ssid;
-		}
-		
-		List<CHGFillLog>  list1 = new FillingDataQueryProcedure().chgFillingDataQuery(pagesize, pageno,stationNo,carNo,startsTime,endsTime);
-		User u = (User) req.getSession().getAttribute(Constant.fillingSum);
-		map.put("total", u.getFillingSum());
-		map.put("rows", list1);
-		String result = new JSONObject().fromObject(map).toString();
-		response.setContentType("text/html;charset=utf-8");
-		PrintWriter out = response.getWriter();
-		out.write(result);
-	}
-	
-	
-	
-	
-	
-	
-	
-	
-	
-}
-		
+package com.runzhixing.action;
+
+import java.io.PrintWriter;
+import java.sql.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.json.JSONObject;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts2.ServletActionContext;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.runzhixing.bean.CHGFillLog;
+import com.runzhixing.bean.CNGFillLog;
+import com.runzhixing.bean.User;
+import com.runzhixing.bean.page.Page;
+import com.runzhixing.constant.Constant;
+import com.runzhixing.packageProcedure.FillingDataQueryProcedure;
+import com.runzhixing.tool.Tool;
+import com.runzhixing.tool.Util;
+/**
+ * 告警参数设置
+ * @author 小黄
+ *
+ */
+@SuppressWarnings("serial")
+public class FillingDataQueryAction extends ActionSupport {
+	//设置新的告警参数
+	@SuppressWarnings({ "unchecked", "static-access" })
+	public void fillingDataQuery() throws Exception{
+		HttpServletResponse response = ServletActionContext.getResponse();
+		HttpServletRequest req = ServletActionContext.getRequest();
+		Map<String,Object> map=new HashMap<String,Object>();
+		User user = (User)req.getSession().getAttribute(Constant.userMark); 
+		
+		int moudel = user.getModule();
+		String ssid = (String) req.getSession().getAttribute(Constant.Privilege);
+		
+		//获取地址,默认全部
+		String province = req.getParameter("province");
+		String city = req.getParameter("city");
+		String country = req.getParameter("country");
+		if(province==null){
+			province = "";
+		}
+		if(city==null){
+			city = "";
+		}
+		if(country==null){
+			country = "";
+		}
+		String regionNo = province+city+country;//地区编号
+		regionNo = regionNo.replaceAll("(00)*$", "");
+		String operatorNo = req.getParameter("operatorNo");//操作员编号
+		String stationNo = req.getParameter("station");//充装点编号
+		String machineNo = req.getParameter("jqj");//设备编号
+		String gunNo = req.getParameter("gunNo");//气枪编号
+		String carNo = req.getParameter("carNo");//车牌号
+		int appType = Integer.parseInt(req.getParameter("appType"));//应用类型
+		int fillState = Integer.parseInt(req.getParameter("fillState"));//充装状态
+		int cylinderType= Integer.parseInt(req.getParameter("cylinderType")); //加气机	
+		
+		//开始时间
+		String sTime=req.getParameter("startTime");
+		String eTime=req.getParameter("endTime");
+		
+		Date startsTime = null;
+		//结束时间
+		Date endsTime = null;
+		// 0:时间无效 1:开始时间有效 2:结束时间有效 3:都有效
+		if(sTime!=null&&!sTime.equals("")){
+			startsTime = Util.dateChange(sTime);
+		}
+		if(eTime!=null&&!eTime.equals("")){
+			endsTime = Util.dateChange(eTime);
+		}
+		Long l = new java.util.Date().getTime();
+		if(startsTime==null){
+			startsTime= new java.sql.Date(l);
+		}
+		if(endsTime==null){
+			endsTime= new java.sql.Date(l+1000 * 3600 * 24L);
+		}
+		
+		
+		//根据地址获取地址编号
+		int pagesize = Integer.parseInt(req.getParameter("psize"));
+		int pageno = Integer.parseInt(req.getParameter("page"));
+		
+		if(stationNo==null||stationNo.equals("")){
+			stationNo =regionNo ;
+		}
+		if(ssid.length()==12&&moudel!=1){
+			stationNo = ssid;
+		}
+		int fillCheck2 = Integer.parseInt(req.getParameter("fillCheck2") != null?req.getParameter("fillCheck2"):"-1");
+		List<CNGFillLog>  list1 = new FillingDataQueryProcedure().fillingDataQuery(pagesize, pageno, operatorNo,stationNo,machineNo,gunNo,carNo,appType,fillState,startsTime,endsTime,cylinderType,fillCheck2);
+		if (list1 != null && list1.size() > 0) {
+			for(CNGFillLog log:list1){
+				String fillchecknNo1 = log.getFILLCHECKNNo1();
+				String operatorName = log.getOperatorName();
+				String fillchecknName1 = log.getFILLCHECKNName1();
+				if (StringUtils.isEmpty(fillchecknNo1) && StringUtils.isNotEmpty(operatorName) && !"未知工作人员".equals(operatorName)) {
+					log.setFILLCHECKNName1(operatorName);
+				}else if(StringUtils.isNotEmpty(fillchecknName1) && !"未知工作人员".equals(fillchecknName1)) {
+					log.setFILLCHECKNName1(fillchecknName1);
+				}else {
+					log.setFILLCHECKNName1("");
+				}
+				
+				String fillchecknNo2 = log.getFILLCHECKNNo2();
+				String fillchecknName2 = log.getFILLCHECKNName2();
+				
+				if (log.getFillStateNum() == 21 
+						|| ("成功充装".equals(log.getFillState()) && StringUtils.isEmpty(fillchecknNo2) && StringUtils.isEmpty(log.getFillTime1())
+								&& StringUtils.isEmpty(log.getEndTime1()) &&  log.getFillTime1().equals(log.getEndTime1())   )) {
+					log.setFILLCHECKNName2("");
+				}else if(StringUtils.isEmpty(fillchecknNo2) &&  StringUtils.isEmpty(log.getFillTime1()) && StringUtils.isEmpty(log.getEndTime1()) 
+						&& Util.str2Date(log.getEndTime1(), "yyyy-MM-dd HH:mm:ss").getTime() > Util.str2Date(log.getFillTime1(), "yyyy-MM-dd HH:mm:ss").getTime() 
+						&& StringUtils.isNotEmpty(operatorName) && !"未知工作人员".equals(operatorName)) {
+					log.setFILLCHECKNName2(operatorName);
+				}else if(StringUtils.isNotEmpty(fillchecknName2) && !"未知工作人员".equals(fillchecknName2)) {
+					log.setFILLCHECKNName2(fillchecknName2);
+				}else {
+					log.setFILLCHECKNName2("");
+				}
+				
+				String fillMonitorName = log.getFillMonitorName();
+				if (StringUtils.isEmpty(log.getFillMonitorNo())) {
+					if (StringUtils.isNotEmpty(fillchecknNo2) &&  !"未知工作人员".equals(fillchecknName2)) {
+						log.setFillMonitorName(fillchecknName2);
+					}else if (StringUtils.isNotEmpty(fillchecknNo1) &&  !"未知工作人员".equals(fillchecknName1)) {
+						log.setFillMonitorName(fillchecknName1);
+					}else if ( StringUtils.isNotEmpty(operatorName) &&  !"未知工作人员".equals(operatorName)) {
+						log.setFillMonitorName(operatorName);
+					}
+				}else {
+					if ("未知工作人员".equals(fillMonitorName)) {
+						log.setFillMonitorName("");
+					}
+				}
+				
+				if (StringUtils.isEmpty(log.getFillMonitorNo()) && StringUtils.isNotEmpty(fillchecknNo2) &&  !"未知工作人员".equals(fillchecknName2)) {
+					log.setFillMonitorName(fillchecknName2);
+				}else if (StringUtils.isEmpty(log.getFillMonitorNo()) && StringUtils.isNotEmpty(fillchecknNo1) &&  !"未知工作人员".equals(fillchecknName1)) {
+					log.setFillMonitorName(fillchecknName1);
+				}else if (StringUtils.isEmpty(log.getFillMonitorNo()) && StringUtils.isNotEmpty(operatorName) &&  !"未知工作人员".equals(operatorName)) {
+					log.setFillMonitorName(operatorName);
+				}else if(StringUtils.isNotEmpty(log.getFillMonitorNo()) && "未知工作人员".equals(fillMonitorName)){
+					log.setFillMonitorName("");
+				}
+				
+				String fillcheckstr = log.getFillcheckstr();
+				int fillStateNum = log.getFillStateNum();
+				String task1 = "✔";
+				String task2 = "✔";
+				String task3 = "✔";
+				String task4 = "✔";
+				String task5 = "✔";
+				String task6 = "✔";
+				if(!Util.isEmpty(fillcheckstr)){
+					if(fillStateNum<=0||fillStateNum>=21){
+						if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
+							task1 = "×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
+							task2 = "×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
+							task3 = "×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-4,fillcheckstr.length()-3).equals("1")){
+							task4 = "×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-5,fillcheckstr.length()-4).equals("1")){
+							task5 = "×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-6,fillcheckstr.length()-5).equals("1")){
+							task6 = "×";
+						}
+						if(fillStateNum==31){
+							task1 = "✔";
+							task2 = "✔";
+							task3 = "✔";
+							task4 = "✔";
+							task5 = "✔";
+							task6 = "✔";
+						}
+					}
+				}
+				log.setTaskNo1(task1);
+				log.setTaskNo2(task2);
+				log.setTaskNo3(task3);
+				log.setTaskNo4(task4);
+				log.setTaskNo5(task5);
+				log.setTaskNo6(task6);
+				
+				//当充装状态为充前检验失败时,充后检查必须为空
+				//当充装状态为充装成功且充后人员FILLCHECKNO2为空时,充装时间等于充后时间,充后检查没上来,充后必须填空
+				//FILLCHECKNO2为空时,充装时间不等于充后时间,充后已经上来,用当前充装人员CngOperatorName填充
+				String task7 = "";
+				String task8 = "";
+				String task9 = "";
+				String task10 = "";
+				String task11 = "";
+				String task12 = "";
+				if(Util.isEmpty(log.getFILLCHECKNNo2())&&!Util.isEmpty(log.getFillTime1())&&!Util.isEmpty(log.getEndTime1())&&Tool.compare_date2(log.getEndTime1(), log.getFillTime1())){
+					if(!Util.isEmpty(log.getOperatorName()) && !"未知工作人员".equals(log.getOperatorName()) && !Util.isEmpty(fillcheckstr)){
+						task7 = "✔";
+						task8 = "✔";
+						task9 = "✔";
+						task10 = "✔";
+						task11 = "✔";
+						task12 = "✔";
+						if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
+							task7="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
+							task8="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
+							task9="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-6,fillcheckstr.length()-5).equals("1")){
+							task10="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-7,fillcheckstr.length()-6).equals("1")){
+							task11="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-8,fillcheckstr.length()-7).equals("1")){
+							task12="×";
+						}
+					}
+				}else if(!Util.isEmpty(log.getFILLCHECKNNo2())){
+					if(!"未知工作人员".equals(log.getFILLCHECKNName2()) && !Util.isEmpty(fillcheckstr)){
+						task7="✔";
+						task8="✔";
+						task9="✔";
+						task10 = "✔";
+						task11 = "✔";
+						task12 = "✔";
+						if(fillcheckstr.substring(fillcheckstr.length()-1,fillcheckstr.length()).equals("1")){
+							task7="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-2,fillcheckstr.length()-1).equals("1")){
+							task8="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-3,fillcheckstr.length()-2).equals("1")){
+							task9="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-6,fillcheckstr.length()-5).equals("1")){
+							task10="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-7,fillcheckstr.length()-6).equals("1")){
+							task11="×";
+						}
+						if(fillcheckstr.substring(fillcheckstr.length()-8,fillcheckstr.length()-7).equals("1")){
+							task12="×";
+						}
+					}
+				}
+				
+				log.setTaskNo7(task7);
+				log.setTaskNo8(task8);
+				log.setTaskNo9(task9);
+				log.setTaskNo10(task10);
+				log.setTaskNo11(task11);
+				log.setTaskNo12(task12);
+				
+			}
+		}
+		User u = (User) req.getSession().getAttribute(Constant.fillingSum);
+		
+		map.put("total", u.getFillingSum());
+		map.put("rows", list1);
+		String result = new JSONObject().fromObject(map).toString();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter out = response.getWriter();
+		out.write(result);
+	}
+	
+	/**
+	 * 氢气充装数据查询
+	 * @throws Exception 
+	 * @return void 
+	 * @author yxh
+	 * @date 2022年9月17日下午8:13:01
+	 * @throws
+	 */
+	public void chgFillingDataQuery() throws Exception{
+		HttpServletResponse response = ServletActionContext.getResponse();
+		HttpServletRequest req = ServletActionContext.getRequest();
+		Map<String,Object> map=new HashMap<String,Object>();
+		User user = (User)req.getSession().getAttribute(Constant.userMark); 
+		int moudel = user.getModule();
+		String ssid = (String) req.getSession().getAttribute(Constant.Privilege);
+		
+		//获取地址,默认全部
+		String province = req.getParameter("province");
+		String city = req.getParameter("city");
+		String country = req.getParameter("country");
+		if(province==null){
+			province = "";
+		}
+		if(city==null){
+			city = "";
+		}
+		if(country==null){
+			country = "";
+		}
+		String regionNo = province+city+country;//地区编号
+		regionNo = regionNo.replaceAll("(00)*$", "");
+		
+		String stationNo = req.getParameter("station");//充装点编号
+		String carNo = req.getParameter("carNo");//车牌号
+		//开始时间
+		String sTime=req.getParameter("startTime");
+		String eTime=req.getParameter("endTime");
+		Date startsTime = null;
+		//结束时间
+		Date endsTime = null;
+		// 0:时间无效 1:开始时间有效 2:结束时间有效 3:都有效
+		if(sTime!=null&&!sTime.equals("")){
+			startsTime = Util.dateChange(sTime);
+		}
+		if(eTime!=null&&!eTime.equals("")){
+			endsTime = Util.dateChange(eTime);
+		}
+		Long l = new java.util.Date().getTime();
+		if(startsTime==null){
+			startsTime= new java.sql.Date(l);
+		}
+		if(endsTime==null){
+			endsTime= new java.sql.Date(l+1000 * 3600 * 24L);
+		}
+		//根据地址获取地址编号
+		int pagesize = Integer.parseInt(req.getParameter("psize"));
+		int pageno = Integer.parseInt(req.getParameter("page"));
+		
+		if(stationNo==null||stationNo.equals("")){
+			stationNo =regionNo ;
+		}
+		if(ssid.length()==12&&moudel!=1){
+			stationNo = ssid;
+		}
+		
+		List<CHGFillLog>  list1 = new FillingDataQueryProcedure().chgFillingDataQuery(pagesize, pageno,stationNo,carNo,startsTime,endsTime);
+		User u = (User) req.getSession().getAttribute(Constant.fillingSum);
+		map.put("total", u.getFillingSum());
+		map.put("rows", list1);
+		String result = JSONObject.fromObject(map).toString();
+		response.setContentType("text/html;charset=utf-8");
+		PrintWriter out = response.getWriter();
+		out.write(result);
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+}
+		

+ 3 - 4
src/com/runzhixing/action/SpeStationAction.java

@@ -161,14 +161,13 @@ public class SpeStationAction extends ActionSupport {
 			sb = ssid;
 		}
 		sb = sb.replaceAll("(00)*$", "");
-		sb="";//TODO
 		if(sb.contains(pcode)){
+			int type = Integer.parseInt(req.getParameter("type"));
+			list = new CNGStationDao().getStationInfoList(sb, type);
 		}
-		int type = Integer.parseInt(req.getParameter("type"));
-		list = new CNGStationDao().getStationInfoList(sb, type);
 		map.put("total", null);
 		map.put("rows", list);
-		String result = new JSONObject().fromObject(map).toString();
+		String result =  JSONObject.fromObject(map).toString();
 		response.setContentType("text/html;charset=utf-8");
 		PrintWriter out = response.getWriter();
 		out.write(result);

+ 536 - 503
src/com/runzhixing/bean/CHGFillLog.java

@@ -1,503 +1,536 @@
-package com.runzhixing.bean;
-
-import java.util.Date;
-
-/**
- * 氢气充装数据
- * @ClassName: CHGFillLog
- * @Description: TODO
- * @author yxh
- * @date 2022年9月17日
- */
-public class CHGFillLog {
-
-	private String guid;
-	private String stationNo;//STATIONNO站编号
-	private String carNo;//CARNO车牌号
-	private int plateType;//PLATETYPE车牌类型
-	private int plateColor;//PLATECOLOR车牌颜色
-	private String medium;//MEDIUM充装介质
-	private String regNo;//REGNO使用登记证号
-	private Date regDate;//REGDATE发证时间
-	private Date regValidity;//REGVALIDITY证件有效期
-	private String regUnit;//REGUNIT发证单位
-	private int cylinderType;//CYLINDERTYPE气瓶类型
-	private String cylinderNo;//CYLINDERNO气瓶出厂编号
-	private String productName;//PRODUCTNAME生产厂家
-	private Date productDate;//PRODUCTDATE生产日期
-	private Date startuseDate;//STARTUSEDATE投用日期
-	private Date yearLimit;//YEARLIMIT使用年限
-	private String productLicence;//PRODUCTLICENCE生产许可
-	private String productType;//PRODUCTTYPE气瓶产品型号
-	private float weight;//WEIGHT重量
-	private float vol;//VOL容积
-	private float thickness;//THICKNESS壁厚
-	private float press;//PRESS压力
-	private String material;//MATERIAL材质
-	private String installStation;//INSTALLSTATION安装单位
-	private String installCert;//INSTALLCERT安装合格证
-	private Date installDate;//INSTALLDATE安装时间
-	private String monitorStation;//MONITORSTATION监检单位
-	private String monitorCert;//MONITORCERT监检合格证
-	private Date monitorDate;//MONITORDATE监检时间
-	private String checkStation;//CHECKSTATION检验单位
-	private String checkCert;//CHECKCERT检验合格证
-	private Date checkDate;//CHECKDATE检验时间
-	private Date nextCheckDate;//NEXTCHECKDATE下次检验时间
-	private String beforeChecker;//BEFORECHECKER充装检查人员
-	private Date beforeTime;//BEFORETIME充半检查时间
-	private String beforeItems;//BEFOREITEMS充装前检查项目
-	private int beforeResult;//BEFORERESULT充前检查结果
-	private String beforeException;//BEFOREEXCEPTION充前检查异常项目
-	private String carRemark;//CARREMARK车辆其它信息
-	private String cylinderRemark;//CYLINDERREMARK气瓶其它信息
-	private String beforeVerifier;//BEFOREVERIFIER充前审核人员
-	private String operatorName;//OPERATORNAME操作人员姓名
-	private String operatorId;//OPERATORID操作人员身份证号
-	private String operatorNo;//OPERATORNO操作人员编号
-	private String operatorType;//OPERATORTYPE操作人员类型
-	private String operatorDoc;//OPERATORDOC操作人员档案号
-	private String operatorCert;//OPERATORCERT操作人员班证书
-	private Date operatorLicDate;//OPERATORLICDATE发证时间
-	private Date operatorLicValidity;//OPERATORLICVALIDITY证书有效期
-	private String machineFactory;//MACHINEFACTORY充装设备厂家
-	private String machineNo;//MACHINENO充装设备编号
-	private String machineName;//MACHINENAME充装设备名称
-	private String gunNo;//GUNNO充装枪号
-	private Date fillStartTime;//FILLSTARTTIME充装时间
-	private int FillBeforePress;//FILLBEFOREPRESS充前压力
-	private Date fillEndTime;//FILLENDTIME充装结束时间
-	private int FillEndPress;//FILLENDPRESS充装结束压力
-	private int FillUnit;//FILLUNIT充装量单位
-	private int FillNum;//FILLNUM充装量
-	private int FillDensity;//FILLDENSITY充装密度
-	private float money;//MONEY金额
-	private String afterChecker;//AFTERCHECKER充后检查人员
-	private Date afterTime;//AFTERTIME充后检查时间
-	private String afterTimes;//AFTERITEMS充后检查项目
-	private int afterResult;//AFTERRESULT充后结果
-	private String afterException;//AFTEREXCEPTION充后检查异常项目
-	private String afterVerifier;//AFTERVERIFIER充后审核人员
-	private String remark;//REMARK备注及其它信息
-	
-	
-	private String stationName;//STATIONNAME站名称
-	
-	
-	public String getGuid() {
-		return guid;
-	}
-	public void setGuid(String guid) {
-		this.guid = guid;
-	}
-	public String getStationNo() {
-		return stationNo;
-	}
-	public void setStationNo(String stationNo) {
-		this.stationNo = stationNo;
-	}
-	public String getCarNo() {
-		return carNo;
-	}
-	public void setCarNo(String carNo) {
-		this.carNo = carNo;
-	}
-	public int getPlateType() {
-		return plateType;
-	}
-	public void setPlateType(int plateType) {
-		this.plateType = plateType;
-	}
-	public int getPlateColor() {
-		return plateColor;
-	}
-	public void setPlateColor(int plateColor) {
-		this.plateColor = plateColor;
-	}
-	public String getMedium() {
-		return medium;
-	}
-	public void setMedium(String medium) {
-		this.medium = medium;
-	}
-	public String getRegNo() {
-		return regNo;
-	}
-	public void setRegNo(String regNo) {
-		this.regNo = regNo;
-	}
-	public Date getRegDate() {
-		return regDate;
-	}
-	public void setRegDate(Date regDate) {
-		this.regDate = regDate;
-	}
-	public Date getRegValidity() {
-		return regValidity;
-	}
-	public void setRegValidity(Date regValidity) {
-		this.regValidity = regValidity;
-	}
-	public String getRegUnit() {
-		return regUnit;
-	}
-	public void setRegUnit(String regUnit) {
-		this.regUnit = regUnit;
-	}
-	public int getCylinderType() {
-		return cylinderType;
-	}
-	public void setCylinderType(int cylinderType) {
-		this.cylinderType = cylinderType;
-	}
-	public String getCylinderNo() {
-		return cylinderNo;
-	}
-	public void setCylinderNo(String cylinderNo) {
-		this.cylinderNo = cylinderNo;
-	}
-	public String getProductName() {
-		return productName;
-	}
-	public void setProductName(String productName) {
-		this.productName = productName;
-	}
-	public Date getProductDate() {
-		return productDate;
-	}
-	public void setProductDate(Date productDate) {
-		this.productDate = productDate;
-	}
-	public Date getStartuseDate() {
-		return startuseDate;
-	}
-	public void setStartuseDate(Date startuseDate) {
-		this.startuseDate = startuseDate;
-	}
-	public Date getYearLimit() {
-		return yearLimit;
-	}
-	public void setYearLimit(Date yearLimit) {
-		this.yearLimit = yearLimit;
-	}
-	public String getProductLicence() {
-		return productLicence;
-	}
-	public void setProductLicence(String productLicence) {
-		this.productLicence = productLicence;
-	}
-	public String getProductType() {
-		return productType;
-	}
-	public void setProductType(String productType) {
-		this.productType = productType;
-	}
-	public float getWeight() {
-		return weight;
-	}
-	public void setWeight(float weight) {
-		this.weight = weight;
-	}
-	public float getVol() {
-		return vol;
-	}
-	public void setVol(float vol) {
-		this.vol = vol;
-	}
-	public float getThickness() {
-		return thickness;
-	}
-	public void setThickness(float thickness) {
-		this.thickness = thickness;
-	}
-	public float getPress() {
-		return press;
-	}
-	public void setPress(float press) {
-		this.press = press;
-	}
-	public String getMaterial() {
-		return material;
-	}
-	public void setMaterial(String material) {
-		this.material = material;
-	}
-	public String getInstallStation() {
-		return installStation;
-	}
-	public void setInstallStation(String installStation) {
-		this.installStation = installStation;
-	}
-	public String getInstallCert() {
-		return installCert;
-	}
-	public void setInstallCert(String installCert) {
-		this.installCert = installCert;
-	}
-	public Date getInstallDate() {
-		return installDate;
-	}
-	public void setInstallDate(Date installDate) {
-		this.installDate = installDate;
-	}
-	public String getMonitorStation() {
-		return monitorStation;
-	}
-	public void setMonitorStation(String monitorStation) {
-		this.monitorStation = monitorStation;
-	}
-	public String getMonitorCert() {
-		return monitorCert;
-	}
-	public void setMonitorCert(String monitorCert) {
-		this.monitorCert = monitorCert;
-	}
-	public Date getMonitorDate() {
-		return monitorDate;
-	}
-	public void setMonitorDate(Date monitorDate) {
-		this.monitorDate = monitorDate;
-	}
-	public String getCheckStation() {
-		return checkStation;
-	}
-	public void setCheckStation(String checkStation) {
-		this.checkStation = checkStation;
-	}
-	public String getCheckCert() {
-		return checkCert;
-	}
-	public void setCheckCert(String checkCert) {
-		this.checkCert = checkCert;
-	}
-	public Date getCheckDate() {
-		return checkDate;
-	}
-	public void setCheckDate(Date checkDate) {
-		this.checkDate = checkDate;
-	}
-	public Date getNextCheckDate() {
-		return nextCheckDate;
-	}
-	public void setNextCheckDate(Date nextCheckDate) {
-		this.nextCheckDate = nextCheckDate;
-	}
-	public String getBeforeChecker() {
-		return beforeChecker;
-	}
-	public void setBeforeChecker(String beforeChecker) {
-		this.beforeChecker = beforeChecker;
-	}
-	public Date getBeforeTime() {
-		return beforeTime;
-	}
-	public void setBeforeTime(Date beforeTime) {
-		this.beforeTime = beforeTime;
-	}
-	public String getBeforeItems() {
-		return beforeItems;
-	}
-	public void setBeforeItems(String beforeItems) {
-		this.beforeItems = beforeItems;
-	}
-	public int getBeforeResult() {
-		return beforeResult;
-	}
-	public void setBeforeResult(int beforeResult) {
-		this.beforeResult = beforeResult;
-	}
-	public String getBeforeException() {
-		return beforeException;
-	}
-	public void setBeforeException(String beforeException) {
-		this.beforeException = beforeException;
-	}
-	public String getCarRemark() {
-		return carRemark;
-	}
-	public void setCarRemark(String carRemark) {
-		this.carRemark = carRemark;
-	}
-	public String getCylinderRemark() {
-		return cylinderRemark;
-	}
-	public void setCylinderRemark(String cylinderRemark) {
-		this.cylinderRemark = cylinderRemark;
-	}
-	public String getBeforeVerifier() {
-		return beforeVerifier;
-	}
-	public void setBeforeVerifier(String beforeVerifier) {
-		this.beforeVerifier = beforeVerifier;
-	}
-	public String getOperatorName() {
-		return operatorName;
-	}
-	public void setOperatorName(String operatorName) {
-		this.operatorName = operatorName;
-	}
-	public String getOperatorId() {
-		return operatorId;
-	}
-	public void setOperatorId(String operatorId) {
-		this.operatorId = operatorId;
-	}
-	public String getOperatorNo() {
-		return operatorNo;
-	}
-	public void setOperatorNo(String operatorNo) {
-		this.operatorNo = operatorNo;
-	}
-	public String getOperatorType() {
-		return operatorType;
-	}
-	public void setOperatorType(String operatorType) {
-		this.operatorType = operatorType;
-	}
-	public String getOperatorDoc() {
-		return operatorDoc;
-	}
-	public void setOperatorDoc(String operatorDoc) {
-		this.operatorDoc = operatorDoc;
-	}
-	public String getOperatorCert() {
-		return operatorCert;
-	}
-	public void setOperatorCert(String operatorCert) {
-		this.operatorCert = operatorCert;
-	}
-	public Date getOperatorLicDate() {
-		return operatorLicDate;
-	}
-	public void setOperatorLicDate(Date operatorLicDate) {
-		this.operatorLicDate = operatorLicDate;
-	}
-	public Date getOperatorLicValidity() {
-		return operatorLicValidity;
-	}
-	public void setOperatorLicValidity(Date operatorLicValidity) {
-		this.operatorLicValidity = operatorLicValidity;
-	}
-	public String getMachineFactory() {
-		return machineFactory;
-	}
-	public void setMachineFactory(String machineFactory) {
-		this.machineFactory = machineFactory;
-	}
-	public String getMachineNo() {
-		return machineNo;
-	}
-	public void setMachineNo(String machineNo) {
-		this.machineNo = machineNo;
-	}
-	public String getMachineName() {
-		return machineName;
-	}
-	public void setMachineName(String machineName) {
-		this.machineName = machineName;
-	}
-	public String getGunNo() {
-		return gunNo;
-	}
-	public void setGunNo(String gunNo) {
-		this.gunNo = gunNo;
-	}
-	public Date getFillStartTime() {
-		return fillStartTime;
-	}
-	public void setFillStartTime(Date fillStartTime) {
-		this.fillStartTime = fillStartTime;
-	}
-	public int getFillBeforePress() {
-		return FillBeforePress;
-	}
-	public void setFillBeforePress(int fillBeforePress) {
-		FillBeforePress = fillBeforePress;
-	}
-	public Date getFillEndTime() {
-		return fillEndTime;
-	}
-	public void setFillEndTime(Date fillEndTime) {
-		this.fillEndTime = fillEndTime;
-	}
-	public int getFillEndPress() {
-		return FillEndPress;
-	}
-	public void setFillEndPress(int fillEndPress) {
-		FillEndPress = fillEndPress;
-	}
-	public int getFillUnit() {
-		return FillUnit;
-	}
-	public void setFillUnit(int fillUnit) {
-		FillUnit = fillUnit;
-	}
-	public int getFillNum() {
-		return FillNum;
-	}
-	public void setFillNum(int fillNum) {
-		FillNum = fillNum;
-	}
-	public int getFillDensity() {
-		return FillDensity;
-	}
-	public void setFillDensity(int fillDensity) {
-		FillDensity = fillDensity;
-	}
-	public float getMoney() {
-		return money;
-	}
-	public void setMoney(float money) {
-		this.money = money;
-	}
-	public String getAfterChecker() {
-		return afterChecker;
-	}
-	public void setAfterChecker(String afterChecker) {
-		this.afterChecker = afterChecker;
-	}
-	public Date getAfterTime() {
-		return afterTime;
-	}
-	public void setAfterTime(Date afterTime) {
-		this.afterTime = afterTime;
-	}
-	public String getAfterTimes() {
-		return afterTimes;
-	}
-	public void setAfterTimes(String afterTimes) {
-		this.afterTimes = afterTimes;
-	}
-	public int getAfterResult() {
-		return afterResult;
-	}
-	public void setAfterResult(int afterResult) {
-		this.afterResult = afterResult;
-	}
-	public String getAfterException() {
-		return afterException;
-	}
-	public void setAfterException(String afterException) {
-		this.afterException = afterException;
-	}
-	public String getAfterVerifier() {
-		return afterVerifier;
-	}
-	public void setAfterVerifier(String afterVerifier) {
-		this.afterVerifier = afterVerifier;
-	}
-	public String getRemark() {
-		return remark;
-	}
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-	public String getStationName() {
-		return stationName;
-	}
-	public void setStationName(String stationName) {
-		this.stationName = stationName;
-	}
-	
-	
-}
+package com.runzhixing.bean;
+
+
+import org.apache.commons.lang.StringUtils;
+
+import com.runzhixing.tool.Tool;
+
+/**
+ * 氢气充装数据
+ * @ClassName: CHGFillLog
+ * @Description: TODO
+ * @author yxh
+ * @date 2022年9月17日
+ */
+public class CHGFillLog {
+
+	private String guid;
+	private String stationNo;//STATIONNO站编号
+	private String carNo;//CARNO车牌号
+	private int plateType;//PLATETYPE车牌类型
+	private int plateColor;//PLATECOLOR车牌颜色
+	private String medium;//MEDIUM充装介质
+	private String regNo;//REGNO使用登记证号
+	private String regDate;//REGDATE发证时间
+	private String regValidity;//REGVALIDITY证件有效期
+	private String regUnit;//REGUNIT发证单位
+	private int cylinderType;//CYLINDERTYPE气瓶类型
+	private String cylinderNo;//CYLINDERNO气瓶出厂编号
+	private String productName;//PRODUCTNAME生产厂家
+	private String productDate;//PRODUCTDATE生产日期
+	private String startuseDate;//STARTUSEDATE投用日期
+	private String yearLimit;//YEARLIMIT使用年限
+	private String productLicence;//PRODUCTLICENCE生产许可
+	private String productType;//PRODUCTTYPE气瓶产品型号
+	private float weight;//WEIGHT重量
+	private float vol;//VOL容积
+	private float thickness;//THICKNESS壁厚
+	private float press;//PRESS压力
+	private String material;//MATERIAL材质
+	private String installStation;//INSTALLSTATION安装单位
+	private String installCert;//INSTALLCERT安装合格证
+	private String installDate;//INSTALLDATE安装时间
+	private String monitorStation;//MONITORSTATION监检单位
+	private String monitorCert;//MONITORCERT监检合格证
+	private String monitorDate;//MONITORDATE监检时间
+	private String checkStation;//CHECKSTATION检验单位
+	private String checkCert;//CHECKCERT检验合格证
+	private String checkDate;//CHECKDATE检验时间
+	private String nextCheckDate;//NEXTCHECKDATE下次检验时间
+	private String beforeChecker;//BEFORECHECKER充装检查人员
+	private String beforeTime;//BEFORETIME充半检查时间
+	private String beforeItems;//BEFOREITEMS充装前检查项目
+	private int beforeResult;//BEFORERESULT充前检查结果
+	private String beforeException;//BEFOREEXCEPTION充前检查异常项目
+	private String carRemark;//CARREMARK车辆其它信息
+	private String cylinderRemark;//CYLINDERREMARK气瓶其它信息
+	private String beforeVerifier;//BEFOREVERIFIER充前审核人员
+	private String operatorName;//OPERATORNAME操作人员姓名
+	private String operatorId;//OPERATORID操作人员身份证号
+	private String operatorNo;//OPERATORNO操作人员编号
+	private String operatorType;//OPERATORTYPE操作人员类型
+	private String operatorDoc;//OPERATORDOC操作人员档案号
+	private String operatorCert;//OPERATORCERT操作人员班证书
+	private String operatorLicDate;//OPERATORLICDATE发证时间
+	private String operatorLicValidity;//OPERATORLICVALIDITY证书有效期
+	private String machineFactory;//MACHINEFACTORY充装设备厂家
+	private String machineNo;//MACHINENO充装设备编号
+	private String machineName;//MACHINENAME充装设备名称
+	private String gunNo;//GUNNO充装枪号
+	private String fillStartTime;//FILLSTARTTIME充装时间
+	private int fillBeforePress;//FILLBEFOREPRESS充前压力
+	private String fillEndTime;//FILLENDTIME充装结束时间
+	private int fillEndPress;//FILLENDPRESS充装结束压力
+	private int fillUnit;//FILLUNIT充装量单位
+	private int fillNum;//FILLNUM充装量
+	private int fillDensity;//FILLDENSITY充装密度
+	private float money;//MONEY金额
+	private String afterChecker;//AFTERCHECKER充后检查人员
+	private String afterTime;//AFTERTIME充后检查时间
+	private String afterTimes;//AFTERITEMS充后检查项目
+	private int afterResult;//AFTERRESULT充后结果
+	private String afterException;//AFTEREXCEPTION充后检查异常项目
+	private String afterVerifier;//AFTERVERIFIER充后审核人员
+	private String remark;//REMARK备注及其它信息
+	
+	
+	private String stationName;//STATIONNAME站名称
+	private String plateTypeName;//车牌类型名称
+	private String pgetPlateColorName;//车牌颜色
+	private String cylinderTypeName;//气瓶类型名称
+	
+	
+	public String getGuid() {
+		return guid;
+	}
+	public void setGuid(String guid) {
+		this.guid = guid;
+	}
+	public String getStationNo() {
+		return stationNo;
+	}
+	public void setStationNo(String stationNo) {
+		this.stationNo = stationNo;
+	}
+	public String getCarNo() {
+		return carNo;
+	}
+	public void setCarNo(String carNo) {
+		this.carNo = carNo;
+	}
+	public int getPlateType() {
+		return plateType;
+	}
+	public void setPlateType(int plateType) {
+		this.plateType = plateType;
+	}
+	public int getPlateColor() {
+		return plateColor;
+	}
+	public void setPlateColor(int plateColor) {
+		this.plateColor = plateColor;
+	}
+	public String getMedium() {
+		return medium;
+	}
+	public void setMedium(String medium) {
+		this.medium = medium;
+	}
+	public String getRegNo() {
+		return regNo;
+	}
+	public void setRegNo(String regNo) {
+		this.regNo = regNo;
+	}
+	public String getRegDate() {
+		return regDate;
+	}
+	public void setRegDate(String regDate) {
+		this.regDate = regDate;
+	}
+	public String getRegValidity() {
+		return regValidity;
+	}
+	public void setRegValidity(String regValidity) {
+		this.regValidity = regValidity;
+	}
+	public String getRegUnit() {
+		return regUnit;
+	}
+	public void setRegUnit(String regUnit) {
+		this.regUnit = regUnit;
+	}
+	public int getCylinderType() {
+		return cylinderType;
+	}
+	public void setCylinderType(int cylinderType) {
+		this.cylinderType = cylinderType;
+	}
+	public String getCylinderNo() {
+		return cylinderNo;
+	}
+	public void setCylinderNo(String cylinderNo) {
+		this.cylinderNo = cylinderNo;
+	}
+	public String getProductName() {
+		return productName;
+	}
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+	public String getProductDate() {
+		return productDate;
+	}
+	public void setProductDate(String productDate) {
+		this.productDate = productDate;
+	}
+	public String getStartuseDate() {
+		return startuseDate;
+	}
+	public void setStartuseDate(String startuseDate) {
+		this.startuseDate = startuseDate;
+	}
+	public String getYearLimit() {
+		return yearLimit;
+	}
+	public void setYearLimit(String yearLimit) {
+		this.yearLimit = yearLimit;
+	}
+	public String getProductLicence() {
+		return productLicence;
+	}
+	public void setProductLicence(String productLicence) {
+		this.productLicence = productLicence;
+	}
+	public String getProductType() {
+		return productType;
+	}
+	public void setProductType(String productType) {
+		this.productType = productType;
+	}
+	public float getWeight() {
+		return weight;
+	}
+	public void setWeight(float weight) {
+		this.weight = weight;
+	}
+	public float getVol() {
+		return vol;
+	}
+	public void setVol(float vol) {
+		this.vol = vol;
+	}
+	public float getThickness() {
+		return thickness;
+	}
+	public void setThickness(float thickness) {
+		this.thickness = thickness;
+	}
+	public float getPress() {
+		return press;
+	}
+	public void setPress(float press) {
+		this.press = press;
+	}
+	public String getMaterial() {
+		return material;
+	}
+	public void setMaterial(String material) {
+		this.material = material;
+	}
+	public String getInstallStation() {
+		return installStation;
+	}
+	public void setInstallStation(String installStation) {
+		this.installStation = installStation;
+	}
+	public String getInstallCert() {
+		return installCert;
+	}
+	public void setInstallCert(String installCert) {
+		this.installCert = installCert;
+	}
+	public String getInstallDate() {
+		return installDate;
+	}
+	public void setInstallDate(String installDate) {
+		this.installDate = installDate;
+	}
+	public String getMonitorStation() {
+		return monitorStation;
+	}
+	public void setMonitorStation(String monitorStation) {
+		this.monitorStation = monitorStation;
+	}
+	public String getMonitorCert() {
+		return monitorCert;
+	}
+	public void setMonitorCert(String monitorCert) {
+		this.monitorCert = monitorCert;
+	}
+	public String getMonitorDate() {
+		return monitorDate;
+	}
+	public void setMonitorDate(String monitorDate) {
+		this.monitorDate = monitorDate;
+	}
+	public String getCheckStation() {
+		return checkStation;
+	}
+	public void setCheckStation(String checkStation) {
+		this.checkStation = checkStation;
+	}
+	public String getCheckCert() {
+		return checkCert;
+	}
+	public void setCheckCert(String checkCert) {
+		this.checkCert = checkCert;
+	}
+	public String getCheckDate() {
+		return checkDate;
+	}
+	public void setCheckDate(String checkDate) {
+		this.checkDate = checkDate;
+	}
+	public String getNextCheckDate() {
+		return nextCheckDate;
+	}
+	public void setNextCheckDate(String nextCheckDate) {
+		this.nextCheckDate = nextCheckDate;
+	}
+	public String getBeforeChecker() {
+		return beforeChecker;
+	}
+	public void setBeforeChecker(String beforeChecker) {
+		this.beforeChecker = beforeChecker;
+	}
+	public String getBeforeTime() {
+		return beforeTime;
+	}
+	public void setBeforeTime(String beforeTime) {
+		this.beforeTime = beforeTime;
+	}
+	public String getBeforeItems() {
+		return beforeItems;
+	}
+	public void setBeforeItems(String beforeItems) {
+		this.beforeItems = beforeItems;
+	}
+	public int getBeforeResult() {
+		return beforeResult;
+	}
+	public void setBeforeResult(int beforeResult) {
+		this.beforeResult = beforeResult;
+	}
+	public String getBeforeException() {
+		return beforeException;
+	}
+	public void setBeforeException(String beforeException) {
+		this.beforeException = beforeException;
+	}
+	public String getCarRemark() {
+		return carRemark;
+	}
+	public void setCarRemark(String carRemark) {
+		this.carRemark = carRemark;
+	}
+	public String getCylinderRemark() {
+		return cylinderRemark;
+	}
+	public void setCylinderRemark(String cylinderRemark) {
+		this.cylinderRemark = cylinderRemark;
+	}
+	public String getBeforeVerifier() {
+		return beforeVerifier;
+	}
+	public void setBeforeVerifier(String beforeVerifier) {
+		this.beforeVerifier = beforeVerifier;
+	}
+	public String getOperatorName() {
+		return operatorName;
+	}
+	public void setOperatorName(String operatorName) {
+		this.operatorName = operatorName;
+	}
+	public String getOperatorId() {
+		return operatorId;
+	}
+	public void setOperatorId(String operatorId) {
+		this.operatorId = operatorId;
+	}
+	public String getOperatorNo() {
+		return operatorNo;
+	}
+	public void setOperatorNo(String operatorNo) {
+		this.operatorNo = operatorNo;
+	}
+	public String getOperatorType() {
+		return operatorType;
+	}
+	public void setOperatorType(String operatorType) {
+		this.operatorType = operatorType;
+	}
+	public String getOperatorDoc() {
+		return operatorDoc;
+	}
+	public void setOperatorDoc(String operatorDoc) {
+		this.operatorDoc = operatorDoc;
+	}
+	public String getOperatorCert() {
+		return operatorCert;
+	}
+	public void setOperatorCert(String operatorCert) {
+		this.operatorCert = operatorCert;
+	}
+	public String getOperatorLicDate() {
+		return operatorLicDate;
+	}
+	public void setOperatorLicDate(String operatorLicDate) {
+		this.operatorLicDate = operatorLicDate;
+	}
+	public String getOperatorLicValidity() {
+		return operatorLicValidity;
+	}
+	public void setOperatorLicValidity(String operatorLicValidity) {
+		this.operatorLicValidity = operatorLicValidity;
+	}
+	public String getMachineFactory() {
+		return machineFactory;
+	}
+	public void setMachineFactory(String machineFactory) {
+		this.machineFactory = machineFactory;
+	}
+	public String getMachineNo() {
+		return machineNo;
+	}
+	public void setMachineNo(String machineNo) {
+		this.machineNo = machineNo;
+	}
+	public String getMachineName() {
+		return machineName;
+	}
+	public void setMachineName(String machineName) {
+		this.machineName = machineName;
+	}
+	public String getGunNo() {
+		return gunNo;
+	}
+	public void setGunNo(String gunNo) {
+		this.gunNo = gunNo;
+	}
+	public String getFillStartTime() {
+		return fillStartTime;
+	}
+	public void setFillStartTime(String fillStartTime) {
+		this.fillStartTime = fillStartTime;
+	}
+	public int getFillBeforePress() {
+		return fillBeforePress;
+	}
+	public void setFillBeforePress(int fillBeforePress) {
+		this.fillBeforePress = fillBeforePress;
+	}
+	public String getFillEndTime() {
+		return fillEndTime;
+	}
+	public void setFillEndTime(String fillEndTime) {
+		this.fillEndTime = fillEndTime;
+	}
+	public int getFillEndPress() {
+		return fillEndPress;
+	}
+	public void setFillEndPress(int fillEndPress) {
+		this.fillEndPress = fillEndPress;
+	}
+	public int getFillUnit() {
+		return fillUnit;
+	}
+	public void setFillUnit(int fillUnit) {
+		this.fillUnit = fillUnit;
+	}
+	public int getFillNum() {
+		return fillNum;
+	}
+	public void setFillNum(int fillNum) {
+		this.fillNum = fillNum;
+	}
+	public int getFillDensity() {
+		return fillDensity;
+	}
+	public void setFillDensity(int fillDensity) {
+		this.fillDensity = fillDensity;
+	}
+	public float getMoney() {
+		return money;
+	}
+	public void setMoney(float money) {
+		this.money = money;
+	}
+	public String getAfterChecker() {
+		return afterChecker;
+	}
+	public void setAfterChecker(String afterChecker) {
+		this.afterChecker = afterChecker;
+	}
+	public String getAfterTime() {
+		return afterTime;
+	}
+	public void setAfterTime(String afterTime) {
+		this.afterTime = afterTime;
+	}
+	public String getAfterTimes() {
+		return afterTimes;
+	}
+	public void setAfterTimes(String afterTimes) {
+		this.afterTimes = afterTimes;
+	}
+	public int getAfterResult() {
+		return afterResult;
+	}
+	public void setAfterResult(int afterResult) {
+		this.afterResult = afterResult;
+	}
+	public String getAfterException() {
+		return afterException;
+	}
+	public void setAfterException(String afterException) {
+		this.afterException = afterException;
+	}
+	public String getAfterVerifier() {
+		return afterVerifier;
+	}
+	public void setAfterVerifier(String afterVerifier) {
+		this.afterVerifier = afterVerifier;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public String getStationName() {
+		return stationName;
+	}
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+	public String getPlateTypeName() {
+		if (StringUtils.isNotEmpty(plateTypeName)) {
+			return plateTypeName;
+		}
+		return Tool.getPlateTypeName(plateType);
+	}
+	public void setPlateTypeName(String plateTypeName) {
+		this.plateTypeName = plateTypeName;
+	}
+	public String getPgetPlateColorName() {
+		if (StringUtils.isNotEmpty(pgetPlateColorName)) {
+			return pgetPlateColorName;
+		}
+		return Tool.getPlateColorName(plateColor);
+	}
+	public void setPgetPlateColorName(String pgetPlateColorName) {
+		this.pgetPlateColorName = pgetPlateColorName;
+	}
+	public String getCylinderTypeName() {
+		if (StringUtils.isNotEmpty(cylinderTypeName)) {
+			return cylinderTypeName;
+		}
+		return Tool.getCylinderTypeName(cylinderType);
+	}
+	public void setCylinderTypeName(String cylinderTypeName) {
+		this.cylinderTypeName = cylinderTypeName;
+	}
+	
+	
+}

+ 6 - 2
src/com/runzhixing/config/config.properties

@@ -2,8 +2,7 @@ driver=oracle.jdbc.OracleDriver
 #url=jdbc:oracle:thin:@//61.188.37.164:3355/SCJGQPBQ
 #username=cngdba
 #password=nxBot*5087
-#url=jdbc:oracle:thin:@//192.168.1.8:1521/cng
-url=jdbc:oracle:thin:@//110.185.196.36:11521/cng
+url=jdbc:oracle:thin:@//192.168.1.8:1521/cng
 username=cngdba
 password=temp1234
 whitelist=localhost;127.0.0.1;218.95.174.32;nx.cngrfid.com;111.51.123.243;192.168.1.110;110.185.196.36;110.185.230.12;110.185.229.196;61.188.37.164;192.168.1.1;
@@ -29,3 +28,8 @@ statistics_path=D://statistics
 secret_key=nxycxzywt
 nx_user=ningxia
 nx_pwd=nx123456
+
+#默认false,不显示
+chg_start=true
+#默认true显示
+place_start=true

+ 12 - 1
src/com/runzhixing/filter/MyFilter.java

@@ -56,6 +56,8 @@ public class MyFilter implements Filter {
 	public static String secretKey = "";
 	public static String nxUser = "";
 	public static String nxPwd = "";
+	public static boolean chgStart= false;
+	public static boolean placeStart= true;
 	
 	public void destroy() {
 
@@ -304,7 +306,16 @@ public class MyFilter implements Filter {
 			statisticsPath = properties.getProperty("statistics_path");
 			secretKey = properties.getProperty("secret_key");
 			nxUser = properties.getProperty("nx_user");
-			nxPwd = properties.getProperty("nx_pwd");
+			
+			String chg = properties.getProperty("chg_start");
+			if (!Tool.isNullOrEmpty(chg) && chg.trim().toUpperCase().equals("TRUE")) {
+				chgStart = true;
+			}
+			String place = properties.getProperty("place_start");
+			if (!Tool.isNullOrEmpty(place) && place.trim().toUpperCase().equals("FALSE")) {
+				placeStart = false;
+			}
+			
 //			saveImgPath ="C:\\tomcat\\Tomcat 8.5\\webapps\\cngningxia2";
 			baseUrl=properties.getProperty("unified_login_baseUrl");
 			redirectUri=properties.getProperty("unified_login_redirectUrl");

+ 555 - 553
src/com/runzhixing/packageProcedure/FillingDataQueryProcedure.java

@@ -1,553 +1,555 @@
-package com.runzhixing.packageProcedure;
-
-import java.io.UnsupportedEncodingException;
-import java.sql.CallableStatement;
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.struts2.ServletActionContext;
-
-import java.sql.ResultSetMetaData;
-
-import com.runzhixing.bean.CHGFillLog;
-import com.runzhixing.bean.CNGFillLog;
-import com.runzhixing.bean.CNGFillLog1;
-import com.runzhixing.bean.CNGMachineState;
-import com.runzhixing.bean.CngFillLogs;
-import com.runzhixing.bean.User;
-import com.runzhixing.constant.Constant;
-import com.runzhixing.db.JDBCUtils;
-import com.runzhixing.tool.StringUtil;
-import com.runzhixing.tool.Tool;
-import com.runzhixing.tool.Util;
-import com.sun.xml.internal.ws.util.xml.ContentHandlerToXMLStreamWriter;
-
-import oracle.jdbc.OracleTypes;
-import sun.util.logging.resources.logging;
-
-
-/**
- * 充装数据查询存储函数
- * @author 小黄
- *
- */
-public class FillingDataQueryProcedure {
-	
-	/**
-	 * 外部调用充装数据接口
-	 * @param un
-	 * @param ps
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	public List<CngFillLogs> fillDataQuery(int pagesize, int pageno,String operatorNo, String stationNo, String machineNo,String gunNo, String carNo, int appType, int fillState,Date startsTime, Date endsTime,int cylinderType){
-		List<CngFillLogs> list=new ArrayList<CngFillLogs>();
-		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
-//		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
-		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
-		Connection conn =null;
-		CallableStatement call = null;
-		ResultSet rs = null;
-		try {
-			conn = JDBCUtils.getConnection();
-			call = (CallableStatement) conn.prepareCall(sql);
-			call.registerOutParameter(1, Types.INTEGER);//返回值
-			call.setInt(2 ,pagesize);//每次取的行数
-			call.setInt(3, pageno);//第几页
-			call.setString(4,operatorNo);//操作员编号
-			call.setString(5,stationNo);//充装点编号
-			call.setString(6,machineNo);//设备编号
-			call.setString(7,gunNo);//气枪编号
-			call.setString(8,carNo);//车牌号
-			call.setInt(9,appType);//应用类型
-			call.setInt(10, fillState);//充装状态
-			call.setDate(11, startsTime);
-			call.setDate(12, endsTime);
-			call.setInt(13, cylinderType);
-			call.setInt(14, -1);
-			call.registerOutParameter(15,Types.INTEGER);//总行数
-			call.registerOutParameter(16, OracleTypes.CURSOR);//结果集
-			call.execute();
-			int total = ((Integer) call.getObject(15)).intValue();
-			HttpServletRequest req = ServletActionContext.getRequest();
-			User user = new User();
-			user.setFillingSum(total);
-			req.getSession().setAttribute(Constant.fillingSum+"123", user);
-			rs = (ResultSet) call.getObject(16);
-			while(rs.next()){
-				CngFillLogs log = new CngFillLogs();
-//				log.setStationNo(rs.getString("cngstationno"));
-				log.setStationNo(rs.getString("cngstationname"));
-//				log.setMachineNo(rs.getString("cngmachineno"));
-				log.setMachineNo(rs.getString("cngmachinename"));
-				log.setGunNo(rs.getInt("cnggunno"));
-				log.setMedia(rs.getInt("BENEFITTYPE"));
-//				log.setOperator(rs.getString("cngoperatorno"));
-				log.setOperator(rs.getString("cngoperatorname"));
-				log.setFillState(rs.getString("fillstate"));
-				log.setFillTime(rs.getTimestamp("filltime"));
-				log.setEndTime(rs.getTimestamp("endtime"));
-				log.setFillCheckName1(rs.getString("FILLCHECKNNAME1"));
-				log.setFillCheckName2(rs.getString("FILLCHECKNAME2"));
-				log.setCarNo(rs.getString("carno"));
-				log.setAppType(rs.getString("apptype"));
-				log.setPlateType(rs.getString("platetypename"));
-				log.setCylinderNum(rs.getInt("cylindernum"));
-				log.setRegNo(rs.getString("regno"));
-				log.setNowNumber(rs.getInt("nownumber"));
-				log.setLowPress(rs.getFloat("lowpress"));
-				log.setHighPress(rs.getFloat("highpress"));
-				log.setFlux(rs.getFloat("flux"));
-				log.setMoney(rs.getFloat("money"));
-				
-				list.add(log);
-				log=null;
-				
-				
-				
-			}	
-			reValues.put(1, list);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally{
-			JDBCUtils.release(conn, call, rs);
-		}
-		return (List<CngFillLogs>) reValues.get(1);
-	}
-	
-	/**
-	 * 充装数据查询存储函数
-	 * @param un
-	 * @param ps
-	 * @return
-	 */
-	@SuppressWarnings("unchecked")
-	public List<CNGFillLog> fillingDataQuery(int pagesize, int pageno,String operatorNo, String stationNo, String machineNo,String gunNo, String carNo, int appType, int fillState,Date startsTime, Date endsTime,int cylinderType,int fillCheck2){
-		List<CNGFillLog> list=new ArrayList<CNGFillLog>();
-		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
-//		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
-		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
-		Connection conn =null;
-		
-		CallableStatement call = null;
-		
-		ResultSet rs = null;
-		try {
-			conn = JDBCUtils.getConnection();
-			
-			call = (CallableStatement) conn.prepareCall(sql);
-			call.registerOutParameter(1, Types.INTEGER);//返回值
-			
-			call.setInt(2 ,pagesize);//每次取的行数
-			call.setInt(3, pageno);//第几页
-			call.setString(4,operatorNo);//操作员编号
-			call.setString(5,stationNo);//充装点编号
-			call.setString(6,machineNo);//设备编号
-			call.setString(7,gunNo);//气枪编号
-			call.setString(8,carNo);//车牌号
-			call.setInt(9,appType);//应用类型
-			call.setInt(10, fillState);//充装状态
-			call.setDate(11, startsTime);
-			call.setDate(12, endsTime);
-			call.setInt(13, cylinderType);
-			call.setInt(14, fillCheck2);//充后检查人员  -1全部  0无  1有
-			call.registerOutParameter(15,Types.INTEGER);//总行数
-			call.registerOutParameter(16, OracleTypes.CURSOR);//结果集
-			call.execute();
-			
-			int total = ((Integer) call.getObject(15)).intValue();
-			HttpServletRequest req = ServletActionContext.getRequest();
-			User user = new User();
-			user.setFillingSum(total);
-			req.getSession().setAttribute(Constant.fillingSum, user);
-			
-			rs = (ResultSet) call.getObject(16);
-//			Tool.printRsDetail(rs);
-			while(rs.next()){
-				CNGFillLog obj=new CNGFillLog();
-				obj.setAppType(rs.getString("apptype"));
-				obj.setCarNo(rs.getString("carno"));
-				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
-				obj.setCylinderNum(rs.getInt("cylindernum"));
-				obj.setEndTime(rs.getTimestamp("endtime"));
-				obj.setEndTime1(Util.jiequString(rs.getString("endtime"), 19));
-				obj.setFillState(rs.getString("fillstate"));
-				obj.setFillTime(rs.getTimestamp("filltime"));
-				obj.setFillTime1(Util.jiequString(rs.getString("filltime"), 19));
-				obj.setGunNo(rs.getInt("cnggunno"));
-				obj.setMachineNo(rs.getString("cngmachineno"));
-				obj.setMachineName(rs.getString("cngmachinename"));
-				
-				obj.setOperatorName(rs.getString("cngoperatorname"));
-				obj.setOperatorNo(rs.getString("cngoperatorno"));
-				
-				obj.setRegNo(rs.getString("regno"));
-				obj.setStationNo(rs.getString("cngstationno"));
-				obj.setStationName(rs.getString("cngstationname"));
-				
-				obj.setTagNo(rs.getString("tagno"));
-				obj.setTagType(rs.getInt("tagtype"));
-				obj.setTagUid(rs.getString("taguid"));
-				obj.setTac(rs.getString("tac"));
-				obj.setLeftNumber(rs.getString("leftnumber"));
-				obj.setNowNumber(rs.getInt("nownumber"));
-				obj.setLowPress(rs.getFloat("lowpress"));
-				obj.setHighPress(rs.getFloat("highpress"));
-				obj.setFlux(rs.getFloat("flux"));
-				obj.setMoney(rs.getFloat("money"));
-				obj.setPlateType(rs.getInt("platetype"));
-				obj.setPlateTypeName(rs.getString("platetypename"));
-				obj.setMedia(rs.getInt("BENEFITTYPE"));
-				obj.setFillStateNum(rs.getInt("fillstatenum"));
-				obj.setFillcheck(rs.getInt("FILLCHECK"));
-				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
-				
-				obj.setFILLCHECKNName1(rs.getString("FILLCHECKNNAME1"));
-				obj.setFILLCHECKNName2(rs.getString("FILLCHECKNAME2"));
-				obj.setFillMonitorName(rs.getString("FillMonitorName"));
-				
-				obj.setFILLCHECKNNo1(rs.getString("FILLCHECKNO1"));
-				obj.setFILLCHECKNNo2(rs.getString("FILLCHECKNO2"));
-				obj.setFillMonitorNo(rs.getString("FillMonitorNo"));
-				list.add(obj);
-				obj=null;
-				
-				
-				
-			}	
-			reValues.put(1, list);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally{
-			JDBCUtils.release(conn, call, rs);
-		}
-		return (List<CNGFillLog>) reValues.get(1);
-	}
-	
-	
-	private String fixCarNo(String carNo) {
-	    StringBuilder result = new StringBuilder();
-	    if (carNo!=null && !carNo.equals("")) {
-		byte[] t;
-		try {
-		    t = carNo.getBytes("utf-8");
-		    for (int i = 0;i < t.length; ++i) {
-			result.append(String.format("%02X", t[i]));
-		    }
-		} catch (UnsupportedEncodingException e) {
-		    // TODO Auto-generated catch block
-		    e.printStackTrace();
-		}
-		
-	    }
-	    return result.toString();
-	}
-
-	public List<CNGFillLog> latelyFill(String day1, String day2,
-			String carGuid, String cylinderGuid) {
-		List<CNGFillLog> list=new ArrayList<CNGFillLog>();
-		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
-		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLogByDay(?,?,?,?,?)}";
-		
-		Connection conn =null;
-		
-		CallableStatement call = null;
-		
-		ResultSet rs = null;
-		try {
-			conn = JDBCUtils.getConnection();
-			
-			call = (CallableStatement) conn.prepareCall(sql);
-			int index=1;
-			call.registerOutParameter(index, Types.INTEGER);index++;
-			call.setString(index,carGuid);index++;
-			call.setString(index,cylinderGuid);index++;
-			call.setInt(index ,Integer.parseInt(day1));index++;
-			call.setInt(index, Integer.parseInt(day2));index++;
-			call.registerOutParameter(index, OracleTypes.CURSOR);
-			call.execute();
-			
-			
-			rs = (ResultSet) call.getObject(index);
-			while(rs.next()){
-				CNGFillLog obj=new CNGFillLog();
-				obj.setAppType(rs.getString("apptype"));
-				obj.setCarNo(rs.getString("carno"));
-				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
-				obj.setCylinderNum(rs.getInt("cylindernum"));
-//				obj.setEndTime(rs.getTimestamp("endtime"));
-				obj.setEndTime1(Util.jiequString(rs.getString("endtime"), 19));
-				obj.setFillState(rs.getString("fillstate"));
-//				obj.setFillTime(rs.getTimestamp("filltime"));
-				obj.setFillTime1(Util.jiequString(rs.getString("filltime"), 19));
-				obj.setGunNo(rs.getInt("cnggunno"));
-				obj.setMachineNo(rs.getString("cngmachineno"));
-				obj.setOperatorName(rs.getString("cngoperatorno"));
-				obj.setRegNo(rs.getString("regno"));
-				obj.setStationNo(rs.getString("cngstationno"));
-				obj.setTagNo(rs.getString("tagno"));
-				obj.setTagType(rs.getInt("tagtype"));
-				obj.setTagUid(rs.getString("taguid"));
-				obj.setLeftNumber(rs.getString("leftnumber"));
-				obj.setNowNumber(rs.getInt("nownumber"));
-				obj.setLowPress(rs.getFloat("lowpress"));
-				obj.setHighPress(rs.getFloat("highpress"));
-				obj.setFlux(rs.getFloat("flux"));
-				obj.setMoney(rs.getFloat("money"));
-				obj.setPlateType(rs.getInt("platetype"));
-				obj.setPlateTypeName(rs.getString("platetypename"));
-				obj.setMedia(rs.getInt("BENEFITTYPE"));
-				obj.setFillStateNum(rs.getInt("fillstatenum"));
-				obj.setFillcheck(rs.getInt("FILLCHECK"));
-				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
-				list.add(obj);
-				obj=null;
-				
-				
-				
-			}	
-			reValues.put(1, list);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally{
-			JDBCUtils.release(conn, call, rs);
-		}
-		return (List<CNGFillLog>) reValues.get(1);
-	}
-	public List<CNGFillLog1> latelyFill123(String day1, String day2,
-			String carGuid, String cylinderGuid) {
-		List<CNGFillLog1> list=new ArrayList<CNGFillLog1>();
-		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
-		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLogByDay(?,?,?,?,?)}";
-		Connection conn =null;
-		
-		CallableStatement call = null;
-		
-		ResultSet rs = null;
-		try {
-			conn = JDBCUtils.getConnection();
-			
-			call = (CallableStatement) conn.prepareCall(sql);
-			int index=1;
-			call.registerOutParameter(index, Types.INTEGER);index++;
-			call.setString(index,carGuid);index++;
-			call.setString(index,cylinderGuid);index++;
-			call.setInt(index ,Integer.parseInt(day1));index++;
-			call.setInt(index, Integer.parseInt(day2));index++;
-			call.registerOutParameter(index, OracleTypes.CURSOR);
-			call.execute();
-			
-			
-			rs = (ResultSet) call.getObject(index);
-			while(rs.next()){
-				CNGFillLog1 obj = new CNGFillLog1();
-				obj.setAppType(rs.getString("apptype"));
-				obj.setCarNo(rs.getString("carno"));
-				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
-				obj.setCylinderNum(rs.getInt("cylindernum"));
-				obj.setEndTime(Util.jiequString(rs.getString("endtime"), 19));
-				obj.setFillState(rs.getString("fillstate"));
-				obj.setFillTime(Util.jiequString(rs.getString("filltime"), 19));
-				obj.setGunNo(rs.getInt("cnggunno"));
-				obj.setMachineNo(rs.getString("cngmachineno"));
-				obj.setOperatorName(rs.getString("cngoperatorno"));
-				obj.setRegNo(rs.getString("regno"));
-				obj.setStationNo(rs.getString("cngstationno"));
-				obj.setTagNo(rs.getString("tagno"));
-				obj.setTagType(rs.getInt("tagtype"));
-				obj.setTagUid(rs.getString("taguid"));
-				obj.setLeftNumber(rs.getString("leftnumber"));
-				obj.setNowNumber(rs.getInt("nownumber"));
-				obj.setLowPress(rs.getFloat("lowpress"));
-				obj.setHighPress(rs.getFloat("highpress"));
-				obj.setFlux(rs.getFloat("flux"));
-				obj.setMoney(rs.getFloat("money"));
-				obj.setPlateType(rs.getInt("platetype"));
-				obj.setPlateTypeName(rs.getString("platetypename"));
-				obj.setMedia(rs.getInt("BENEFITTYPE"));
-				obj.setFillStateNum(rs.getInt("fillstatenum"));
-				obj.setFillcheck(rs.getInt("FILLCHECK"));
-				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
-				list.add(obj);
-				obj=null;
-				
-				
-				
-			}	
-			reValues.put(1, list);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally{
-			JDBCUtils.release(conn, call, rs);
-		}
-		return (List<CNGFillLog1>) reValues.get(1);
-	}
-
-	/**
-	 * 查询氢气充装数据
-	 * @param pagesize
-	 * @param pageno
-	 * @param stationNo
-	 * @param carNo
-	 * @param startsTime
-	 * @param endsTime
-	 * @return 
-	 * @return List<CNGFillLog> 
-	 * @author yxh
-	 * @date 2022年9月17日下午9:08:01
-	 * @throws
-	 */
-	public List<CHGFillLog> chgFillingDataQuery(int pagesize, int pageno,String stationNo, String carNo,Date startsTime, Date endsTime) {
-		List<CHGFillLog> list=new ArrayList<CHGFillLog>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		int start = pagesize * (pageno-1);
-	    int end = pagesize * pageno;
-	    if (StringUtils.isEmpty(stationNo)) {
-	    	stationNo="";
-	    }
-	    
-		String sql = "select ROWNUM AS rn,cl.GUID,cl.STATIONNO,cl.CARNO,cl.PLATETYPE,cl.PLATECOLOR,cl.MEDIUM,cl.REGNO,cl.REGDATE,cl.REGVALIDITY,"
-				+ "cl.REGUNIT,cl.CYLINDERTYPE,cl.CYLINDERNO,cl.PRODUCTNAME,cl.PRODUCTDATE,cl.STARTUSEDATE,cl.YEARLIMIT,cl.PRODUCTLICENCE,"
-				+ "cl.PRODUCTTYPE,cl.WEIGHT,cl.VOL,cl.THICKNESS,cl.PRESS,cl.MATERIAL,cl.INSTALLSTATION,cl.INSTALLCERT,cl.INSTALLDATE,cl.MONITORSTATION,"
-				+ "cl.MONITORCERT,cl.MONITORDATE,cl.CHECKSTATION,cl.CHECKCERT,cl.CHECKDATE,cl.NEXTCHECKDATE,cl.BEFORECHECKER,cl.BEFORETIME,"
-				+ "cl.BEFOREITEMS,cl.BEFORERESULT,cl.BEFOREEXCEPTION,cl.CARREMARK,cl.CYLINDERREMARK,cl.BEFOREVERIFIER,cl.OPERATORNAME,cl.OPERATORID,"
-				+ "cl.OPERATORNO,cl.OPERATORTYPE,cl.OPERATORDOC,cl.OPERATORCERT,cl.OPERATORLICDATE,cl.OPERATORLICVALIDITY,cl.MACHINEFACTORY,"
-				+ "cl.MACHINENO,cl.MACHINENAME,cl.GUNNO,cl.FILLSTARTTIME,cl.FILLBEFOREPRESS,cl.FILLENDTIME,cl.FILLENDPRESS,cl.FILLUNIT,cl.FILLNUM,"
-				+ "cl.FILLDENSITY,cl.MONEY,cl.AFTERCHECKER,cl.AFTERTIME,cl.AFTERITEMS,cl.AFTERRESULT,cl.AFTEREXCEPTION,cl.AFTERVERIFIER,cl.REMARK,"
-				+ "s.STATIONNAME "
-				+ "from dyndba.tb_chgfill_log cl "
-				+ " LEFT JOIN CNGDBA.TB_CNGSTATION s ON cl.STATIONNO = s.STATIONNO"
-				+ " WHERE cl.STATIONNO like CONCAT('"+stationNo+"', '%')  ";
-		if (StringUtils.isNotEmpty(carNo)) {
-			sql += " AND cl.CARNO LIKE CONCAT('%',CONCAT('"+carNo+"', '%')) ";
-		}
-		if (ObjectUtils.isNotEmpty(startsTime)) {
-			sql += " AND cl.FILLSTARTTIME > TO_DATE('"+sdf.format(startsTime)+"', 'yyyy-MM-dd HH:MI:ss') ";
-		}
-		if (ObjectUtils.isNotEmpty(endsTime)) {
-			sql += " AND cl.FILLSTARTTIME <= TO_DATE('"+sdf.format(endsTime)+"', 'yyyy-MM-dd HH:MI:ss') ";
-		}
-		
-		String countSql = "select count(0) as count from ("+sql+")";
-		Connection conn =null;
-		PreparedStatement ps0 =null;
-		PreparedStatement ps =null;
-		ResultSet rs0 = null;
-		ResultSet rs = null;
-		try {
-			HttpServletRequest req = ServletActionContext.getRequest();
-			conn = JDBCUtils.getConnection();
-			ps0 = conn.prepareStatement(countSql);
-			rs0 = ps0.executeQuery();
-			while(rs0.next()) {
-				User user = new User();
-				user.setFillingSum(rs0.getInt("count"));
-				req.getSession().setAttribute(Constant.fillingSum, user);
-			}
-			String pageSql = "SELECT * FROM ("+sql+") WHERE rn BETWEEN "+start+" AND "+end;
-			ps = conn.prepareStatement(pageSql);
-			rs = ps.executeQuery();
-			while(rs.next()){
-				CHGFillLog obj=new CHGFillLog();
-				obj.setGuid(rs.getString("GUID"));
-				obj.setStationNo(rs.getString("STATIONNO"));//STATIONNO站编号
-				obj.setCarNo(rs.getString("CARNO"));//CARNO车牌号
-				obj.setPlateType(rs.getInt("PLATETYPE"));//PLATETYPE车牌类型
-				obj.setPlateColor(rs.getInt("PLATECOLOR"));//PLATECOLOR车牌颜色
-				obj.setMedium(rs.getString("MEDIUM"));//MEDIUM充装介质
-				obj.setRegNo(rs.getString("REGNO"));//REGNO使用登记证号
-				obj.setRegDate(rs.getDate("REGDATE"));//REGDATE发证时间
-				obj.setRegValidity(rs.getDate("REGVALIDITY"));//REGVALIDITY证件有效期
-				obj.setRegUnit(rs.getString("REGUNIT"));//REGUNIT发证单位
-				obj.setCylinderType(rs.getInt("CYLINDERTYPE"));//CYLINDERTYPE气瓶类型
-				obj.setCylinderNo(rs.getString("CYLINDERNO"));//CYLINDERNO气瓶出厂编号
-				obj.setProductName(rs.getString("PRODUCTNAME"));//PRODUCTNAME生产厂家
-				obj.setProductDate(rs.getDate("PRODUCTDATE"));//PRODUCTDATE生产日期
-				obj.setStartuseDate(rs.getDate("STARTUSEDATE"));//STARTUSEDATE投用日期
-				obj.setYearLimit(rs.getDate("YEARLIMIT"));//YEARLIMIT使用年限
-				obj.setProductLicence(rs.getString("PRODUCTLICENCE"));//PRODUCTLICENCE生产许可
-				obj.setProductType(rs.getString("PRODUCTTYPE"));//PRODUCTTYPE气瓶产品型号
-				obj.setWeight(rs.getFloat("WEIGHT"));//WEIGHT重量
-				obj.setVol(rs.getFloat("VOL"));//VOL容积
-				obj.setThickness(rs.getFloat("THICKNESS"));//THICKNESS壁厚
-				obj.setPress(rs.getFloat("PRESS"));//PRESS压力
-				obj.setMaterial(rs.getString("MATERIAL"));//MATERIAL材质
-				obj.setInstallStation(rs.getString("INSTALLSTATION"));//INSTALLSTATION安装单位
-				obj.setInstallCert(rs.getString("INSTALLCERT"));//INSTALLCERT安装合格证
-				obj.setInstallDate(rs.getDate("INSTALLDATE"));//INSTALLDATE安装时间
-				obj.setMonitorStation(rs.getString("MONITORSTATION"));//MONITORSTATION监检单位
-				obj.setMonitorCert(rs.getString("MONITORCERT"));//MONITORCERT监检合格证
-				obj.setMonitorDate(rs.getDate("MONITORDATE"));//MONITORDATE监检时间
-				obj.setCheckStation(rs.getString("CHECKSTATION"));//CHECKSTATION检验单位
-				obj.setCheckCert(rs.getString("CHECKCERT"));//CHECKCERT检验合格证
-				obj.setCheckDate(rs.getDate("CHECKDATE"));//CHECKDATE检验时间
-				obj.setNextCheckDate(rs.getDate("NEXTCHECKDATE"));//NEXTCHECKDATE下次检验时间
-				obj.setBeforeChecker(rs.getString("BEFORECHECKER"));//BEFORECHECKER充装检查人员
-				obj.setBeforeTime(rs.getDate("BEFORETIME"));//BEFORETIME充半检查时间
-				obj.setBeforeItems(rs.getString("BEFOREITEMS"));//BEFOREITEMS充装前检查项目
-				obj.setBeforeResult(rs.getInt("BEFORERESULT"));//BEFORERESULT充前检查结果
-				obj.setBeforeException(rs.getString("BEFOREEXCEPTION"));//BEFOREEXCEPTION充前检查异常项目
-				obj.setCarRemark(rs.getString("CARREMARK"));//CARREMARK车辆其它信息
-				obj.setCylinderRemark(rs.getString("CYLINDERREMARK"));//CYLINDERREMARK气瓶其它信息
-				obj.setBeforeVerifier(rs.getString("BEFOREVERIFIER"));//BEFOREVERIFIER充前审核人员
-				obj.setOperatorName(rs.getString("OPERATORNAME"));//OPERATORNAME操作人员姓名
-				obj.setOperatorId(rs.getString("OPERATORID"));//OPERATORID操作人员身份证号
-				obj.setOperatorNo(rs.getString("OPERATORNO"));//OPERATORNO操作人员编号
-				obj.setOperatorType(rs.getString("OPERATORTYPE"));//OPERATORTYPE操作人员类型
-				obj.setOperatorDoc(rs.getString("OPERATORDOC"));//OPERATORDOC操作人员档案号
-				obj.setOperatorCert(rs.getString("OPERATORCERT"));//OPERATORCERT操作人员班证书
-				obj.setOperatorLicDate(rs.getDate("OPERATORLICDATE"));//OPERATORLICDATE发证时间
-				obj.setOperatorLicValidity(rs.getDate("OPERATORLICVALIDITY"));//OPERATORLICVALIDITY证书有效期
-				obj.setMachineFactory(rs.getString("MACHINEFACTORY"));//MACHINEFACTORY充装设备厂家
-				obj.setMachineNo(rs.getString("MACHINENO"));//MACHINENO充装设备编号
-				obj.setMachineName(rs.getString("MACHINENAME"));//MACHINENAME充装设备名称
-				obj.setGunNo(rs.getString("GUNNO"));//GUNNO充装枪号
-				obj.setFillStartTime(rs.getDate("FILLSTARTTIME"));//FILLSTARTTIME充装时间
-				obj.setFillBeforePress(rs.getInt("FILLBEFOREPRESS"));//FILLBEFOREPRESS充前压力
-				obj.setFillEndTime(rs.getDate("FILLENDTIME"));//FILLENDTIME充装结束时间
-				obj.setFillEndPress(rs.getInt("FILLENDPRESS"));//FILLENDPRESS充装结束压力
-				obj.setFillUnit(rs.getInt("FILLUNIT"));//FILLUNIT充装量单位
-				obj.setFillNum(rs.getInt("FILLNUM"));//FILLNUM充装量
-				obj.setFillDensity(rs.getInt("FILLDENSITY"));//FILLDENSITY充装密度
-				obj.setMoney(rs.getFloat("MONEY"));//MONEY金额
-				obj.setAfterChecker(rs.getString("AFTERCHECKER"));//AFTERCHECKER充后检查人员
-				obj.setAfterTime(rs.getDate("AFTERTIME"));//AFTERTIME充后检查时间
-				obj.setAfterTimes(rs.getString("AFTERITEMS"));//AFTERITEMS充后检查项目
-				obj.setAfterResult(rs.getInt("AFTERRESULT"));//AFTERRESULT充后结果
-				obj.setAfterException(rs.getString("AFTEREXCEPTION"));//AFTEREXCEPTION充后检查异常项目
-				obj.setAfterVerifier(rs.getString("AFTERVERIFIER"));//AFTERVERIFIER充后审核人员
-				obj.setRemark(rs.getString("REMARK"));//REMARK备注及其它信息
-				
-				obj.setStationName(rs.getString("STATIONNAME"));//STATIONNAME站名称
-				list.add(obj);
-				obj=null;
-			}	
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally{
-			JDBCUtils.release(conn, ps, rs);
-			JDBCUtils.release(conn, ps0, rs0);
-		}
-		return list;
-	}
-
-}
+package com.runzhixing.packageProcedure;
+
+import java.io.UnsupportedEncodingException;
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.struts2.ServletActionContext;
+
+import java.sql.ResultSetMetaData;
+
+import com.runzhixing.bean.CHGFillLog;
+import com.runzhixing.bean.CNGFillLog;
+import com.runzhixing.bean.CNGFillLog1;
+import com.runzhixing.bean.CNGMachineState;
+import com.runzhixing.bean.CngFillLogs;
+import com.runzhixing.bean.User;
+import com.runzhixing.constant.Constant;
+import com.runzhixing.db.JDBCUtils;
+import com.runzhixing.tool.StringUtil;
+import com.runzhixing.tool.Tool;
+import com.runzhixing.tool.Util;
+import com.sun.xml.internal.ws.util.xml.ContentHandlerToXMLStreamWriter;
+
+import oracle.jdbc.OracleTypes;
+import sun.util.logging.resources.logging;
+
+
+/**
+ * 充装数据查询存储函数
+ * @author 小黄
+ *
+ */
+public class FillingDataQueryProcedure {
+	
+	/**
+	 * 外部调用充装数据接口
+	 * @param un
+	 * @param ps
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public List<CngFillLogs> fillDataQuery(int pagesize, int pageno,String operatorNo, String stationNo, String machineNo,String gunNo, String carNo, int appType, int fillState,Date startsTime, Date endsTime,int cylinderType){
+		List<CngFillLogs> list=new ArrayList<CngFillLogs>();
+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
+//		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
+		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
+		Connection conn =null;
+		CallableStatement call = null;
+		ResultSet rs = null;
+		try {
+			conn = JDBCUtils.getConnection();
+			call = (CallableStatement) conn.prepareCall(sql);
+			call.registerOutParameter(1, Types.INTEGER);//返回值
+			call.setInt(2 ,pagesize);//每次取的行数
+			call.setInt(3, pageno);//第几页
+			call.setString(4,operatorNo);//操作员编号
+			call.setString(5,stationNo);//充装点编号
+			call.setString(6,machineNo);//设备编号
+			call.setString(7,gunNo);//气枪编号
+			call.setString(8,carNo);//车牌号
+			call.setInt(9,appType);//应用类型
+			call.setInt(10, fillState);//充装状态
+			call.setDate(11, startsTime);
+			call.setDate(12, endsTime);
+			call.setInt(13, cylinderType);
+			call.setInt(14, -1);
+			call.registerOutParameter(15,Types.INTEGER);//总行数
+			call.registerOutParameter(16, OracleTypes.CURSOR);//结果集
+			call.execute();
+			int total = ((Integer) call.getObject(15)).intValue();
+			HttpServletRequest req = ServletActionContext.getRequest();
+			User user = new User();
+			user.setFillingSum(total);
+			req.getSession().setAttribute(Constant.fillingSum+"123", user);
+			rs = (ResultSet) call.getObject(16);
+			while(rs.next()){
+				CngFillLogs log = new CngFillLogs();
+//				log.setStationNo(rs.getString("cngstationno"));
+				log.setStationNo(rs.getString("cngstationname"));
+//				log.setMachineNo(rs.getString("cngmachineno"));
+				log.setMachineNo(rs.getString("cngmachinename"));
+				log.setGunNo(rs.getInt("cnggunno"));
+				log.setMedia(rs.getInt("BENEFITTYPE"));
+//				log.setOperator(rs.getString("cngoperatorno"));
+				log.setOperator(rs.getString("cngoperatorname"));
+				log.setFillState(rs.getString("fillstate"));
+				log.setFillTime(rs.getTimestamp("filltime"));
+				log.setEndTime(rs.getTimestamp("endtime"));
+				log.setFillCheckName1(rs.getString("FILLCHECKNNAME1"));
+				log.setFillCheckName2(rs.getString("FILLCHECKNAME2"));
+				log.setCarNo(rs.getString("carno"));
+				log.setAppType(rs.getString("apptype"));
+				log.setPlateType(rs.getString("platetypename"));
+				log.setCylinderNum(rs.getInt("cylindernum"));
+				log.setRegNo(rs.getString("regno"));
+				log.setNowNumber(rs.getInt("nownumber"));
+				log.setLowPress(rs.getFloat("lowpress"));
+				log.setHighPress(rs.getFloat("highpress"));
+				log.setFlux(rs.getFloat("flux"));
+				log.setMoney(rs.getFloat("money"));
+				
+				list.add(log);
+				log=null;
+				
+				
+				
+			}	
+			reValues.put(1, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finally{
+			JDBCUtils.release(conn, call, rs);
+		}
+		return (List<CngFillLogs>) reValues.get(1);
+	}
+	
+	/**
+	 * 充装数据查询存储函数
+	 * @param un
+	 * @param ps
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public List<CNGFillLog> fillingDataQuery(int pagesize, int pageno,String operatorNo, String stationNo, String machineNo,String gunNo, String carNo, int appType, int fillState,Date startsTime, Date endsTime,int cylinderType,int fillCheck2){
+		List<CNGFillLog> list=new ArrayList<CNGFillLog>();
+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
+//		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
+		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLog(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
+		Connection conn =null;
+		
+		CallableStatement call = null;
+		
+		ResultSet rs = null;
+		try {
+			conn = JDBCUtils.getConnection();
+			
+			call = (CallableStatement) conn.prepareCall(sql);
+			call.registerOutParameter(1, Types.INTEGER);//返回值
+			
+			call.setInt(2 ,pagesize);//每次取的行数
+			call.setInt(3, pageno);//第几页
+			call.setString(4,operatorNo);//操作员编号
+			call.setString(5,stationNo);//充装点编号
+			call.setString(6,machineNo);//设备编号
+			call.setString(7,gunNo);//气枪编号
+			call.setString(8,carNo);//车牌号
+			call.setInt(9,appType);//应用类型
+			call.setInt(10, fillState);//充装状态
+			call.setDate(11, startsTime);
+			call.setDate(12, endsTime);
+			call.setInt(13, cylinderType);
+			call.setInt(14, fillCheck2);//充后检查人员  -1全部  0无  1有
+			call.registerOutParameter(15,Types.INTEGER);//总行数
+			call.registerOutParameter(16, OracleTypes.CURSOR);//结果集
+			call.execute();
+			
+			int total = ((Integer) call.getObject(15)).intValue();
+			HttpServletRequest req = ServletActionContext.getRequest();
+			User user = new User();
+			user.setFillingSum(total);
+			req.getSession().setAttribute(Constant.fillingSum, user);
+			
+			rs = (ResultSet) call.getObject(16);
+//			Tool.printRsDetail(rs);
+			while(rs.next()){
+				CNGFillLog obj=new CNGFillLog();
+				obj.setAppType(rs.getString("apptype"));
+				obj.setCarNo(rs.getString("carno"));
+				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
+				obj.setCylinderNum(rs.getInt("cylindernum"));
+				obj.setEndTime(rs.getTimestamp("endtime"));
+				obj.setEndTime1(Util.jiequString(rs.getString("endtime"), 19));
+				obj.setFillState(rs.getString("fillstate"));
+				obj.setFillTime(rs.getTimestamp("filltime"));
+				obj.setFillTime1(Util.jiequString(rs.getString("filltime"), 19));
+				obj.setGunNo(rs.getInt("cnggunno"));
+				obj.setMachineNo(rs.getString("cngmachineno"));
+				obj.setMachineName(rs.getString("cngmachinename"));
+				
+				obj.setOperatorName(rs.getString("cngoperatorname"));
+				obj.setOperatorNo(rs.getString("cngoperatorno"));
+				
+				obj.setRegNo(rs.getString("regno"));
+				obj.setStationNo(rs.getString("cngstationno"));
+				obj.setStationName(rs.getString("cngstationname"));
+				
+				obj.setTagNo(rs.getString("tagno"));
+				obj.setTagType(rs.getInt("tagtype"));
+				obj.setTagUid(rs.getString("taguid"));
+				obj.setTac(rs.getString("tac"));
+				obj.setLeftNumber(rs.getString("leftnumber"));
+				obj.setNowNumber(rs.getInt("nownumber"));
+				obj.setLowPress(rs.getFloat("lowpress"));
+				obj.setHighPress(rs.getFloat("highpress"));
+				obj.setFlux(rs.getFloat("flux"));
+				obj.setMoney(rs.getFloat("money"));
+				obj.setPlateType(rs.getInt("platetype"));
+				obj.setPlateTypeName(rs.getString("platetypename"));
+				obj.setMedia(rs.getInt("BENEFITTYPE"));
+				obj.setFillStateNum(rs.getInt("fillstatenum"));
+				obj.setFillcheck(rs.getInt("FILLCHECK"));
+				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
+				
+				obj.setFILLCHECKNName1(rs.getString("FILLCHECKNNAME1"));
+				obj.setFILLCHECKNName2(rs.getString("FILLCHECKNAME2"));
+				obj.setFillMonitorName(rs.getString("FillMonitorName"));
+				
+				obj.setFILLCHECKNNo1(rs.getString("FILLCHECKNO1"));
+				obj.setFILLCHECKNNo2(rs.getString("FILLCHECKNO2"));
+				obj.setFillMonitorNo(rs.getString("FillMonitorNo"));
+				list.add(obj);
+				obj=null;
+				
+				
+				
+			}	
+			reValues.put(1, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finally{
+			JDBCUtils.release(conn, call, rs);
+		}
+		return (List<CNGFillLog>) reValues.get(1);
+	}
+	
+	
+	private String fixCarNo(String carNo) {
+	    StringBuilder result = new StringBuilder();
+	    if (carNo!=null && !carNo.equals("")) {
+		byte[] t;
+		try {
+		    t = carNo.getBytes("utf-8");
+		    for (int i = 0;i < t.length; ++i) {
+			result.append(String.format("%02X", t[i]));
+		    }
+		} catch (UnsupportedEncodingException e) {
+		    // TODO Auto-generated catch block
+		    e.printStackTrace();
+		}
+		
+	    }
+	    return result.toString();
+	}
+
+	public List<CNGFillLog> latelyFill(String day1, String day2,
+			String carGuid, String cylinderGuid) {
+		List<CNGFillLog> list=new ArrayList<CNGFillLog>();
+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
+		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLogByDay(?,?,?,?,?)}";
+		
+		Connection conn =null;
+		
+		CallableStatement call = null;
+		
+		ResultSet rs = null;
+		try {
+			conn = JDBCUtils.getConnection();
+			
+			call = (CallableStatement) conn.prepareCall(sql);
+			int index=1;
+			call.registerOutParameter(index, Types.INTEGER);index++;
+			call.setString(index,carGuid);index++;
+			call.setString(index,cylinderGuid);index++;
+			call.setInt(index ,Integer.parseInt(day1));index++;
+			call.setInt(index, Integer.parseInt(day2));index++;
+			call.registerOutParameter(index, OracleTypes.CURSOR);
+			call.execute();
+			
+			
+			rs = (ResultSet) call.getObject(index);
+			while(rs.next()){
+				CNGFillLog obj=new CNGFillLog();
+				obj.setAppType(rs.getString("apptype"));
+				obj.setCarNo(rs.getString("carno"));
+				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
+				obj.setCylinderNum(rs.getInt("cylindernum"));
+//				obj.setEndTime(rs.getTimestamp("endtime"));
+				obj.setEndTime1(Util.jiequString(rs.getString("endtime"), 19));
+				obj.setFillState(rs.getString("fillstate"));
+//				obj.setFillTime(rs.getTimestamp("filltime"));
+				obj.setFillTime1(Util.jiequString(rs.getString("filltime"), 19));
+				obj.setGunNo(rs.getInt("cnggunno"));
+				obj.setMachineNo(rs.getString("cngmachineno"));
+				obj.setOperatorName(rs.getString("cngoperatorno"));
+				obj.setRegNo(rs.getString("regno"));
+				obj.setStationNo(rs.getString("cngstationno"));
+				obj.setTagNo(rs.getString("tagno"));
+				obj.setTagType(rs.getInt("tagtype"));
+				obj.setTagUid(rs.getString("taguid"));
+				obj.setLeftNumber(rs.getString("leftnumber"));
+				obj.setNowNumber(rs.getInt("nownumber"));
+				obj.setLowPress(rs.getFloat("lowpress"));
+				obj.setHighPress(rs.getFloat("highpress"));
+				obj.setFlux(rs.getFloat("flux"));
+				obj.setMoney(rs.getFloat("money"));
+				obj.setPlateType(rs.getInt("platetype"));
+				obj.setPlateTypeName(rs.getString("platetypename"));
+				obj.setMedia(rs.getInt("BENEFITTYPE"));
+				obj.setFillStateNum(rs.getInt("fillstatenum"));
+				obj.setFillcheck(rs.getInt("FILLCHECK"));
+				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
+				list.add(obj);
+				obj=null;
+				
+				
+				
+			}	
+			reValues.put(1, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finally{
+			JDBCUtils.release(conn, call, rs);
+		}
+		return (List<CNGFillLog>) reValues.get(1);
+	}
+	public List<CNGFillLog1> latelyFill123(String day1, String day2,
+			String carGuid, String cylinderGuid) {
+		List<CNGFillLog1> list=new ArrayList<CNGFillLog1>();
+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();
+		String sql = "{?=call PA_CNGSTATION_NEW.GetFillLogByDay(?,?,?,?,?)}";
+		Connection conn =null;
+		
+		CallableStatement call = null;
+		
+		ResultSet rs = null;
+		try {
+			conn = JDBCUtils.getConnection();
+			
+			call = (CallableStatement) conn.prepareCall(sql);
+			int index=1;
+			call.registerOutParameter(index, Types.INTEGER);index++;
+			call.setString(index,carGuid);index++;
+			call.setString(index,cylinderGuid);index++;
+			call.setInt(index ,Integer.parseInt(day1));index++;
+			call.setInt(index, Integer.parseInt(day2));index++;
+			call.registerOutParameter(index, OracleTypes.CURSOR);
+			call.execute();
+			
+			
+			rs = (ResultSet) call.getObject(index);
+			while(rs.next()){
+				CNGFillLog1 obj = new CNGFillLog1();
+				obj.setAppType(rs.getString("apptype"));
+				obj.setCarNo(rs.getString("carno"));
+				obj.setFixCarNo(fixCarNo(rs.getString("carno")));
+				obj.setCylinderNum(rs.getInt("cylindernum"));
+				obj.setEndTime(Util.jiequString(rs.getString("endtime"), 19));
+				obj.setFillState(rs.getString("fillstate"));
+				obj.setFillTime(Util.jiequString(rs.getString("filltime"), 19));
+				obj.setGunNo(rs.getInt("cnggunno"));
+				obj.setMachineNo(rs.getString("cngmachineno"));
+				obj.setOperatorName(rs.getString("cngoperatorno"));
+				obj.setRegNo(rs.getString("regno"));
+				obj.setStationNo(rs.getString("cngstationno"));
+				obj.setTagNo(rs.getString("tagno"));
+				obj.setTagType(rs.getInt("tagtype"));
+				obj.setTagUid(rs.getString("taguid"));
+				obj.setLeftNumber(rs.getString("leftnumber"));
+				obj.setNowNumber(rs.getInt("nownumber"));
+				obj.setLowPress(rs.getFloat("lowpress"));
+				obj.setHighPress(rs.getFloat("highpress"));
+				obj.setFlux(rs.getFloat("flux"));
+				obj.setMoney(rs.getFloat("money"));
+				obj.setPlateType(rs.getInt("platetype"));
+				obj.setPlateTypeName(rs.getString("platetypename"));
+				obj.setMedia(rs.getInt("BENEFITTYPE"));
+				obj.setFillStateNum(rs.getInt("fillstatenum"));
+				obj.setFillcheck(rs.getInt("FILLCHECK"));
+				obj.setFillcheckstr(Util.toBinary(rs.getInt("FILLCHECK"), 8));
+				list.add(obj);
+				obj=null;
+				
+				
+				
+			}	
+			reValues.put(1, list);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finally{
+			JDBCUtils.release(conn, call, rs);
+		}
+		return (List<CNGFillLog1>) reValues.get(1);
+	}
+
+	/**
+	 * 查询氢气充装数据
+	 * @param pagesize
+	 * @param pageno
+	 * @param stationNo
+	 * @param carNo
+	 * @param startsTime
+	 * @param endsTime
+	 * @return 
+	 * @return List<CNGFillLog> 
+	 * @author yxh
+	 * @date 2022年9月17日下午9:08:01
+	 * @throws
+	 */
+	public List<CHGFillLog> chgFillingDataQuery(int pagesize, int pageno,String stationNo, String carNo,Date startsTime, Date endsTime) {
+		List<CHGFillLog> list=new ArrayList<CHGFillLog>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat ymdhms = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		int start = pagesize * (pageno-1);
+	    int end = pagesize * pageno;
+	    if (StringUtils.isEmpty(stationNo)) {
+	    	stationNo="";
+	    }
+	    String startTime = sdf.format(startsTime)+" 00:00:00";
+	    String endTime = sdf.format(endsTime)+" 00:00:00";
+	    
+		String sql = "select ROWNUM AS rn,cl.GUID,cl.STATIONNO,cl.CARNO,cl.PLATETYPE,cl.PLATECOLOR,cl.MEDIUM,cl.REGNO,cl.REGDATE,cl.REGVALIDITY,"
+				+ "cl.REGUNIT,cl.CYLINDERTYPE,cl.CYLINDERNO,cl.PRODUCTNAME,cl.PRODUCTDATE,cl.STARTUSEDATE,cl.YEARLIMIT,cl.PRODUCTLICENCE,"
+				+ "cl.PRODUCTTYPE,cl.WEIGHT,cl.VOL,cl.THICKNESS,cl.PRESS,cl.MATERIAL,cl.INSTALLSTATION,cl.INSTALLCERT,cl.INSTALLDATE,cl.MONITORSTATION,"
+				+ "cl.MONITORCERT,cl.MONITORDATE,cl.CHECKSTATION,cl.CHECKCERT,cl.CHECKDATE,cl.NEXTCHECKDATE,cl.BEFORECHECKER,cl.BEFORETIME,"
+				+ "cl.BEFOREITEMS,cl.BEFORERESULT,cl.BEFOREEXCEPTION,cl.CARREMARK,cl.CYLINDERREMARK,cl.BEFOREVERIFIER,cl.OPERATORNAME,cl.OPERATORID,"
+				+ "cl.OPERATORNO,cl.OPERATORTYPE,cl.OPERATORDOC,cl.OPERATORCERT,cl.OPERATORLICDATE,cl.OPERATORLICVALIDITY,cl.MACHINEFACTORY,"
+				+ "cl.MACHINENO,cl.MACHINENAME,cl.GUNNO,cl.FILLSTARTTIME,cl.FILLBEFOREPRESS,cl.FILLENDTIME,cl.FILLENDPRESS,cl.FILLUNIT,cl.FILLNUM,"
+				+ "cl.FILLDENSITY,cl.MONEY,cl.AFTERCHECKER,cl.AFTERTIME,cl.AFTERITEMS,cl.AFTERRESULT,cl.AFTEREXCEPTION,cl.AFTERVERIFIER,cl.REMARK,"
+				+ "s.STATIONNAME "
+				+ "from dyndba.tb_chgfill_log cl "
+				+ " LEFT JOIN CNGDBA.TB_CNGSTATION s ON cl.STATIONNO = s.STATIONNO"
+				+ " WHERE cl.STATIONNO like CONCAT('"+stationNo+"', '%')  ";
+		if (StringUtils.isNotEmpty(carNo)) {
+			sql += " AND cl.CARNO LIKE CONCAT('%',CONCAT('"+carNo+"', '%')) ";
+		}
+		if (ObjectUtils.isNotEmpty(startsTime)) {
+			sql += " AND cl.FILLSTARTTIME > TO_DATE('"+startTime+"', 'yyyy-MM-dd HH24:MI:ss') ";
+		}
+		if (ObjectUtils.isNotEmpty(endsTime)) {
+			sql += " AND cl.FILLSTARTTIME <= TO_DATE('"+endTime+"', 'yyyy-MM-dd HH24:MI:ss') ";
+		}
+		
+		String countSql = "select count(0) as count from ("+sql+")";
+		Connection conn =null;
+		PreparedStatement ps0 =null;
+		PreparedStatement ps =null;
+		ResultSet rs0 = null;
+		ResultSet rs = null;
+		try {
+			HttpServletRequest req = ServletActionContext.getRequest();
+			conn = JDBCUtils.getConnection();
+			ps0 = conn.prepareStatement(countSql);
+			rs0 = ps0.executeQuery();
+			while(rs0.next()) {
+				User user = new User();
+				user.setFillingSum(rs0.getInt("count"));
+				req.getSession().setAttribute(Constant.fillingSum, user);
+			}
+			String pageSql = "SELECT * FROM ("+sql+") WHERE rn BETWEEN "+start+" AND "+end;
+			ps = conn.prepareStatement(pageSql);
+			rs = ps.executeQuery();
+			while(rs.next()){
+				CHGFillLog obj=new CHGFillLog();
+				obj.setGuid(rs.getString("GUID"));
+				obj.setStationNo(rs.getString("STATIONNO"));//STATIONNO站编号
+				obj.setCarNo(rs.getString("CARNO"));//CARNO车牌号
+				obj.setPlateType(rs.getInt("PLATETYPE"));//PLATETYPE车牌类型
+				obj.setPlateColor(rs.getInt("PLATECOLOR"));//PLATECOLOR车牌颜色
+				obj.setMedium(rs.getString("MEDIUM"));//MEDIUM充装介质
+				obj.setRegNo(rs.getString("REGNO"));//REGNO使用登记证号
+				obj.setRegDate(rs.getDate("REGDATE")!=null?ymdhms.format(rs.getDate("REGDATE")):"");//REGDATE发证时间
+				obj.setRegValidity(rs.getDate("REGVALIDITY")!= null?ymdhms.format(rs.getDate("REGVALIDITY")):"");//REGVALIDITY证件有效期
+				obj.setRegUnit(rs.getString("REGUNIT"));//REGUNIT发证单位
+				obj.setCylinderType(rs.getInt("CYLINDERTYPE"));//CYLINDERTYPE气瓶类型
+				obj.setCylinderNo(rs.getString("CYLINDERNO"));//CYLINDERNO气瓶出厂编号
+				obj.setProductName(rs.getString("PRODUCTNAME"));//PRODUCTNAME生产厂家
+				obj.setProductDate(rs.getDate("PRODUCTDATE")!=null?ymdhms.format(rs.getDate("PRODUCTDATE")):"");//PRODUCTDATE生产日期
+				obj.setStartuseDate(rs.getDate("STARTUSEDATE")!=null?ymdhms.format(rs.getDate("STARTUSEDATE")):"");//STARTUSEDATE投用日期
+				obj.setYearLimit(rs.getDate("YEARLIMIT")!=null?ymdhms.format(rs.getDate("YEARLIMIT")):"");//YEARLIMIT使用年限
+				obj.setProductLicence(rs.getString("PRODUCTLICENCE"));//PRODUCTLICENCE生产许可
+				obj.setProductType(rs.getString("PRODUCTTYPE"));//PRODUCTTYPE气瓶产品型号
+				obj.setWeight(rs.getFloat("WEIGHT"));//WEIGHT重量
+				obj.setVol(rs.getFloat("VOL"));//VOL容积
+				obj.setThickness(rs.getFloat("THICKNESS"));//THICKNESS壁厚
+				obj.setPress(rs.getFloat("PRESS"));//PRESS压力
+				obj.setMaterial(rs.getString("MATERIAL"));//MATERIAL材质
+				obj.setInstallStation(rs.getString("INSTALLSTATION"));//INSTALLSTATION安装单位
+				obj.setInstallCert(rs.getString("INSTALLCERT"));//INSTALLCERT安装合格证
+				obj.setInstallDate(rs.getDate("INSTALLDATE")!=null?ymdhms.format(rs.getDate("INSTALLDATE")):"");//INSTALLDATE安装时间
+				obj.setMonitorStation(rs.getString("MONITORSTATION"));//MONITORSTATION监检单位
+				obj.setMonitorCert(rs.getString("MONITORCERT"));//MONITORCERT监检合格证
+				obj.setMonitorDate(rs.getDate("MONITORDATE")!=null?ymdhms.format(rs.getDate("MONITORDATE")):"");//MONITORDATE监检时间
+				obj.setCheckStation(rs.getString("CHECKSTATION"));//CHECKSTATION检验单位
+				obj.setCheckCert(rs.getString("CHECKCERT"));//CHECKCERT检验合格证
+				obj.setCheckDate(rs.getDate("CHECKDATE")!= null?ymdhms.format(rs.getDate("CHECKDATE")):"");//CHECKDATE检验时间
+				obj.setNextCheckDate(rs.getDate("NEXTCHECKDATE")!=null?ymdhms.format(rs.getDate("NEXTCHECKDATE")):"");//NEXTCHECKDATE下次检验时间
+				obj.setBeforeChecker(rs.getString("BEFORECHECKER"));//BEFORECHECKER充装检查人员
+				obj.setBeforeTime(rs.getDate("BEFORETIME")!=null?ymdhms.format(rs.getDate("BEFORETIME")):"");//BEFORETIME充半检查时间
+				obj.setBeforeItems(rs.getString("BEFOREITEMS"));//BEFOREITEMS充装前检查项目
+				obj.setBeforeResult(rs.getInt("BEFORERESULT"));//BEFORERESULT充前检查结果
+				obj.setBeforeException(rs.getString("BEFOREEXCEPTION"));//BEFOREEXCEPTION充前检查异常项目
+				obj.setCarRemark(rs.getString("CARREMARK"));//CARREMARK车辆其它信息
+				obj.setCylinderRemark(rs.getString("CYLINDERREMARK"));//CYLINDERREMARK气瓶其它信息
+				obj.setBeforeVerifier(rs.getString("BEFOREVERIFIER"));//BEFOREVERIFIER充前审核人员
+				obj.setOperatorName(rs.getString("OPERATORNAME"));//OPERATORNAME操作人员姓名
+				obj.setOperatorId(rs.getString("OPERATORID"));//OPERATORID操作人员身份证号
+				obj.setOperatorNo(rs.getString("OPERATORNO"));//OPERATORNO操作人员编号
+				obj.setOperatorType(rs.getString("OPERATORTYPE"));//OPERATORTYPE操作人员类型
+				obj.setOperatorDoc(rs.getString("OPERATORDOC"));//OPERATORDOC操作人员档案号
+				obj.setOperatorCert(rs.getString("OPERATORCERT"));//OPERATORCERT操作人员班证书
+				obj.setOperatorLicDate(rs.getDate("OPERATORLICDATE")!=null?ymdhms.format(rs.getDate("OPERATORLICDATE")):"");//OPERATORLICDATE发证时间
+				obj.setOperatorLicValidity(rs.getDate("OPERATORLICVALIDITY")!=null?ymdhms.format(rs.getDate("OPERATORLICVALIDITY")):"");//OPERATORLICVALIDITY证书有效期
+				obj.setMachineFactory(rs.getString("MACHINEFACTORY"));//MACHINEFACTORY充装设备厂家
+				obj.setMachineNo(rs.getString("MACHINENO"));//MACHINENO充装设备编号
+				obj.setMachineName(rs.getString("MACHINENAME"));//MACHINENAME充装设备名称
+				obj.setGunNo(rs.getString("GUNNO"));//GUNNO充装枪号
+				obj.setFillStartTime(rs.getDate("FILLSTARTTIME")!=null?ymdhms.format(rs.getDate("FILLSTARTTIME")):"");//FILLSTARTTIME充装时间
+				obj.setFillBeforePress(rs.getInt("FILLBEFOREPRESS"));//FILLBEFOREPRESS充前压力
+				obj.setFillEndTime(rs.getDate("FILLENDTIME")!=null?ymdhms.format(rs.getDate("FILLENDTIME")):"");//FILLENDTIME充装结束时间
+				obj.setFillEndPress(rs.getInt("FILLENDPRESS"));//FILLENDPRESS充装结束压力
+				obj.setFillUnit(rs.getInt("FILLUNIT"));//FILLUNIT充装量单位
+				obj.setFillNum(rs.getInt("FILLNUM"));//FILLNUM充装量
+				obj.setFillDensity(rs.getInt("FILLDENSITY"));//FILLDENSITY充装密度
+				obj.setMoney(rs.getFloat("MONEY"));//MONEY金额
+				obj.setAfterChecker(rs.getString("AFTERCHECKER"));//AFTERCHECKER充后检查人员
+				obj.setAfterTime(rs.getDate("AFTERTIME")!=null?ymdhms.format(rs.getDate("AFTERTIME")):"");//AFTERTIME充后检查时间
+				obj.setAfterTimes(rs.getString("AFTERITEMS"));//AFTERITEMS充后检查项目
+				obj.setAfterResult(rs.getInt("AFTERRESULT"));//AFTERRESULT充后结果
+				obj.setAfterException(rs.getString("AFTEREXCEPTION"));//AFTEREXCEPTION充后检查异常项目
+				obj.setAfterVerifier(rs.getString("AFTERVERIFIER"));//AFTERVERIFIER充后审核人员
+				obj.setRemark(rs.getString("REMARK"));//REMARK备注及其它信息
+				obj.setStationName(rs.getString("STATIONNAME"));//STATIONNAME站名称
+				list.add(obj);
+				obj=null;
+			}	
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		finally{
+			JDBCUtils.release(conn, ps, rs);
+			JDBCUtils.release(conn, ps0, rs0);
+		}
+		return list;
+	}
+
+}

+ 8 - 8
src/com/runzhixing/servlet/LoginServlet.java

@@ -109,14 +109,14 @@ public class LoginServlet extends HttpServlet {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-//				if(p.contains("hzb"+rCodess)){
-//					p = p.substring(0,p.indexOf("hzb"+rCodess));
-//				}else{
-//					session.setAttribute("failMess", "未获取到随机码");
-//					req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
-//					return;
-//				}
-					p = p.substring(0,p.indexOf("hzb"));
+				if(p.contains("hzb"+rCodess)){
+					p = p.substring(0,p.indexOf("hzb"+rCodess));
+				}else{
+					session.setAttribute("failMess", "未获取到随机码");
+					req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);
+					return;
+				}
+//					p = p.substring(0,p.indexOf("hzb"));
 				
 				
 				

+ 64 - 0
src/com/runzhixing/tool/Tool.java

@@ -204,6 +204,70 @@ public class Tool {
 		}
 		return res;
 	}
+	/**
+	 * 车牌颜色
+	 * @param plateColor
+	 * @return
+	 */
+	public static String getPlateColorName(int plateColor){
+		String res = "其他";
+		switch (plateColor) {
+		case 1:
+			res = "蓝";		
+			break;
+		case 2:
+			res = "黄";
+			break;
+		case 3:
+			res = "绿";
+			break;
+		case 4:
+			res = "白";
+			break;
+		case 5:
+			res = "黑";
+			break;
+		default:
+			res = "其他";
+			break;
+		}
+		return res;
+	}
+	/**
+	 * 气瓶类型名称
+	 * @param type
+	 * @return
+	 */
+	public static String getCylinderTypeName(int type){
+		String res = "其他";
+		switch (type) {
+		case 1:
+			res = "刚质气瓶";		
+			break;
+		case 2:
+			res = "钢质内胆环向缠绕气瓶";
+			break;
+		case 3:
+			res = "铝合金内胆全缠绕气瓶";
+			break;
+		case 4:
+			res = "玻璃纤维缠绕气瓶";
+			break;
+		case 5:
+			res = "LNG液化天然气气瓶";
+			break;
+		case 6:
+			res = "LPG液化石油气气瓶";
+			break;
+		case 7:
+			res = "车用氢气瓶";
+			break;
+		default:
+			res = "其他";
+			break;
+		}
+		return res;
+	}
 //	public static boolean pwdRules(String pwd){
 //		if(pwd==null||pwd.trim().equals("")){
 //			return false;