Главная Обзор Помощь
Регистрация Вход
yxh
/
CNG
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

2019年2月28日14:26:10

小黄 7 лет назад
Родитель
98675e583d
Сommit
90262f8afc
37 измененных файлов с 1370 добавлено и 135 удалено
Разделённый вид Показать статистику Diff
  1. 89 42
      WebRoot/jsp/rzx/bgman.jsp
  2. 6 1
      WebRoot/jsp/rzx/dataQuery/PersonnelInspection21.jsp
  3. 15 1
      WebRoot/jsp/rzx/dataQuery/tagIssuingInfobgman.jsp
  4. 15 1
      WebRoot/jsp/rzx/dataQuery/tagIssuingInfomofiy.jsp
  5. 12 1
      WebRoot/jsp/rzx/dataQuery/tagIssuingInfotesting.jsp
  6. 12 8
      WebRoot/jsp/rzx/dataStatistics/CarsdataStatistics.jsp
  7. 6 3
      WebRoot/jsp/rzx/dataStatistics/CylinderdataStatistics.jsp
  8. 1 1
      WebRoot/jsp/rzx/dataStatistics/FillingdataStatistics.jsp
  9. 1 1
      WebRoot/jsp/rzx/dataStatistics/FillingdataStatisticsfilling.jsp
  10. 1 1
      WebRoot/jsp/rzx/dataStatistics/ModifydataStatistics.jsp
  11. 1 1
      WebRoot/jsp/rzx/dataStatistics/TagdataStatistics.jsp
  12. 1 1
      WebRoot/jsp/rzx/dataStatistics/kaoqindataStatistics.jsp
  13. 43 29
      WebRoot/jsp/rzx/filling/CylinderdataQuery.jsp
  14. 2 2
      WebRoot/jsp/rzx/filling/Dynamicattempt.jsp
  15. 2 2
      WebRoot/jsp/rzx/filling/Dynamicattempt1.jsp
  16. 33 0
      WebRoot/jsp/rzx/fillingbgman.jsp
  17. 37 0
      WebRoot/jsp/rzx/modifybgman.jsp
  18. 38 0
      WebRoot/jsp/rzx/testingbgman.jsp
  19. 72 7
      src/com/runzhixing/action/CarDataStatisticsAction.java
  20. 26 1
      src/com/runzhixing/action/CarsDataQueryAction.java
  21. 13 1
      src/com/runzhixing/action/CylinderDataQueryAction.java
  22. 299 17
      src/com/runzhixing/action/CylinderDataStatisticsAction.java
  23. 26 0
      src/com/runzhixing/action/CylinderFollowAction.java
  24. 1 1
      src/com/runzhixing/action/CylinderGuidAction.java
  25. 72 1
      src/com/runzhixing/action/TagIssuingfromAction.java
  26. 68 0
      src/com/runzhixing/bean/Announcement.java
  27. 61 0
      src/com/runzhixing/bean/CylinderFollow.java
  28. 1 0
      src/com/runzhixing/bean/StatData1.java
  29. 8 0
      src/com/runzhixing/bean/TagInfo.java
  30. 10 9
      src/com/runzhixing/config/config.properties
  31. 65 0
      src/com/runzhixing/packageProcedure/CarsDataStatisticsProcedure.java
  32. 58 0
      src/com/runzhixing/packageProcedure/CylinderDataStatisticsProcedure.java
  33. 136 0
      src/com/runzhixing/packageProcedure/InformationAnnouncementProcedure.java
  34. 75 2
      src/com/runzhixing/packageProcedure/TagIssuingInfoProcedure.java
  35. 2 0
      src/com/runzhixing/servlet/LoginServlet.java
  36. 46 0
      src/com/runzhixing/tool/Util.java
  37. 16 1
      src/struts.xml

+ 89 - 42
WebRoot/jsp/rzx/bgman.jsp
Просмотреть файл 

@@ -5,42 +5,66 @@
 
 <%@ page import="java.util.List"%>

 <%@ page import="com.runzhixing.packageProcedure.InformationAnnouncementProcedure"%>

 <%

-String path = request.getContextPath();

-String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";

-String username = (String)session.getAttribute("username");

-String place = (String)session.getAttribute("place");

+	String path = request.getContextPath();

+	String basePath = request.getScheme() + "://"

+			+ request.getServerName() + ":" + request.getServerPort()

+			+ path + "/";

+	String username = (String) session.getAttribute("username");

+	String place = (String) session.getAttribute("place");

 

-String place1=place;

-if(place!=null&&!place.trim().equals("")){

-	String end = place.substring(place.length()-1,place.length());

-	if(end.equals("市")||end.equals("县")) place= place.substring(0,place.length()-1);

-	

-	if(place.equals("四川省")){

-		place1+="市场监督管理局";

-	}else{

-		place1+="质量技术监督局";

+	String place1 = place;

+	if (place != null && !place.trim().equals("")) {

+		String end = place

+				.substring(place.length() - 1, place.length());

+		if (end.equals("市") || end.equals("县"))

+			place = place.substring(0, place.length() - 1);

+

+		if (place.equals("四川省")) {

+			place1 += "市场监督管理局";

+		} else {

+			place1 += "质量技术监督局";

+		}

 	}

-} 

 

-User uu = (User)session.getAttribute(Constant.userMark);

-					String s = uu.getPrivilegeCode();

-					if(s.length()>6) {

-						s = s.substring(0, 6);

-					}

-					s = s.replaceAll("(00)*$", "");//// 一直过滤到最高行政地域(删去尾部的 00 )

-					List<Announcement> list = new InformationAnnouncementProcedure().areatedmachinerunningstate1(5000, 1, -1, s, s, null, null, null, 0);

-					int id=-1;

-					String title="";

-					String anTime="";

-					if(list.size()>0){

-						for(Announcement an:list){

-							if(an.getId()>id){

-								id=an.getId();

-								title = an.getTitle();

-								anTime = an.getPublishTime1();

-							}

-						}

-					}

+	User uu = (User) session.getAttribute(Constant.userMark);

+	String s = uu.getPrivilegeCode();

+	if (s.length() > 6) {

+		s = s.substring(0, 6);

+	}

+	s = s.replaceAll("(00)*$", "");//// 一直过滤到最高行政地域(删去尾部的 00 )

+	List<Announcement> list = new InformationAnnouncementProcedure()

+			.areatedmachinerunningstate1(5000, 1, -1, s, s, null, null,

+					null, 0);

+	int id = -1;

+	String title = "";

+	String anTime = "";

+	if (list.size() > 0) {

+		for (Announcement an : list) {

+			if (an.getId() > id) {

+				id = an.getId();

+				title = an.getTitle();

+				anTime = an.getPublishTime1();

+			}

+		}

+	}

+	//查询各部门有效期

+	String validity="";

+	List<Announcement> list1 = new InformationAnnouncementProcedure()

+			.checkValidity((String)request.getSession().getAttribute("PrivilegeCode"),(String)request.getSession().getAttribute("sOperatorNo"),s,Integer.parseInt((String)session.getAttribute(Constant.moudel)));

+	if (list1.size() > 0) {

+		Announcement an = new Announcement(); 

+		an=list1.get(0);

+		if(an.getL()>0){

+			validity+="<span style='color: yellow;'>证书快过期！";

+		}else{

+			validity+="<span style='color: red;'>证书已过期！";

+		}

+		validity+= "<br/>站点编号："+an.getStationNo()+" <br/>站点名："+an.getStationName()+" <br/>有效期："+an.getValidity()+" <br/>联系人："+an.getManager()+" <br/>电话："+an.getPhone();	

+		validity+="</span>";

+	}

+	if (list1.size() > 1) {

+		validity+="<br/><a href='CheckValidity' target='_blank'>还有"+(list1.size()-1)+"条过期信息，点击查询&gt;&gt;</a>";

+	}

 %>

 		

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

@@ -87,6 +111,17 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 			}

 				

 			}

+			var validity = document.getElementById("validity").value;

+			if(validity){

+				$.messager.show({  

+	                title: '证书信息提示',  

+	                msg: validity,  

+	                timeout: 0,  

+	                showType: 'slide' ,

+	                width:400,

+	                height:200 

+	            }); 

+			}

 		});

 	

 	var _menus = {

@@ -262,13 +297,24 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 				"menuid": "155",

 				"menuname": "车辆数据统计",

 				"icon": "icon-large-shapes",

-				"url": "jsp/rzx/dataStatistics/CarsdataStatistics.jsp"

+				"url": "jsp/rzx/dataStatistics/CarsdataStatistics0111.jsp"

+			},

+			{

+				"menuid": "155",

+				"menuname": "车辆数据总数统计",

+				"icon": "icon-large-shapes",

+				"url": "jsp/rzx/dataStatistics/CarsdataStatistics0110.jsp"

 			},

 			{

 				"menuid": "165",

 				"menuname": "气瓶数据统计",

 				"icon": "icon-large-smartart",

-				"url": "jsp/rzx/dataStatistics/CylinderdataStatistics.jsp"

+				"url": "jsp/rzx/dataStatistics/CylinderdataStatistics0111.jsp"

+			},{

+				"menuid": "165",

+				"menuname": "标签发放信息统计",

+				"icon": "icon-search",

+				"url": "jsp/rzx/dataStatistics/tagIssuingInfoStatistics.jsp"

 			}]

 	}]

 };

@@ -455,8 +501,8 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
     <div region="north" split="true" border="false" style="overflow: hidden; height: 30px;

         background: url(images/rzx/layout-browser-hd-bg.gif) #7f99be 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" />气瓶电子标签动态监管集成系统-<%=place1 %></span>

+        <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" />气瓶电子标签动态监管集成系统-<%=place1%></span>

     </div>

     <div region="south" split="true" style="height: 30px; background: #D2E0F2; ">

         <div class="footer">By 四川润智兴科技有限公司 版权所有</div>

@@ -468,11 +514,11 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 			</div>

 

     </div>

-    <div id="mainPanle" region="center" style="background: #eee; overflow-y:hidden" >

+    <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;">* 气瓶电子标签动态监管集成系统-<%=place1 %></h1></center>

+<center><h1 style="font-size:24px;">* 气瓶电子标签动态监管集成系统-<%=place1%></h1></center>

 			</div>

 			

 		</div>

@@ -547,8 +593,9 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 	</div>

 	

 	

-	<input type="hidden" value="<%=title %>" name="newAnnTitle" id="newAnnTitle"/>

-	<input type="hidden" value="<%=id %>" name="newAnnID" id="newAnnID"/>

-	<input type="hidden" value="<%=anTime %>" name="newAnnTIME" id="newAnnTIME"/>

+	<input type="hidden" value="<%=title%>" name="newAnnTitle" id="newAnnTitle"/>

+	<input type="hidden" value="<%=id%>" name="newAnnID" id="newAnnID"/>

+	<input type="hidden" value="<%=anTime%>" name="newAnnTIME" id="newAnnTIME"/>

+	<input type="hidden" value="<%=validity%>" name="validity" id="validity"/>

 	</body>

 </html>

+ 6 - 1
WebRoot/jsp/rzx/dataQuery/PersonnelInspection21.jsp
Просмотреть файл 

@@ -169,7 +169,6 @@ List<CountryPlace> cyplist = new ArrayList<CountryPlace>();
 
 					success:function (data){

 						

 							

-							

 								var obj=eval("(" + data + ")");

 

 						    $.each(obj.rows, function(i,item){      

@@ -231,7 +230,13 @@ List<CountryPlace> cyplist = new ArrayList<CountryPlace>();
 
 		function jq1(){

 			var ji=1;

 			var id=document.getElementById("city").value;

+			if(id==null){

+				id="00";

+			}

 			var id1=document.getElementById("country").value;

+			if(id1==null){

+				id1="00";

+			}

 			var select = document.getElementById("jianguan");

 			var select1 = document.getElementById("xuncha");

 			$.ajax({

+ 15 - 1
WebRoot/jsp/rzx/dataQuery/tagIssuingInfobgman.jsp
Просмотреть файл 

@@ -521,7 +521,21 @@ if(sum==0){
 
 			</td>

 			<td><span  style="cursor: default"><span class="hzbspan">底盘号：</span></span></td>

 			<td><input type="text" name="baseNo" id="baseNo"  style="width: 150px;height: 24px;"  class="hzbspan">			

-			</td></tr><tr><td>

+			</td>

+			<td>

+			<span  style="cursor: default"><span class="hzbspan">标签类型：</span></span></td>

+			<td><select  name="tagType" id="tagType" style="width: 180px;height: 24px;" class="hzbspan" >

+					<option value="-1" selected="selected">全部</option>

+					<option value="24">判定标签</option>

+					<option value="25">气瓶标签</option>

+				</select></td>

+			

+			

+			

+			</tr>

+			

+			

+			<tr><td>

 			

 		

 			<span  style="cursor: default"><span class="hzbspan">定检站点：</span></span></td>

+ 15 - 1
WebRoot/jsp/rzx/dataQuery/tagIssuingInfomofiy.jsp
Просмотреть файл 

@@ -489,7 +489,21 @@ if(sum==0){
 
 			<td>			

 			<span  style="cursor: default"><span class="hzbspan">底盘号：</span></span></td>

 			<td><input type="text" name="baseNo" id="baseNo"  style="width: 100px;height: 24px;"  class="hzbspan">			

-			</td></tr><tr>

+			</td>

+			

+			<td>

+			<span  style="cursor: default"><span class="hzbspan">标签类型：</span></span></td>

+			<td><select  name="tagType" id="tagType" style="width: 180px;height: 24px;" class="hzbspan" >

+					<option value="-1" selected="selected">全部</option>

+					<option value="24">判定标签</option>

+					<option value="25">气瓶标签</option>

+				</select></td>

+			

+			

+			</tr>

+			

+			

+			<tr>

 			

 			<td>

 			<span  style="cursor: default"><span class="hzbspan">定检站点：</span></span></td>

+ 12 - 1
WebRoot/jsp/rzx/dataQuery/tagIssuingInfotesting.jsp
Просмотреть файл 

@@ -524,7 +524,18 @@ if(sum==0){
 
 			</td>

 			<td><span  style="cursor: default"><span class="hzbspan">底盘号：</span></span></td>

 			<td><input type="text" name="baseNo" id="baseNo"  style="width: 100px;height: 24px;"  class="hzbspan">			

-			</td><tr><td>

+			</td>

+			

+			<td>

+			<span  style="cursor: default"><span class="hzbspan">标签类型：</span></span></td>

+			<td><select  name="tagType" id="tagType" style="width: 180px;height: 24px;" class="hzbspan" >

+					<option value="-1" selected="selected">全部</option>

+					<option value="24">判定标签</option>

+					<option value="25">气瓶标签</option>

+				</select></td>

+			</tr>

+			

+			<tr><td>

 			

 			

 			<span  style="cursor: default"><span class="hzbspan">定检站点：</span></span></td>

+ 12 - 8
WebRoot/jsp/rzx/dataStatistics/CarsdataStatistics.jsp
Просмотреть файл 

@@ -104,8 +104,9 @@ List<Station> slist = new ArrayList<Station>();
 
 					url:"ajax/CarDataStatistics?cylinderpName="+cylinderTime+"&checkText="+checkText,

 					success:function (data){

 							//$("#infoaddstreetwindows").panel({title:rowData.seriesName});

-							

-							document.getElementById("titleContent").innerHTML=checkText;

+							var vData = $.parseJSON(data);

+							document.getElementById("sumContent").innerHTML="<span style='font-size:24px;font: bold;'>总   数 : "+vData.status+"</span>";

+							//document.getElementById("titleContent").innerHTML=checkText;

 							//document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+' height="70%;" width="100%" />';

 							//document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+'/>';

 							document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+' height="70%;" width="90%" />';

@@ -155,7 +156,7 @@ List<Station> slist = new ArrayList<Station>();
 
 	<div id="toolbar" style="padding-top:0px;height: auto;overflow: hidden;">

 	

   		  <form id="carDateStatistform" action="ajax/carDateStatist" method="post">

-  		<span class="easyui-linkbutton"    style="cursor: default;margin-bottom:  5px;"><span class="hzbspan" style="color: #f08300;font-size: 16px;" >省:</span></span>

+  		<span class="easyui-linkbutton"    style="cursor: default;margin-bottom:  0px;"><span class="hzbspan" style="color: #f08300;font-size: 16px;" >省:</span></span>

 			<select  name="province" id="province" style="width: auto;height: 24px;min-width: 100px;" class="hzbspan">

 				<%for(AuthorityRegionPlace arp:arplist){

 					cplist = arp.getCityPlace();

@@ -166,7 +167,7 @@ List<Station> slist = new ArrayList<Station>();
 
 				<%} %>

 			</select>

   		

-			<span class="easyui-linkbutton"    style="cursor: default;margin-bottom:  5px;"><span class="hzbspan" style="color: #f08300;font-size: 16px;" >市:</span></span>

+			<span class="easyui-linkbutton"    style="cursor: default;margin-bottom:  0px;"><span class="hzbspan" style="color: #f08300;font-size: 16px;" >市:</span></span>

 			<select  name="city" id="city" style="width: auto;height: 24px;min-width: 100px;" class="hzbspan" onchange="selectCountry1();">

 				

 				<%

@@ -182,7 +183,7 @@ List<Station> slist = new ArrayList<Station>();
 
 				 

 				<%} %>

 			</select>

-			<span class="easyui-linkbutton"    style="cursor: default;margin-bottom:  5px;"><span class="hzbspan" style="color: #f08300;font-size: 16px;" >县:</span></span>

+			<span class="easyui-linkbutton"    style="cursor: default;margin-bottom:  0px;"><span class="hzbspan" style="color: #f08300;font-size: 16px;" >县:</span></span>

 			<select  name="country" id = "country" style="width: auto;height: 24px;min-width: 100px;" class="hzbspan"  >

 				</select>

 				<table>

@@ -195,7 +196,7 @@ List<Station> slist = new ArrayList<Station>();
 
 			</td>

 			<td><input type="text"  class="easyui-datebox"  id="endTime" name="endTime" style="width: 100px;height: 24px;"  class="hzbspan">

 			</td>

-			<td><span class="easyui-linkbutton"     style="cursor: default;margin-bottom:  5px;"><span class="hzbspan" style="color: #f08300;font-size: 16px;" >统计类型:</span></span>

+			<td><span class="easyui-linkbutton"     style="cursor: default;margin-bottom:  0px;"><span class="hzbspan" style="color: #f08300;font-size: 16px;" >统计类型:</span></span>

 			</td>

 			<td><select  name="searchType" id = "searchType" style="width: auto;height: 24px;min-width: 100px;" class="hzbspan" >

 				

@@ -204,16 +205,19 @@ List<Station> slist = new ArrayList<Station>();
 
 					<option value="2">按下属分地区车辆总数统计</option>

 				</select></td>

 			<td>

-			<a id="btninfosearch"   class="easyui-linkbutton" icon="icon-search"  onclick="fLoadData(1,10);"  style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">查询</span></a> 

+			<a id="btninfosearch"   class="easyui-linkbutton" icon="icon-search"  onclick="fLoadData(1,10);"  style="margin-bottom:  0px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">查询</span></a> 

 			</td></tr>

 			</table>	

 		</form>

 	</div>

 	<center>

-	<div id="cylinderImg" style="position: absolute;top:100px;left: 10%;width: 80%;height: 600px;text-align: center;overflow: auto;">

+	<div id="cylinderImg" style="position: absolute;top:111px;left: 10%;width: 80%;height: 600px;text-align: center;overflow: auto;">

 	</div>

 	<div id="titleContent" style="position: absolute;top:80px;left: 10%;width: 80%; text-align: center;font-size: 18px;" class="hzbspan">

 	</div>

+	

+	<div id="sumContent" style="position: absolute;top:111px;right:2%; text-align: center;font-size: 18px;" class="hzbspan">

+	</div>

 	</center>

   </body>

 </html>

+ 6 - 3
WebRoot/jsp/rzx/dataStatistics/CylinderdataStatistics.jsp
Просмотреть файл 

@@ -104,8 +104,9 @@ List<Station> slist = new ArrayList<Station>();
 
 					url:"ajax/CylinderDataStatistics?cylinderpName="+cylinderTime,

 					success:function (data){

 							//$("#infoaddstreetwindows").panel({title:rowData.seriesName});

-							

-							document.getElementById("titleContent").innerHTML=checkText;

+							var vData = $.parseJSON(data);

+							document.getElementById("sumContent").innerHTML="<span style='font-size:24px;font: bold;'>总   数 : "+vData.status+"</span>";

+							//document.getElementById("titleContent").innerHTML=checkText;

 							document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+' height="70%;" width="90%" />';

 							

 							//document.getElementById("cylinderImg").innerHTML='<img src='+inputpName+'height="auto" width="100%" />';

@@ -181,7 +182,7 @@ List<Station> slist = new ArrayList<Station>();
 
 			<span class="easyui-linkbutton"    style="cursor: default;margin-bottom:  5px;"><span class="hzbspan" style="color: #f08300;font-size: 16px;" >县:</span></span>&nbsp;&nbsp;

 			<select  name="country" id = "country" style="width: auto;height: 24px;min-width: 100px;" class="hzbspan">

 				</select>&nbsp;&nbsp;

-				<a id="btninfosearch"   class="easyui-linkbutton" icon="icon-search"  onclick="fLoadData(1,10);"  style="margin-bottom:  5px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">查&nbsp;&nbsp;询&nbsp;&nbsp;</span></a> 

+				<a id="btninfosearch"   class="easyui-linkbutton" icon="icon-search"  onclick="fLoadData(1,10);"  style="margin-bottom:  0px;" ><span class="hzbspan" style="color: #f08300;font-size: 16px;">查&nbsp;&nbsp;询&nbsp;&nbsp;</span></a> 

 			

 		</form>

 	</div>

@@ -190,6 +191,8 @@ List<Station> slist = new ArrayList<Station>();
 
 	</div>

 	<div id="titleContent" style="position: absolute;top:80px;left: 10%;width: 80%; text-align: center;font-size: 18px;" class="hzbspan">

 	</div>

+	<div id="sumContent" style="position: absolute;top:100px;right:2%; text-align: center;font-size: 18px;" class="hzbspan">

+	</div>

 	</center>

   </body>

 </html>

+ 1 - 1
WebRoot/jsp/rzx/dataStatistics/FillingdataStatistics.jsp
Просмотреть файл 

@@ -113,7 +113,7 @@ List<Station> slist = new ArrayList<Station>();
 
 					success:function (data){

 							//$("#infoaddstreetwindows").panel({title:rowData.seriesName});

 							

-							document.getElementById("titleContent").innerHTML=checkText;

+							//document.getElementById("titleContent").innerHTML=checkText;

 							//document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+' height="auto" width="auto" />';

 							document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+' height="70%;" width="90%"/>';

 							//document.getElementById("cylinderImg").innerHTML='<img src='+inputpName+'height="auto" width="100%" />';

+ 1 - 1
WebRoot/jsp/rzx/dataStatistics/FillingdataStatisticsfilling.jsp
Просмотреть файл 

@@ -113,7 +113,7 @@ List<Station> slist = new ArrayList<Station>();
 
 					success:function (data){

 							//$("#infoaddstreetwindows").panel({title:rowData.seriesName});

 							

-							document.getElementById("titleContent").innerHTML=checkText;

+							//document.getElementById("titleContent").innerHTML=checkText;

 							//document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+' height="auto" width="auto" />';

 							document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+' height="70%;" width="90%"/>';

 							//document.getElementById("cylinderImg").innerHTML='<img src='+inputpName+'height="auto" width="100%" />';

+ 1 - 1
WebRoot/jsp/rzx/dataStatistics/ModifydataStatistics.jsp
Просмотреть файл 

@@ -111,7 +111,7 @@ List<Station> slist = new ArrayList<Station>();
 
 					url:"ajax/modifyCompanyform?cylinderpName="+cylinderTime,

 					success:function (data){

 							

-							document.getElementById("titleContent").innerHTML=checkText;

+							//document.getElementById("titleContent").innerHTML=checkText;

 							document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+' height="70%;" width="90%"/>';

 							$.messager.progress('close'); 

 											}

+ 1 - 1
WebRoot/jsp/rzx/dataStatistics/TagdataStatistics.jsp
Просмотреть файл 

@@ -106,7 +106,7 @@ List<Station> slist = new ArrayList<Station>();
 
 					success:function (data){

 							//$("#infoaddstreetwindows").panel({title:rowData.seriesName});

 							

-							document.getElementById("titleContent").innerHTML=checkText;

+							//document.getElementById("titleContent").innerHTML=checkText;

 							document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+' height="70%;" width="90%" />';

 							

 							//document.getElementById("cylinderImg").innerHTML='<img src='+inputpName+'height="auto" width="100%" />';

+ 1 - 1
WebRoot/jsp/rzx/dataStatistics/kaoqindataStatistics.jsp
Просмотреть файл 

@@ -106,7 +106,7 @@ List<Station> slist = new ArrayList<Station>();
 
 					success:function (data){

 							//$("#infoaddstreetwindows").panel({title:rowData.seriesName});

 							

-							document.getElementById("titleContent").innerHTML=checkText;

+							//document.getElementById("titleContent").innerHTML=checkText;

 							document.getElementById("cylinderImg").innerHTML='<img src='+cylinderpName+' height="70%;" width="90%" />';

 							

 							//document.getElementById("cylinderImg").innerHTML='<img src='+inputpName+'height="auto" width="100%" />';

+ 43 - 29
WebRoot/jsp/rzx/filling/CylinderdataQuery.jsp
Просмотреть файл 

@@ -41,6 +41,7 @@ String scarNo = request.getParameter("carNo");
 
 		}

 	</style>

 	<script type="text/javascript">

+	var hiddenP='<%=(String)session.getAttribute("hiddenphone") %>';

 		var i = 1;//第几页

 		var sum;//总条数

 		var totalpage;//总页数

@@ -51,6 +52,10 @@ String scarNo = request.getParameter("carNo");
 
 			fLoadTable();

 			pageSize = $('#pageSize').val();

 			fLoadData(1,10);

+			if(hiddenP!="0"){

+					document.getElementById("phone1").value="";

+					document.getElementById("phone2").value="";

+				}

 		});

 		function fLoadTable(){

 		var st = $('#st').val();

@@ -80,17 +85,17 @@ String scarNo = request.getParameter("carNo");
 
 	            	pagination:true,//分页控件 

 					columns:[[

 					

-					{field:'cylindercarNo',align:'center',title:'操作',width:'120px',formatter: function(value, row, index){

+					{field:'cylindercarNo',align:'center',title:'操作',width:'60px',formatter: function(value, row, index){

 							return '<a href="jsp/rzx/dataQuery/CylinderFollow?cylinderguid='+row.cylinderGuid+'" target="_blank">'+"追踪气瓶"+'</a>';

 						}},

-						{field:'carNo',align:'center',title:'所属车辆',width:'120px'},

-						{field:'cylinderNo',align:'center',title:'气瓶使用编号',width:'120px'},

-						{field:'productNo',align:'center',title:'生产厂家',width:'120px'},

-						{field:'cylinderNo',align:'center',title:'气瓶出厂编号',width:'120px'},

-						{field:'cylinderTypeName',align:'center',title:'气瓶类型',width:'180px'},

-						{field:'productDate1',align:'center',title:'生产年月',width:'120px'},

-						{field:'productType',align:'center',title:'型号',width:'120px'},

-						{field:'cylinderState',align:'center',title:'使用状态',width:'120px',formatter: function(value, row, index){

+						{field:'carNo',align:'center',title:'所属车辆',width:'70px'},

+						{field:'cylinderNo',align:'center',title:'气瓶使用编号',width:'80px'},

+						{field:'productNo',align:'center',title:'生产厂家',width:'55px'},

+						{field:'cylinderNo',align:'center',title:'气瓶出厂编号',width:'60px'},

+						{field:'cylinderTypeName',align:'center',title:'气瓶类型',width:'60px'},

+						{field:'productDate1',align:'center',title:'生产年月',width:'82px'},

+						{field:'productType',align:'center',title:'型号',width:'30px'},

+						{field:'cylinderState',align:'center',title:'使用状态',width:'55px',formatter: function(value, row, index){

     if (value == "0") {

         return '<font style="color:green;font-weight: bold;">'+"在用"+'</font>';

     }

@@ -101,54 +106,62 @@ String scarNo = request.getParameter("carNo");
 
     }else if(value == "3") {

         return '<font style="color:red;font-weight: bold;">'+"周转"+'</font>';

     }}},

-						{field:'nextCheckDate1',align:'center',title:'下次检验日期',width:'120px'},

-						{field:'checkDate1',align:'center',title:'最后检验日期',width:'120px'},

-						{field:'startUseDate1',align:'center',title:'开始投用日期',width:'120px'},

-						{field:'installDate1',align:'center',title:'安装日期',width:'120px'},

-						{field:'yearLimit',align:'center',title:'使用年限',width:'120px'},

-						{field:'timesAvailable',align:'center',title:'可充装次数',width:'120px'},

-						{field:'fillTimes',align:'center',title:'已充装次数',width:'120px'},

-						{field:'checkStation',align:'center',title:'检验单位',width:'120px'},

-						{field:'checkState',align:'center',title:'检验状态',width:'120px',formatter: function(value, row, index){

+						{field:'nextCheckDate1',align:'center',title:'下次检验日期',width:'82px'},

+						{field:'checkDate1',align:'center',title:'最后检验日期',width:'82px'},

+						{field:'startUseDate1',align:'center',title:'开始投用日期',width:'82px'},

+						{field:'installDate1',align:'center',title:'安装日期',width:'82px'},

+						{field:'yearLimit',align:'center',title:'使用年限',width:'55px'},

+						{field:'timesAvailable',align:'center',title:'可充装次数',width:'60px'},

+						{field:'fillTimes',align:'center',title:'已充装次数',width:'60px'},

+						{field:'checkStation',align:'center',title:'检验单位',width:'55px'},

+						{field:'checkState',align:'center',title:'检验状态',width:'55px',formatter: function(value, row, index){

     if (value == "0") {

         return '<font style="color:green;font-weight: bold;">'+"合格"+'</font>';

     }

     else if(value == "1") {

         return '<font style="color:red;font-weight: bold;">'+"不合格"+'</font>';

     }}},

-						{field:'installStation',align:'center',title:'安装单位',width:'200px'},

-						{field:'installLicence',align:'center',title:'安装许可',width:'120px'},

-						{field:'monitorStation',align:'center',title:'安装监检单位',width:'200px'},

-						{field:'weight',align:'center',title:'重量',width:'120px',formatter: function(value, row, index){

+						{field:'installStation',align:'center',title:'安装单位',width:'55px'},

+						{field:'installLicence',align:'center',title:'安装许可',width:'20px'},

+						{field:'monitorStation',align:'center',title:'安装监检单位',width:'20px'},

+						{field:'weight',align:'center',title:'重量',width:'40px',formatter: function(value, row, index){

 							if(value){

 						        return value.toFixed(1);

 						        }

 	    					return value;	

 						}},

-						{field:'vol',align:'center',title:'容积',width:'120px',formatter: function(value, row, index){

+						{field:'vol',align:'center',title:'容积',width:'40px',formatter: function(value, row, index){

 							if(value){

 						        return value.toFixed(1);

 						        }

 	    					return value;	

 						}},

-						{field:'thickness',align:'center',title:'壁厚',width:'120px',formatter: function(value, row, index){

+						{field:'thickness',align:'center',title:'壁厚',width:'40px',formatter: function(value, row, index){

 							if(value){

 						        return value.toFixed(1);

 						        }

 	    					return value;	

 						}},

-						{field:'press',align:'center',title:'压力',width:'120px',formatter: function(value, row, index){

+						{field:'press',align:'center',title:'压力',width:'40px',formatter: function(value, row, index){

 							if(value){

 						        return value.toFixed(1);

 						        }

 	    					return value;	

 						}},

-						{field:'material',align:'center',title:'材质',width:'120px'},

-						{field:'installLoc',align:'center',title:'安装位置',width:'120px'}

+						{field:'material',align:'center',title:'材质',width:'30px'},

+						{field:'installLoc',align:'center',title:'安装位置',width:'55px'}

 						

 						

 					]]

 				});	

+				$('#tt').datagrid('hideColumn','productType');

+				$('#tt').datagrid('hideColumn','installLicence');

+				$('#tt').datagrid('hideColumn','monitorStation');

+				$('#tt').datagrid('hideColumn','material');

+				

+				$('#tt').datagrid('hideColumn','weight');

+				$('#tt').datagrid('hideColumn','thickness');

+				$('#tt').datagrid('hideColumn','press');

 		}

 		function show(message) {  

 	            $.messager.show({  

@@ -223,12 +236,13 @@ String scarNo = request.getParameter("carNo");
 
 	<br/>

 	应用类型:<input type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getAppTypeName()) %>" readonly="readonly">

 	车主姓名:<input type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getCarOwnerName()) %>" readonly="readonly">

-	联系电话:<input type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getPhone()) %>" readonly="readonly">

+	

+	联系电话:<input id="phone1" type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getPhone()) %>" readonly="readonly">

 	操作状态:<input type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getOperStateName()) %>" readonly="readonly">

 	<br/>

 	发动机号:<input type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getEngineNo()) %>" readonly="readonly">

 	发证时间:<input type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getRegTime1()) %>" readonly="readonly">

-	单位电话:<input type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getCarUnitPhone()) %>" readonly="readonly">

+	单位电话:<input id="phone2" type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getCarUnitPhone()) %>" readonly="readonly">

 	安装单位:<input type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getInstallStation()) %>" readonly="readonly">

 	<br/>

 	车&nbsp;架&nbsp;&nbsp;号:<input type="text" style="width: 200px;height: 26px;border: none;line-height:33px;background:none;" value="<%=Util.removeNull(carlist.get(0).getVin()) %>" readonly="readonly">

+ 2 - 2
WebRoot/jsp/rzx/filling/Dynamicattempt.jsp
Просмотреть файл 

@@ -154,7 +154,7 @@ List<Station> slist = new ArrayList<Station>();
 
   							});

   							//setInterval('getcng()',2*60*1000);

   							

-  							setTimeout('getcng1()',3*60*1000);

+  							setTimeout('getcng1()',1*60*1000);

 											}

 				});

 				}

@@ -231,7 +231,7 @@ List<Station> slist = new ArrayList<Station>();
 
   							});

   							//setInterval('getcng()',2*60*1000);

   							

-  							setTimeout('getcng1()',3*60*1000);

+  							setTimeout('getcng1()',1*60*1000);

 											}

 				});

 				}

+ 2 - 2
WebRoot/jsp/rzx/filling/Dynamicattempt1.jsp
Просмотреть файл 

@@ -166,7 +166,7 @@ List<Station> slist = new ArrayList<Station>();
 
 						    	v = v0+vcar1+vperson1+vmachine+vperson2+vcar2+v00;

   								document.getElementById("tableDiv").innerHTML += v;

   							});

-  							setTimeout('getcng1()',2*60*1000);

+  							setTimeout('getcng1()',1*60*1000);

 											}

 				});

 				}

@@ -242,7 +242,7 @@ List<Station> slist = new ArrayList<Station>();
 
 						    	v = v0+vcar1+vperson1+vmachine+vperson2+vcar2+v00;

   								document.getElementById("tableDiv").innerHTML += v;

   							});

-  							setTimeout('getcng1()',2*60*1000);

+  							setTimeout('getcng1()',1*60*1000);

 											}

 				});

 				}

+ 33 - 0
WebRoot/jsp/rzx/fillingbgman.jsp
Просмотреть файл 

@@ -32,6 +32,26 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 							}

 						}

 					}

+					

+					

+//查询各部门有效期

+	String validity="";

+	List<Announcement> list1 = new InformationAnnouncementProcedure()

+			.checkValidity((String)request.getSession().getAttribute("PrivilegeCode"),(String)request.getSession().getAttribute("sOperatorNo"),s,Integer.parseInt((String)session.getAttribute(Constant.moudel)));

+	if (list1.size() > 0) {

+		Announcement an = new Announcement(); 

+		an=list1.get(0);

+		if(an.getL()>0){

+			validity+="<span style='color: yellow;'>证书快过期！";

+		}else{

+			validity+="<span style='color: red;'>证书已过期！";

+		}

+		validity+= "<br/>站点编号："+an.getStationNo()+" <br/>站点名："+an.getStationName()+" <br/>有效期："+an.getValidity()+" <br/>联系人："+an.getManager()+" <br/>电话："+an.getPhone();	

+		validity+="</span>";

+	}

+	if (list1.size() > 1) {

+		validity+="<br/><a href='CheckValidity' target='_blank'>还有"+(list1.size()-1)+"条过期信息，点击查询&gt;&gt;</a>";

+	}					

 %>

 		

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

@@ -78,6 +98,18 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 			}

 				

 			}

+			

+			var validity = document.getElementById("validity").value;

+			if(validity){

+				$.messager.show({  

+	                title: '证书信息提示',  

+	                msg: validity,  

+	                timeout: 0,  

+	                showType: 'slide' ,

+	                width:400,

+	                height:200 

+	            }); 

+			}

 		});

 	

 	var _menus = {

@@ -463,5 +495,6 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 	<input type="hidden" value="<%=title %>" name="newAnnTitle" id="newAnnTitle"/>

 	<input type="hidden" value="<%=id %>" name="newAnnID" id="newAnnID"/>

 	<input type="hidden" value="<%=anTime %>" name="newAnnTIME" id="newAnnTIME"/>

+	<input type="hidden" value="<%=validity%>" name="validity" id="validity"/>

 	</body>

 </html>

+ 37 - 0
WebRoot/jsp/rzx/modifybgman.jsp
Просмотреть файл 

@@ -32,6 +32,25 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 							}

 						}

 					}

+					

+//查询各部门有效期

+	String validity="";

+	List<Announcement> list1 = new InformationAnnouncementProcedure()

+			.checkValidity((String)request.getSession().getAttribute("PrivilegeCode"),(String)request.getSession().getAttribute("sOperatorNo"),s,Integer.parseInt((String)session.getAttribute(Constant.moudel)));

+	if (list1.size() > 0) {

+		Announcement an = new Announcement(); 

+		an=list1.get(0);

+		if(an.getL()>0){

+			validity+="<span style='color: yellow;'>证书快过期！";

+		}else{

+			validity+="<span style='color: red;'>证书已过期！";

+		}

+		validity+= "<br/>站点编号："+an.getStationNo()+" <br/>站点名："+an.getStationName()+" <br/>有效期："+an.getValidity()+" <br/>联系人："+an.getManager()+" <br/>电话："+an.getPhone();	

+		validity+="</span>";

+	}

+	if (list1.size() > 1) {

+		validity+="<br/><a href='CheckValidity' target='_blank'>还有"+(list1.size()-1)+"条过期信息，点击查询&gt;&gt;</a>";

+	}					

 %>

 		

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

@@ -78,6 +97,18 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 			}

 				

 			}

+			

+			var validity = document.getElementById("validity").value;

+			if(validity){

+				$.messager.show({  

+	                title: '证书信息提示',  

+	                msg: validity,  

+	                timeout: 0,  

+	                showType: 'slide' ,

+	                width:400,

+	                height:200 

+	            }); 

+			}

 		});

 	

 	var _menus = {

@@ -161,6 +192,11 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 				"menuname": "改装数据统计",

 				"icon": "icon-large-chart",

 				"url": "jsp/rzx/dataStatistics/ModifydataStatistics.jsp"

+			},{

+				"menuid": "165",

+				"menuname": "标签发放信息统计",

+				"icon": "icon-search",

+				"url": "jsp/rzx/dataStatistics/tagIssuingInfoStatistics.jsp"

 			}]

 	},

 	{

@@ -449,5 +485,6 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 	<input type="hidden" value="<%=title %>" name="newAnnTitle" id="newAnnTitle"/>

 	<input type="hidden" value="<%=id %>" name="newAnnID" id="newAnnID"/>

 	<input type="hidden" value="<%=anTime %>" name="newAnnTIME" id="newAnnTIME"/>

+	<input type="hidden" value="<%=validity%>" name="validity" id="validity"/>

 	</body>

 </html>

+ 38 - 0
WebRoot/jsp/rzx/testingbgman.jsp
Просмотреть файл 

@@ -32,6 +32,26 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 							}

 						}

 					}

+					

+					

+//查询各部门有效期

+	String validity="";

+	List<Announcement> list1 = new InformationAnnouncementProcedure()

+			.checkValidity((String)request.getSession().getAttribute("PrivilegeCode"),(String)request.getSession().getAttribute("sOperatorNo"),s,Integer.parseInt((String)session.getAttribute(Constant.moudel)));

+	if (list1.size() > 0) {

+		Announcement an = new Announcement(); 

+		an=list1.get(0);

+		if(an.getL()>0){

+			validity+="<span style='color: yellow;'>证书快过期！";

+		}else{

+			validity+="<span style='color: red;'>证书已过期！";

+		}

+		validity+= "<br/>站点编号："+an.getStationNo()+" <br/>站点名："+an.getStationName()+" <br/>有效期："+an.getValidity()+" <br/>联系人："+an.getManager()+" <br/>电话："+an.getPhone();	

+		validity+="</span>";

+	}

+	if (list1.size() > 1) {

+		validity+="<br/><a href='CheckValidity' target='_blank'>还有"+(list1.size()-1)+"条过期信息，点击查询&gt;&gt;</a>";

+	}					

 %>

 		

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

@@ -78,6 +98,18 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 			}

 				

 			}

+			

+			var validity = document.getElementById("validity").value;

+			if(validity){

+				$.messager.show({  

+	                title: '证书信息提示',  

+	                msg: validity,  

+	                timeout: 0,  

+	                showType: 'slide' ,

+	                width:400,

+	                height:200 

+	            }); 

+			}

 		});

 	

 	var _menus = {

@@ -177,6 +209,11 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 				"menuname": "气瓶数据统计",

 				"icon": "icon-large-smartart",

 				"url": "jsp/rzx/dataStatistics/CylinderdataStatistics.jsp"

+			},{

+				"menuid": "165",

+				"menuname": "标签发放信息统计",

+				"icon": "icon-search",

+				"url": "jsp/rzx/dataStatistics/tagIssuingInfoStatistics.jsp"

 			}]

 	},

 	{

@@ -465,5 +502,6 @@ User uu = (User)session.getAttribute(Constant.userMark);
 
 	<input type="hidden" value="<%=title %>" name="newAnnTitle" id="newAnnTitle"/>

 	<input type="hidden" value="<%=id %>" name="newAnnID" id="newAnnID"/>

 	<input type="hidden" value="<%=anTime %>" name="newAnnTIME" id="newAnnTIME"/>

+	<input type="hidden" value="<%=validity%>" name="validity" id="validity"/>

 	</body>

 </html>

+ 72 - 7
src/com/runzhixing/action/CarDataStatisticsAction.java
Просмотреть файл 

@@ -19,6 +19,7 @@ import com.runzhixing.bean.StatData1;
 
 import com.runzhixing.bean.User;

 import com.runzhixing.constant.Constant;

 import com.runzhixing.packageProcedure.CarsDataStatisticsProcedure;

+import com.runzhixing.tool.JsonUtil;

 import com.runzhixing.tool.Util;

 /**

  * 告警参数设置

@@ -76,9 +77,69 @@ public class CarDataStatisticsAction extends ActionSupport {
 
 			endTime = Util.dateChange(eet);

 		}

 		int isEffi = Util.calculateFlag(startTime, endTime);

-		

-		List<StatData1>  list1 = new CarsDataStatisticsProcedure().queryCarStatList(privilegeCode, regionNo, searchType, startTime, endTime,isEffi);

-		

+		List<StatData1>  list1 = new ArrayList<StatData1>();

+		if(regionNo.equals("51")||regionNo.equals("5101")){

+			StatData1 st = new StatData1();

+			st.setCateName("出租");

+			st.setSeriesName("成都市");

+			st.setValue(8766.0f);

+			list1.add(st);

+			

+			st = new StatData1();

+			st.setCateName("公交");

+			st.setSeriesName("成都市");

+			st.setValue(2980.0f);

+			list1.add(st);

+			

+			

+			st = new StatData1();

+			st.setCateName("私用");

+			st.setSeriesName("成都市");

+			st.setValue(72187.0f);

+			list1.add(st);

+			

+			st = new StatData1();

+			st.setCateName("货运");

+			st.setSeriesName("成都市");

+			st.setValue(1378.0f);

+			list1.add(st);

+			

+			

+			st = new StatData1();

+			st.setCateName("客运");

+			st.setSeriesName("成都市");

+			st.setValue(3132.0f);

+			list1.add(st);

+			

+			

+			st = new StatData1();

+			st.setCateName("营转非");

+			st.setSeriesName("成都市");

+			st.setValue(2317.0f);

+			list1.add(st);

+			

+			st = new StatData1();

+			st.setCateName("其他");

+			st.setSeriesName("成都市");

+			st.setValue(7981.0f);

+			list1.add(st);

+		}

+		int CancelFlag=0;

+		CancelFlag = Integer.parseInt(req.getParameter("CancelFlag"));

+//		list1.addAll( new CarsDataStatisticsProcedure().queryCarStatList(privilegeCode, regionNo, searchType, startTime, endTime,isEffi));

+		list1.addAll( new CarsDataStatisticsProcedure().queryCarStatList0111(privilegeCode, regionNo, searchType, startTime, endTime,isEffi,CancelFlag));

+		float sum=0.0f;

+		if(list1!=null&&list1.size()>0){

+			for(int i=0;i<list1.size();i++){

+				StatData1 st = list1.get(i);

+				sum+=list1.get(i).getValue();

+				if(st.getSeriesName()!=null&&st.getSeriesName().contains("四川省")){

+					list1.get(i).setSeriesName(st.getSeriesName().substring(st.getSeriesName().indexOf("四川省")+3, st.getSeriesName().length()));

+				}

+			}

+			//成都的数量

+			sum+=0f;

+		}

 		

 		 String pName = (String)req.getParameter("cylinderpName")+".png";

 		 if(searchType==0){//按所选地区应用类型统计

@@ -148,7 +209,7 @@ public class CarDataStatisticsAction extends ActionSupport {
 
 				 for(int j=0;j<ls.size();j++){//这是一行

 					 for(StatData1 sd:list1){

 						 if(sd.getCateName().equals(ls1.get(i))){

-							 System.out.println("首先是："+ls1.get(i));

+//							 System.out.println("首先是："+ls1.get(i));

 							 if(sd.getSeriesName().equals(ls.get(j))){

 								 data[i][j]+=Double.parseDouble(String.valueOf(sd.getValue()));

 							 }

@@ -207,9 +268,13 @@ public class CarDataStatisticsAction extends ActionSupport {
 
 		 }

 		 

 		

-		response.setContentType("text/html;charset=utf-8");

-		PrintWriter out = response.getWriter();

-		out.write("");

+//		response.setContentType("text/html;charset=utf-8");

+//		PrintWriter out = response.getWriter();

+//		out.write("");

+		 

+		 Map<String,Object> map=new HashMap<String, Object>();

+		map.put("status",sum);

+		JsonUtil.outjson(map, response, null, JsonUtil.df, "");

 	}

 	@SuppressWarnings("unchecked")

 	public static List quchong(List list){

+ 26 - 1
src/com/runzhixing/action/CarsDataQueryAction.java
Просмотреть файл 

@@ -107,8 +107,33 @@ public class CarsDataQueryAction extends ActionSupport {
 
 		int pageno = Integer.parseInt(req.getParameter("page"));

 		

 		List<Car>  list1 = new CarsDataQueryProcedure().carsDataQueryre(pagesize, pageno,carGuid,distNo,carNo,unitsNo,carOwnerUnit,plateType,regNo,carOwnerName,appType,engineNo,vin,opeState,startTime,endTime,ifEffi,installStation);

+		

 		User u = (User) req.getSession().getAttribute(Constant.carSum);

-		map.put("total", u.getCarSum());

+		//成都车辆的数据

+		int sum=0;

+		if(distNo.equals("51")||distNo.equals("5101")){

+			if(appType==-1){

+				sum=98741;

+			}else if(appType==1){

+				sum=8766;

+			}else if(appType==2){

+				sum=2980;

+			}else if(appType==3){

+				sum=72187;

+			}else if(appType==4){

+				sum=1378;

+			}else if(appType==5){

+				sum=3132;

+			}else if(appType==6){

+				sum=2317;

+			}else if(appType==9){

+				sum=0;

+			}else if(appType==0){

+				sum=7981;

+			}

+			

+		}

+		map.put("total", u.getCarSum()+sum);

 		map.put("rows", list1);

 		String result = new JSONObject().fromObject(map).toString();

 		response.setContentType("text/html;charset=utf-8");

+ 13 - 1
src/com/runzhixing/action/CylinderDataQueryAction.java
Просмотреть файл 

@@ -360,7 +360,19 @@ public class CylinderDataQueryAction extends ActionSupport {
 
 		

 		

 		User u = (User) req.getSession().getAttribute(Constant.cylinderSum);

-		map.put("total", u.getCylinderSum());

+		//成都气瓶的数据

+		int sum=0;

+		if(distNo.equals("51")||distNo.equals("5101")){

+			if(cylinderType==-1){

+				sum=174820;

+			}else if(cylinderType==1){

+				sum=36790;

+			}else if(cylinderType==2){

+				sum=138030;

+			}

+			

+		}

+		map.put("total", u.getCylinderSum()+sum);

 		map.put("rows", list1);

 		String result = new JSONObject().fromObject(map).toString();

 		response.setContentType("text/html;charset=utf-8");

+ 299 - 17
src/com/runzhixing/action/CylinderDataStatisticsAction.java
Просмотреть файл 

@@ -1,7 +1,10 @@
 
 package com.runzhixing.action;

 

 import java.io.PrintWriter;

+import java.sql.Date;

+import java.util.ArrayList;

 import java.util.HashMap;

+import java.util.HashSet;

 import java.util.List;

 import java.util.Map;

 

@@ -16,6 +19,8 @@ import com.opensymphony.xwork2.ActionSupport;
 
 import com.runzhixing.bean.StatData1;

 import com.runzhixing.constant.Constant;

 import com.runzhixing.packageProcedure.CylinderDataStatisticsProcedure;

+import com.runzhixing.tool.JsonUtil;

+import com.runzhixing.tool.Util;

 /**

  * 告警参数设置

  * @author 小黄

@@ -32,7 +37,7 @@ public class CylinderDataStatisticsAction extends ActionSupport {
 
 		

 		

 		

-		Map map=new HashMap();

+		//Map map=new HashMap();

 		//获取地址，默认全部

 		String province = req.getParameter("province");

 		String city = req.getParameter("city");

@@ -50,29 +55,306 @@ public class CylinderDataStatisticsAction extends ActionSupport {
 
 		regionNo = regionNo.replaceAll("(00)*$", "");

 		//根据地址获取地址编号

 		

-		List<StatData1>  list1 = new CylinderDataStatisticsProcedure().queryCylinderSum(regionNo);

 		

 		

-		 Map<String,Double> map1 = new HashMap<String,Double>();

-		 if(list1.size()>0){

+		

+		

+		

+		List<StatData1>  list1 = new ArrayList<StatData1>();

+		if(regionNo.equals("51")||regionNo.equals("5101")){

+			StatData1 st = new StatData1();

+			st.setCateName("钢质内胆");

+			st.setSeriesName("成都市");

+			st.setValue(36790.0f);

+			list1.add(st);

+			

+			st = new StatData1();

+			st.setCateName("钢质内胆环向缠绕气瓶");

+			st.setSeriesName("成都市");

+			st.setValue(138030.0f);

+			list1.add(st);

+		}

+		

+		

+		

+		

+		

+		int searchType = Integer.parseInt(req.getParameter("searchType"));

+

+

+		String est = req.getParameter("startTime");

+		String eet = req.getParameter("endTime");

+		//开始日期

+		

+		Date startTime = null;

+		

+		

+		//结束日期

+		Date endTime =null;

+		

+		if(est!=null&&!est.equals("")){

+			startTime = Util.dateChange(est);

+		}

+		if(eet!=null&&!eet.equals("")){

+			endTime = Util.dateChange(eet);

+		}

+		int isEffi = Util.calculateFlag(startTime, endTime);

+		

+		int CancelFlag = Integer.parseInt(req.getParameter("CancelFlag"));

+		

+		list1.addAll(new CylinderDataStatisticsProcedure().queryCylinderSum0111(regionNo,searchType,startTime,endTime,isEffi,CancelFlag));

+		float sum=0.0f;

+		if(list1!=null&&list1.size()>0){

+			for(int i=0;i<list1.size();i++){

+				StatData1 st = list1.get(i);

+				sum+=list1.get(i).getValue();

+				if(st.getSeriesName()!=null&&st.getSeriesName().contains("四川省")){

+					list1.get(i).setSeriesName(st.getSeriesName().substring(st.getSeriesName().indexOf("四川省")+3, st.getSeriesName().length()));

+				}

+			}

+		}

+		

+//		 Map<String,Double> map1 = new HashMap<String,Double>();

+//		 if(list1.size()>0){

+//			 for(StatData1 sd:list1){

+//				 map1.put(sd.getCateName(), Double.parseDouble(String.valueOf(sd.getValue())));

+//			 }

+//		 }else{

+//			 map1.put(" ", Double.parseDouble("0.0"));

+//			 map1.put("", Double.parseDouble("0.0"));

+//		 }

+//		 

+//		 

+//		 new Test().makePieChart2(map1,(String)req.getParameter("cylinderpName")+".png");

+		

+		 

+		

+		

+		 String pName = (String)req.getParameter("cylinderpName")+".png";

+		 if(searchType==0){//按所选地区应用类型统计

+			 for ( int i = 0 ; i < list1.size(); i ++ ) { 

+				 for ( int j = list1.size() - 1 ; j > i; j -- ) { 

+					 if(list1.get(i).getCateName().equals(list1.get(j).getCateName())){

+		                	list1.get(i).setValue(list1.get(i).getValue()+list1.get(j).getValue());

+		                	list1.remove(j);

+		                } 

+				 } 

+				 } 

+			 

+			 int lsize = list1.size();

+			 double[][] data = new  double[1][lsize];

+			 String[] rowKeys = new String[1];

+			 String[] columnKeys = new String[lsize];

+			 

+			 if(list1.size()>0){

+				 int i =0;

+				 for(StatData1 sd:list1){

+					 data[0][i]=Double.parseDouble(String.valueOf(sd.getValue()));

+					 rowKeys[0]="车辆";

+					 columnKeys[i]=sd.getCateName();

+					 i++;

+				 }

+			 }

+			 new CreateChartServiceImpl().makeBarGroupChart1(data, rowKeys, columnKeys, pName);

+		 }else if(searchType==1){

+			 List<String> ls = new ArrayList<String>();

+			 List<String> ls1 = new ArrayList<String>();

 			 for(StatData1 sd:list1){

-				 map1.put(sd.getCateName(), Double.parseDouble(String.valueOf(sd.getValue())));

+				 ls.add(sd.getSeriesName());

+				 ls1.add(sd.getCateName());

+			 }

+			 ls = quchong(ls);//列数

+			 ls1 = quchong(ls1);//行数

+			 double[][] data = new  double[ls1.size()][ls.size()];

+			 String[] rowKeys = new String[ls.size()];

+			 String[] columnKeys = new String[ls1.size()];

+			 int f=0;

+			 for(String s:ls){

+				 if(f<ls.size()){

+//					 if(s.length()>8){

+//						 s=s.substring(s.length()-8, s.length());

+//					 }

+					 

+					

+					 

+					 rowKeys[f] = s;

+					 String checkText = "qita";

+					 if(s.contains(checkText)){

+						 rowKeys[f] = s.substring(s.indexOf(checkText)+checkText.length(), s.length());

+						 if(rowKeys[f]==null||rowKeys[f].equals("")||rowKeys[f].trim().length()==0){

+							 rowKeys[f] = checkText;

+						 }

+					 }

+					 

+				 }

+				 f++;

 			 }

-		 }else{

-			 map1.put(" ", Double.parseDouble("0.0"));

-			 map1.put("", Double.parseDouble("0.0"));

+			 int ff=0;

+			 for(String s:ls1){

+				 if(ff<ls1.size())

+					 columnKeys[ff]=s;

+				 ff++;

+			 }

+			 for(int i=0;i<ls1.size();i++){//这是一列

+				 for(int j=0;j<ls.size();j++){//这是一行

+					 for(StatData1 sd:list1){

+						 if(sd.getCateName().equals(ls1.get(i))){

+//							 System.out.println("首先是："+ls1.get(i));

+							 if(sd.getSeriesName().equals(ls.get(j))){

+								 data[i][j]+=Double.parseDouble(String.valueOf(sd.getValue()));

+							 }

+						 }

+					 }

+					 

+					 

+					 

+				 }

+				 

+				 

+				 

+			 }

+			 

+			 System.out.println(data);

+			 System.out.println(rowKeys);

+			 System.out.println(columnKeys);

+			 new CreateChartServiceImpl().makeBarGroupChart1(data, columnKeys, rowKeys, pName);

+			 

+		 }else if(searchType==2){

+		 	if(list1.size()>0){

+		 		for(int i =0;i<list1.size();i++){

+		 			for(int j=list1.size()-1;j>i;j--){

+		 				if(list1.get(i).getSeriesName().equals(list1.get(j).getSeriesName())){

+		 					list1.get(i).setValue(list1.get(i).getValue()+list1.get(j).getValue());

+		 					list1.remove(j);

+		 				}

+		 			}

+		 		}

+		 	}

+		 	String checkText = "qita";

+			 checkText = checkText.replace("无", "");

+			 checkText = checkText.replace("全部", "");

+			 System.out.println(checkText);

+		 	int le = list1.size();

+		 	double[][] data = new  double[1][le];

+			String[] rowKeys = new String[le];

+			String[] columnKeys = {"车辆"};

+			int k=0;

+			for(StatData1 sd:list1){

+				data[0][k] = Double.parseDouble(String.valueOf(sd.getValue()));

+				rowKeys[k] = sd.getSeriesName();

+					

+					

+					String s=sd.getSeriesName();

+					 if(s.contains(checkText)){

+						 rowKeys[k] = s.substring(s.indexOf(checkText)+checkText.length(), s.length());

+						 if(rowKeys[k]==null||rowKeys[k].equals("")||rowKeys[k].trim().length()==0){

+							 rowKeys[k] = checkText;

+						 }

+					 }

+					 k++;

+					

+			}

+			new CreateChartServiceImpl().makeBarGroupChart1(data, columnKeys, rowKeys, pName);

 		 }

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

+		

 		 

 		 

-		 //new Test().makePieChart2(map1,(String)req.getSession().getAttribute("cylinderpName"));

-		 new Test().makePieChart2(map1,(String)req.getParameter("cylinderpName")+".png");

-		

-//		map.put("total", null);

-//		map.put("rows", null);

-//		String result = new JSONObject().fromObject(map).toString();

-		response.setContentType("text/html;charset=utf-8");

-		PrintWriter out = response.getWriter();

-		out.write("");

+		 

+		 

+		 

+		 if(list1.size()>0){

+		 		for(int i =0;i<list1.size();i++){

+		 			for(int j=list1.size()-1;j>i;j--){

+		 				if(list1.get(i).getSeriesName().equals(list1.get(j).getSeriesName())){

+		 					list1.get(i).setValue(list1.get(i).getValue()+list1.get(j).getValue());

+		 					list1.remove(j);

+		 				}

+		 			}

+		 		}

+		 	}

+//		 String pName = (String)req.getParameter("cylinderpName")+".png";

+//			 String checkText = "qita";

+//			 checkText = checkText.replace("无", "");

+//			 checkText = checkText.replace("全部", "");

+//			 System.out.println(checkText);

+//		 	int le = list1.size();

+//		 	double[][] data = new  double[1][le];

+//			String[] rowKeys = new String[le];

+//			String[] columnKeys = {"车辆"};

+//			int k=0;

+//			for(StatData1 sd:list1){

+//				data[0][k] = Double.parseDouble(String.valueOf(sd.getValue()));

+//				rowKeys[k] = sd.getSeriesName();

+//					

+//					

+//					String s=sd.getSeriesName();

+//					 if(s.contains(checkText)){

+//						 rowKeys[k] = s.substring(s.indexOf(checkText)+checkText.length(), s.length());

+//						 if(rowKeys[k]==null||rowKeys[k].equals("")||rowKeys[k].trim().length()==0){

+//							 rowKeys[k] = checkText;

+//						 }

+//					 }

+//					 k++;

+//					

+//			}

+//			new CreateChartServiceImpl().makeBarGroupChart1(data, columnKeys, rowKeys, pName);

+		 

+		 

+		 

+		 

+		 

+		 

+		 

+		 

+		 

+		 

+		 

+		 

+		 

+		 Map<String,Object> map=new HashMap<String, Object>();

+			map.put("status",sum);

+			JsonUtil.outjson(map, response, null, JsonUtil.df, "");

+	}

+	

+	@SuppressWarnings("unchecked")

+	public static List quchong(List list){

+		HashSet h = new HashSet(list); 

+		list.clear(); 

+		list.addAll(h); 

+		return list;

+	}

+	public static List quchong1(List list){

+		if(list.size()>0){

+			for(int i=0;i<list.size();i++){

+					for(int j=list.size()-1;j>i;j++){

+						if(list.get(i)==list.get(j)){

+							list.remove(j);

+						}

+					}

+				}

+		}

+		return list;

 	}

 }

+ 26 - 0
src/com/runzhixing/action/CylinderFollowAction.java
Просмотреть файл 

@@ -14,10 +14,12 @@ import net.sf.json.JSONObject;
 
 import org.apache.struts2.ServletActionContext;

 

 import com.opensymphony.xwork2.ActionSupport;

+import com.runzhixing.bean.Announcement;

 import com.runzhixing.bean.CylinderFollow;

 import com.runzhixing.bean.User;

 import com.runzhixing.constant.Constant;

 import com.runzhixing.packageProcedure.CylinderfollowProcedure;

+import com.runzhixing.packageProcedure.InformationAnnouncementProcedure;

 

 @SuppressWarnings("serial")

 public class CylinderFollowAction extends ActionSupport {

@@ -51,4 +53,28 @@ public class CylinderFollowAction extends ActionSupport {
 
 		req.getSession().setAttribute("cylinderfollow", (String)req.getParameter("cylinderguid"));

 		return SUCCESS;

 	}

+	public String CheckValidity() throws IOException{

+		return SUCCESS;

+	}

+	@SuppressWarnings({ "unchecked", "static-access" })

+	public void CheckValidity1() throws IOException{

+		

+		HttpServletRequest req = ServletActionContext.getRequest();

+		HttpServletResponse response = ServletActionContext.getResponse();

+		Map map=new HashMap();

+		User uu = (User) req.getSession().getAttribute(Constant.userMark);

+		String s = uu.getPrivilegeCode();

+		if (s.length() > 6) {

+			s = s.substring(0, 6);

+		}

+		s = s.replaceAll("(00)*$", "");//// 一直过滤到最高行政地域(删去尾部的 00 )

+		List<CylinderFollow> list1 = new InformationAnnouncementProcedure()

+		.checkValidity1((String)req.getSession().getAttribute("PrivilegeCode"),(String)req.getSession().getAttribute("sOperatorNo"),s,Integer.parseInt((String)req.getSession().getAttribute(Constant.moudel)));

+		map.put("total", list1.size());

+		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);

+	}

 }

+ 1 - 1
src/com/runzhixing/action/CylinderGuidAction.java
Просмотреть файл 

@@ -69,7 +69,7 @@ public class CylinderGuidAction extends ActionSupport {
 
 		String distNo = Util.s4;

 		String cylinderGuid =Util.s1;

 		String carGuid =Util.s2;

-		List<TagInfo> list = new TagIssuingInfoProcedure().queryTagInfoList(500, 1, null, null, "", "", carNo, "", -1, -1, "", "", -1, "", -1, distNo,"",carGuid,cylinderGuid, -1);

+		List<TagInfo> list = new TagIssuingInfoProcedure().queryTagInfoList(500, 1, null, null, "", "", carNo, "", -1, -1, "", "", -1, "", -1, distNo,"",carGuid,cylinderGuid, -1,-1);

 		

 		req.getSession().setAttribute("tagQuerydo", list);

 		return SUCCESS;

+ 72 - 1
src/com/runzhixing/action/TagIssuingfromAction.java
Просмотреть файл 

@@ -66,6 +66,7 @@ public class TagIssuingfromAction extends ActionSupport {
 
 		int checkState = Integer.parseInt(req.getParameter("checkState"));

 		String tagOutOper = req.getParameter("tagOutOper");

 		int cylinderType = Integer.parseInt(req.getParameter("cylinderType"));

+		int tagType = Integer.parseInt(req.getParameter("tagType"));

 		String emitStation = req.getParameter("checkStation");

 		int tagState = Integer.parseInt(req.getParameter("tagState"));

 		if(emitStation.equals("00")){

@@ -91,7 +92,7 @@ public class TagIssuingfromAction extends ActionSupport {
 
 		if(emitStation==null||emitStation.equals("")){

 			emitStation = regionNo;

 		}

-		List<TagInfo> list = new TagIssuingInfoProcedure().queryTagInfoList(pagesize, pageno, startTime, endTime, tagNo, tagUid, carNo, baseNo, plateType, appType, installStation, checkStation, checkState, tagOutOper, cylinderType, emitStation,null,null,null, tagState);

+		List<TagInfo> list = new TagIssuingInfoProcedure().queryTagInfoList(pagesize, pageno, startTime, endTime, tagNo, tagUid, carNo, baseNo, plateType, appType, installStation, checkStation, checkState, tagOutOper, cylinderType, emitStation,null,null,null, tagState,tagType);

 		User u = (User) req.getSession().getAttribute(Constant.TagIssuingSum);

 		map.put("total", u.getTagIssuingSum());

 		map.put("rows", list);

@@ -100,5 +101,75 @@ public class TagIssuingfromAction extends ActionSupport {
 
 		PrintWriter out = response.getWriter();

 		out.write(result);

 	}

+	

+	public void tagIssuingStatistics() throws IOException{

+		HttpServletResponse response = ServletActionContext.getResponse();

+		HttpServletRequest req = ServletActionContext.getRequest();

+		Map map=new HashMap();

+		User user = (User)req.getSession().getAttribute(Constant.userMark); 

+		int moudel = user.getModule();

+		

+		

+		String ssid = (String) req.getSession().getAttribute(Constant.Privilege);

+		int pagesize = Integer.parseInt(req.getParameter("psize"));

+		int pageno = Integer.parseInt(req.getParameter("page"));

+		

+		Date startTime = null;

+		

+		Date endTime = null;

+		String st = req.getParameter("startTime");

+		String et = req.getParameter("endTime");

+		if(st!=null&&!st.equals("")){

+			startTime = Util.dateChange(st);

+		}

+		if(et!=null&&!et.equals("")){

+			endTime = Util.dateChange(et);

+		}

+		String tagNo=req.getParameter("tagNo");

+		String tagUid = req.getParameter("tagUid");

+		String carNo = req.getParameter("carNo");

+		String baseNo = req.getParameter("baseNo");

+		int plateType = Integer.parseInt(req.getParameter("plateType"));

+		int appType = Integer.parseInt(req.getParameter("appType"));

+		String installStation = req.getParameter("installStation");

+		String checkStation = req.getParameter("checkStation11");

+		int checkState = Integer.parseInt(req.getParameter("checkState"));

+		String tagOutOper = req.getParameter("tagOutOper");

+		int cylinderType = Integer.parseInt(req.getParameter("cylinderType"));

+		int tagType = Integer.parseInt(req.getParameter("tagType"));

+		String emitStation = req.getParameter("checkStation");

+		int tagState = Integer.parseInt(req.getParameter("tagState"));

+		if(emitStation.equals("00")){

+			emitStation = user.getPriCode();

+		}

+//		if(ssid.length()==12&&moudel!=1&&emitStation.length()!=12&&!emitStation.equals(user.getPriCode())){

+//			emitStation=ssid;

+//		}

+		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)*$", "");

+		if(emitStation==null||emitStation.equals("")){

+			emitStation = regionNo;

+		}

+		List<TagInfo> list = new TagIssuingInfoProcedure().queryTagInfoStatistics(pagesize, pageno, startTime, endTime, tagNo, tagUid, carNo, baseNo, plateType, appType, installStation, checkStation, checkState, tagOutOper, cylinderType, emitStation,null,null,null, tagState,tagType);

+		User u = (User) req.getSession().getAttribute("TagIssuingStatics");

+		map.put("total", u.getTagIssuingSum());

+		map.put("rows", list);

+		String result = new JSONObject().fromObject(map).toString();

+		response.setContentType("text/html;charset=utf-8");

+		PrintWriter out = response.getWriter();

+		out.write(result);

+	}

 }

+ 68 - 0
src/com/runzhixing/bean/Announcement.java
Просмотреть файл 

@@ -119,4 +119,72 @@ public class Announcement {
 
 	public void setStateName(String stateName) {

 		this.stateName = stateName;

 	}

+	

+	private String stationNo;

+	private String stationName;

+	private String licence;

+	private String licenceorg;

+	private String licencedate;

+	private String validity;

+	private String manager;

+	private String phone;

+	private long l=0l;

+	public String getStationNo() {

+		return stationNo;

+	}

+	public void setStationNo(String stationNo) {

+		this.stationNo = stationNo;

+	}

+	public String getStationName() {

+		return stationName;

+	}

+	public void setStationName(String stationName) {

+		this.stationName = stationName;

+	}

+	public String getLicence() {

+		return licence;

+	}

+	public void setLicence(String licence) {

+		this.licence = licence;

+	}

+	public String getLicenceorg() {

+		return licenceorg;

+	}

+	public void setLicenceorg(String licenceorg) {

+		this.licenceorg = licenceorg;

+	}

+	public String getLicencedate() {

+		return licencedate;

+	}

+	public void setLicencedate(String licencedate) {

+		this.licencedate = licencedate;

+	}

+	public String getValidity() {

+		return validity;

+	}

+	public void setValidity(String validity) {

+		this.validity = validity;

+	}

+	public String getManager() {

+		return manager;

+	}

+	public void setManager(String manager) {

+		this.manager = manager;

+	}

+	public String getPhone() {

+		return phone;

+	}

+	public void setPhone(String phone) {

+		this.phone = phone;

+	}

+	public long getL() {

+		return l;

+	}

+	public void setL(long l) {

+		this.l = l;

+	}

+	public Announcement() {

+		super();

+	}

+	

 }

+ 61 - 0
src/com/runzhixing/bean/CylinderFollow.java
Просмотреть файл 

@@ -109,4 +109,65 @@ public class CylinderFollow {
 
 	  private String editOperator; //  最近编辑人

 	  private Date editOperTime; // 最近编辑时间 

 	  private String editOperTime1; // 最近编辑时间 

+	  

+	  

+	  

+		private String stationName;

+		private String licence;

+		private String licenceorg;

+		private String licencedate;

+		private String validity;

+		private String manager;

+		private String phone;

+		private long l=0l;

+		public String getStationName() {

+			return stationName;

+		}

+		public void setStationName(String stationName) {

+			this.stationName = stationName;

+		}

+		public String getLicence() {

+			return licence;

+		}

+		public void setLicence(String licence) {

+			this.licence = licence;

+		}

+		public String getLicenceorg() {

+			return licenceorg;

+		}

+		public void setLicenceorg(String licenceorg) {

+			this.licenceorg = licenceorg;

+		}

+		public String getLicencedate() {

+			return licencedate;

+		}

+		public void setLicencedate(String licencedate) {

+			this.licencedate = licencedate;

+		}

+		public String getValidity() {

+			return validity;

+		}

+		public void setValidity(String validity) {

+			this.validity = validity;

+		}

+		public String getManager() {

+			return manager;

+		}

+		public void setManager(String manager) {

+			this.manager = manager;

+		}

+		public String getPhone() {

+			return phone;

+		}

+		public void setPhone(String phone) {

+			this.phone = phone;

+		}

+		public long getL() {

+			return l;

+		}

+		public void setL(long l) {

+			this.l = l;

+		}

+		

+		

 }

+ 1 - 0
src/com/runzhixing/bean/StatData1.java
Просмотреть файл 

@@ -22,4 +22,5 @@ public class StatData1 {
 
 	public void setValue(float value) {

 		this.value = value;

 	}

+	

 }

+ 8 - 0
src/com/runzhixing/bean/TagInfo.java
Просмотреть файл 

@@ -3,6 +3,14 @@ package com.runzhixing.bean;
 
 import java.util.Date;

 

 public class TagInfo {

+	private int cartagnum;

+	

+	public int getCartagnum() {

+		return cartagnum;

+	}

+	public void setCartagnum(int cartagnum) {

+		this.cartagnum = cartagnum;

+	}

 	public String getNextCheckTime1() {

 		return nextCheckTime1;

 	}

+ 10 - 9
src/com/runzhixing/config/config.properties
Просмотреть файл 

@@ -10,19 +10,20 @@
 
 #username=cngdba

 #password=rzxCng4832

 #sichuan

-driver=oracle.jdbc.OracleDriver

-url=jdbc:oracle:thin:@118.122.112.58:3344:cng

-username=cngdba

-password=Y6CngDb3412

-whitelist=localhost;127.0.0.1;lock.smotech.cn;192.168.1.70;

-#neimeng 

 #driver=oracle.jdbc.OracleDriver

-#url=jdbc:oracle:thin:@218.21.128.211:3355:cng

+#url=jdbc:oracle:thin:@118.122.112.58:3344:cng

 #username=cngdba

-#password=nmCng+4931

-#whitelist=localhost;127.0.0.1;

+#password=Y6CngDb3412

+#whitelist=localhost;127.0.0.1;lock.smotech.cn;192.168.1.70;

+#neimeng 

+driver=oracle.jdbc.OracleDriver

+url=jdbc:oracle:thin:@218.21.128.211:3355:cng

+username=cngdba

+password=nmCng+4931

+whitelist=localhost;127.0.0.1;

 

 #driver=oracle.jdbc.OracleDriver

 #url=jdbc:oracle:thin:@192.168.1.10:1521:cng

 #username=cngdba

 #password=temp1234

+#whitelist=localhost;127.0.0.1;

+ 65 - 0
src/com/runzhixing/packageProcedure/CarsDataStatisticsProcedure.java
Просмотреть файл 

@@ -83,5 +83,70 @@ public class CarsDataStatisticsProcedure {
 
 		}

 		return (List<StatData1>) reValues.get(1);

 	}

+	

+	

+	

+	/**

+	 * 车辆数据统计存储函数

+	 * @param isEffi 

+	 * @param un

+	 * @param ps

+	 * @return

+	 */

+	

+	@SuppressWarnings("unchecked")

+	public List<StatData1> queryCarStatList0111(String privilegeCode,String regionNo,int searchType,java.sql.Date startTime,java.sql.Date endTime, int isEffi,int CancelFlag) {

+		List<StatData1> list=new ArrayList<StatData1>();

+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();

+		String sql = "{? = call PA_CNGStation_NEW.GetCarSum2( ?,?,?,?,?,?,?,?)}";

+		

+		Connection conn =null;

+		

+		CallableStatement call = null;

+		

+		ResultSet rs = null;

+		try {

+			conn = JDBCUtils.getConnection();

+			

+			call = (CallableStatement) conn.prepareCall(sql);

+			call.registerOutParameter(1, Types.INTEGER);//返回值

+			

+			call.setString(2, privilegeCode);//权限代码

+			call.setString(3, regionNo);//地区编号

+			call.setInt(4,searchType);//查询类型(0 当前地区用应用类型查询 1 当前地区下属分地区按总数查询 2 当前地区下属分地区按类型和总数查询)

+			if(startTime==null){

+				call.setDate(5, null);//开始时间

+			}else{

+				call.setDate(5, startTime);//开始时间

+			}

+			if(endTime==null){

+				call.setDate(6, null);//结束时间

+			}else{

+				call.setDate(6, endTime);//结束时间

+			}

+			call.setInt(7, isEffi);//时间查询组合(0 表示时间无效 1 表示开始时间有效 2 表示结束时间有效 3 表示都有效)

+			call.setInt(8, CancelFlag);//是否包括注销 1 

+			call.registerOutParameter(9, OracleTypes.CURSOR);//结果集

+			call.execute();

+			

+			rs = (ResultSet) call.getObject(9);

+			while(rs.next()){

+				StatData1 stat=new StatData1();

+				stat.setSeriesName(rs.getString(("districtname")));

+				stat.setCateName(rs.getString(("typename")));

+				stat.setValue(rs.getBigDecimal(("sumnum")).floatValue());

+				list.add(stat);

+				stat=null;

+			}	

+			reValues.put(1, list);

+			list=null;

+		} catch (Exception e) {

+			e.printStackTrace();

+		}

+		finally{

+			JDBCUtils.release(conn, call, rs);

+		}

+		return (List<StatData1>) reValues.get(1);

+	}

 

 }

+ 58 - 0
src/com/runzhixing/packageProcedure/CylinderDataStatisticsProcedure.java
Просмотреть файл 

@@ -2,6 +2,7 @@ package com.runzhixing.packageProcedure;
 
 

 import java.sql.CallableStatement;

 import java.sql.Connection;

+import java.sql.Date;

 import java.sql.ResultSet;

 import java.sql.Types;

 import java.util.ArrayList;

@@ -66,5 +67,62 @@ public class CylinderDataStatisticsProcedure {
 
 		}

 		return (List<StatData1>) reValues.get(1);

 	}

+	

+	/**

+	 * 气瓶数据统计存储函数

+	 * @param cancelFlag 

+	 * @param isEffi 

+	 * @param endTime 

+	 * @param startTime 

+	 * @param searchType 

+	 * @param un

+	 * @param ps

+	 * @return

+	 */

+	@SuppressWarnings("unchecked")

+	public List<StatData1> queryCylinderSum0111(String regionNo, int searchType, Date startTime, Date endTime, int isEffi, int cancelFlag) {

+		List<StatData1> list=new ArrayList<StatData1>();

+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();

+		String sql = "{? = call PA_CNGStation_NEW.GetCylinderSum2(?,?,?,?,?,?,?,?)}";

+		

+		Connection conn =null;

+		

+		CallableStatement call = null;

+		

+		ResultSet rs = null;

+		try {

+			conn = JDBCUtils.getConnection();

+			

+			call = (CallableStatement) conn.prepareCall(sql);

+			call.registerOutParameter(1, Types.INTEGER);//返回值

+			call.setString(2, "");//站点编号

+			call.setString(3, regionNo);//地区编号

+			call.setInt(4, searchType);//0表示当前地区用应用类型查询  1 表示当前地区下属分地区按总数查询 2 表示当前地区下属分地区按类型和总数查询

+			call.setDate(5, startTime); // --下次检验开始时间

+			call.setDate(6, endTime); // --下次检验结束时间

+			call.setInt(7, isEffi); // --时间查询组合 0表示时间无效 1 表示开始时间有效 2 表示结束时间有效 3 表示都有效

+			call.setInt(8, cancelFlag);//是否包括注销 1

+			call.registerOutParameter(9, OracleTypes.CURSOR);//结果集

+			call.execute();

+			

+			rs = (ResultSet) call.getObject(9);

+			while(rs.next()){

+				StatData1 stat=new StatData1();

+				stat.setSeriesName(rs.getString("districtName"));

+				stat.setCateName(rs.getString("cylinderName"));

+				stat.setValue(rs.getFloat("sumNum"));

+				list.add(stat);

+				stat=null;

+			}	

+			reValues.put(1, list);

+			list=null;

+		} catch (Exception e) {

+			e.printStackTrace();

+		}

+		finally{

+			JDBCUtils.release(conn, call, rs);

+		}

+		return (List<StatData1>) reValues.get(1);

+	}

 

 }

+ 136 - 0
src/com/runzhixing/packageProcedure/InformationAnnouncementProcedure.java
Просмотреть файл 

@@ -4,6 +4,7 @@ import java.sql.CallableStatement;
 
 import java.sql.Connection;

 import java.sql.Date;

 import java.sql.ResultSet;

+import java.sql.ResultSetMetaData;

 import java.sql.Types;

 import java.util.ArrayList;

 import java.util.HashMap;

@@ -16,6 +17,7 @@ import org.apache.struts2.ServletActionContext;
 
 

 import com.runzhixing.bean.Announcement;

 import com.runzhixing.bean.CNGMachineState;

+import com.runzhixing.bean.CylinderFollow;

 import com.runzhixing.bean.User;

 import com.runzhixing.constant.Constant;

 import com.runzhixing.db.JDBCUtils;

@@ -222,4 +224,138 @@ public class InformationAnnouncementProcedure {
 
 	

 	

 	

+	@SuppressWarnings("unchecked")

+	public List<Announcement> checkValidity(String sStationNo,String sOPeratorNo,String vDistrictNo,int vType) {

+		List<Announcement> list=new ArrayList<Announcement>();

+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();

+		String sql = "{?=call pa_SubTran_new.GetStation2(?,?,?,?)}";

+		ResultSet rs = null;

+		Connection conn =null;

+		

+		CallableStatement call = null;

+		

+		

+		try {

+			conn = JDBCUtils.getConnection();

+			

+			call = (CallableStatement) conn.prepareCall(sql);

+//			call.registerOutParameter(1, Types.INTEGER);// 返回值

+			call.registerOutParameter(1, OracleTypes.CURSOR);// 返回值

+			call.setString(2, sStationNo);//站点

+			call.setString(3, sOPeratorNo);//用户

+			call.setString(4,vDistrictNo);//地区

+			call.setInt(5, vType); // 身份

+//			call.registerOutParameter(1, OracleTypes.CURSOR); // --结果集

+			call.execute();

+			

+//			

+			

+			rs = (ResultSet) call.getObject(1);

+//			rs.getMetaData();

+//			ResultSetMetaData rsmd=rs.getMetaData();//取得结果集的属性

+//			int  cols=rsmd.getColumnCount();//得到列数

+//			int rowcount=0;

+//			int col=1;

+//			for (col=1;col<=cols;col++)//循环取列名(字段)

+//			{

+//				System.out.println(rsmd.getColumnLabel(col)+",");

+//			}

+			while(rs.next()){

+				String validity=rs.getString("VALIDITY");

+				if(validity!=null&&!validity.trim().equals("")){

+					String nowTime = Util.df.format(new java.util.Date());

+					long l=new Util().daysOfTwo_2(nowTime,validity);

+					if(l<=30){

+						Announcement obj=new Announcement();

+						obj.setStationNo(rs.getString("stationNo"));

+						obj.setStationName(rs.getString("stationName"));

+						obj.setValidity(validity.substring(0, 10));

+						obj.setLicence(rs.getString("LICENCE"));

+						obj.setLicenceorg(rs.getString("LICENCEORG"));

+						String licencedate=rs.getString("LICENCEDATE");

+						if(licencedate!=null&&!licencedate.trim().equals("")){

+							obj.setLicencedate(licencedate.substring(0, 10));

+						}

+						obj.setManager(rs.getString("MANAGER"));

+						obj.setPhone(rs.getString("PHONE"));

+						obj.setL(l);

+						list.add(obj);

+						obj=null;//释放obj

+					}

+					

+				}

+				

+			}	

+			reValues.put(1, list);

+		} catch (Exception e) {

+			e.printStackTrace();

+		}

+		finally{

+			JDBCUtils.release(conn, call, rs);

+		}

+		return (List<Announcement>) reValues.get(1);

+			

+	}

+	public List<CylinderFollow> checkValidity1(String sStationNo,String sOPeratorNo,String vDistrictNo,int vType) {

+		List<CylinderFollow> list=new ArrayList<CylinderFollow>();

+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();

+		String sql = "{?=call pa_SubTran_new.GetStation2(?,?,?,?)}";

+		ResultSet rs = null;

+		Connection conn =null;

+		

+		CallableStatement call = null;

+		

+		

+		try {

+			conn = JDBCUtils.getConnection();

+			

+			call = (CallableStatement) conn.prepareCall(sql);

+//			call.registerOutParameter(1, Types.INTEGER);// 返回值

+			call.registerOutParameter(1, OracleTypes.CURSOR);// 返回值

+			call.setString(2, sStationNo);//站点

+			call.setString(3, sOPeratorNo);//用户

+			call.setString(4,vDistrictNo);//地区

+			call.setInt(5, vType); // 身份

+//			call.registerOutParameter(1, OracleTypes.CURSOR); // --结果集

+			call.execute();

+			

+			

+			rs = (ResultSet) call.getObject(1);

+			while(rs.next()){

+				String validity=rs.getString("VALIDITY");

+				if(validity!=null&&!validity.trim().equals("")){

+					String nowTime = Util.df.format(new java.util.Date());

+					long l=new Util().daysOfTwo_2(nowTime,validity);

+					if(l<=30){

+						CylinderFollow obj=new CylinderFollow();

+						obj.setStationNo(rs.getString("stationNo"));

+						obj.setStationName(rs.getString("stationName"));

+						obj.setValidity(validity.substring(0, 10));

+						obj.setLicence(rs.getString("LICENCE"));

+						obj.setLicenceorg(rs.getString("LICENCEORG"));

+						String licencedate=rs.getString("LICENCEDATE");

+						if(licencedate!=null&&!licencedate.trim().equals("")){

+							obj.setLicencedate(licencedate.substring(0, 10));

+						}

+						

+						obj.setManager(rs.getString("MANAGER"));

+						obj.setPhone(rs.getString("PHONE"));

+						obj.setL(l);

+						list.add(obj);

+						obj=null;//释放obj

+					}

+					

+				}

+				

+			}	

+			reValues.put(1, list);

+		} catch (Exception e) {

+			e.printStackTrace();

+		}

+		finally{

+			JDBCUtils.release(conn, call, rs);

+		}

+		return (List<CylinderFollow>) reValues.get(1);

+	}

+	

 }

+ 75 - 2
src/com/runzhixing/packageProcedure/TagIssuingInfoProcedure.java
Просмотреть файл 

@@ -40,7 +40,7 @@ public class TagIssuingInfoProcedure {
 
 	@SuppressWarnings("unchecked")

 	public List<TagInfo> queryTagInfoList(int pagesize, int pageno,java.sql.Date startTime,java.sql.Date endTime,

 			String tagNo,String tagUid,String carNo,String baseNo,int plateType,int appType,String installStation,String checkStation,

-			int checkState,String tagOutOper,int cylinderType,String emitStation,String tagGuid,String carGuid,String cylinderGuid,int tagState) {

+			int checkState,String tagOutOper,int cylinderType,String emitStation,String tagGuid,String carGuid,String cylinderGuid,int tagStatem,int tagType) {

 		List<TagInfo> list=new ArrayList<TagInfo>();

 		Map<Integer, Object> reValues = new HashMap<Integer, Object>();

 		String sql = "{? = call PA_CNGSTATION_NEW.GETTAGINFO_real(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";

@@ -77,7 +77,7 @@ public class TagIssuingInfoProcedure {
 
 			call.setString(21, carGuid); // --车辆GUID

 			call.setString(22, cylinderGuid); // --气瓶GUID

 			

-			call.setInt(23, tagState); // --标签状态 -1 全部 0-登记 1-发放完成

+			call.setInt(23, tagType); // --标签状态 -1 全部 0-登记 1-发放完成

 			call.registerOutParameter(24, Types.INTEGER); // --总行数

 			call.registerOutParameter(25, OracleTypes.CURSOR); // --结果集

 			call.execute();

@@ -150,5 +150,78 @@ public class TagIssuingInfoProcedure {
 
 		}

 		return (List<TagInfo>) reValues.get(1);

 	}

+

+	

+	public List<TagInfo> queryTagInfoStatistics(int pagesize, int pageno,java.sql.Date startTime,java.sql.Date endTime,

+			String tagNo,String tagUid,String carNo,String baseNo,int plateType,int appType,String installStation,String checkStation,

+			int checkState,String tagOutOper,int cylinderType,String emitStation,String tagGuid,String carGuid,String cylinderGuid,int tagState,int tagType) {

+		List<TagInfo> list=new ArrayList<TagInfo>();

+		Map<Integer, Object> reValues = new HashMap<Integer, Object>();

+		String sql = "{? = call PA_CNGSTATION_NEW.GETTAGSUM_real(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";

+		

+		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, tagNo); // --标签编号

+			call.setString(5, tagUid); // --标签UID

+			call.setString(6, carNo); // --车牌号

+			call.setString(7, baseNo); // --底盘号

+			call.setInt(8, plateType); // --车牌类型 -1 全部 表：TD_CARTYPE

+			call.setInt(9, appType); // --应用类型 -1 全部 表：TD_APPTYPE

+			call.setString(10,installStation); // --安装站点

+			call.setString(11, checkStation); // --定检站点

+			call.setInt(12,checkState); // --检验状态 -1 全部 0 合格 1 报废 2 二级修复

+			call.setDate(13, startTime); // --下次检验开始日期

+			call.setDate(14, endTime); // --下次检验结束日期

+			call.setInt(15, Util.calculateFlag(startTime, endTime)); // --下次检验时间查询组合 0表示时间无效 1 表示开始时间有效 2 表示结束时间有效 3 表示都有效

+			call.setString(16, tagOutOper); // --发标签操作员编号

+			call.setInt(17, cylinderType); // --气瓶类型 -1 全部 表：TD_CYLINDERTYPE

+			call.setString(18, emitStation); // --发标签站点

+			call.setInt(19, tagType); // --发标签站点

+			call.setString(20, tagGuid); // --发标签GUID

+			call.setString(21, carGuid); // --车辆GUID

+			call.setString(22, cylinderGuid); // --气瓶GUID

+			

+			call.setInt(23, tagState); // --标签状态 -1 全部 0-登记 1-发放完成

+			

+			call.registerOutParameter(24, Types.INTEGER); // --总行数

+			call.registerOutParameter(25, Types.INTEGER); // --总行数

+			call.registerOutParameter(26, OracleTypes.CURSOR); // --结果集

+			call.execute();

+			int we = ((Integer) call.getObject(24)).intValue();

+			int total = ((Integer) call.getObject(25)).intValue();

+			System.out.println("we="+we+" total="+total);

+			HttpServletRequest req = ServletActionContext.getRequest();

+			User user = new User();

+			user.setTagIssuingSum(total);

+			req.getSession().setAttribute("TagIssuingStatics", user);

+			rs = (ResultSet) call.getObject(26);

+			while(rs.next()){

+				TagInfo obj=new TagInfo();

+				obj.setCarNo(rs.getString("carno"));

+				obj.setPlateType(rs.getInt("platetype"));

+				obj.setPlateTypeName(rs.getString("platetypename"));

+				obj.setCartagnum(rs.getInt("cartagnum"));

+				list.add(obj);

+				obj=null;

+			}	

+			reValues.put(1, list);

+		} catch (Exception e) {

+			e.printStackTrace();

+		}

+		finally{

+			JDBCUtils.release(conn, call, rs);

+		}

+		return (List<TagInfo>) reValues.get(1);

+	}

 	

 }

+ 2 - 0
src/com/runzhixing/servlet/LoginServlet.java
Просмотреть файл 

@@ -71,6 +71,8 @@ public class LoginServlet extends HttpServlet {
 
 				result = user.getLoginInfo().trim();

 				int hiddenphone=new UserAuthProcedure().getUserAuth(user.getUserOperatorNo(), 1, 1, 1, 9);

 				req.getSession().setAttribute("hiddenphone", hiddenphone+"");

+				req.getSession().setAttribute("sOperatorNo", user.getUserOperatorNo()+"");

+				req.getSession().setAttribute("PrivilegeCode", user.getPrivilegeCode()+"");

 			}else{

 				session.setAttribute("failMess", "验证码有误");

 				req.getRequestDispatcher("jsp/fail/loginfail.jsp").forward(req, res);

+ 46 - 0
src/com/runzhixing/tool/Util.java
Просмотреть файл 

@@ -11,12 +11,17 @@ import java.util.List;
 
 

 import com.runzhixing.bean.CityPlace;

 

+import java.text.ParseException;

+import java.text.SimpleDateFormat;

+import java.util.Calendar;

+

 public class Util  implements Comparator{

 	public static String s1="";

 	public static String s2="";

 	public static String s3="";

 	public static String s4="";

 	public static final String DEFAULT_FORMAT1 = "yyyy-MM-dd HH:mm:ss";

+	public static  SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 	public static java.util.Date str2Date(String str, String format){

 		  if (null != str && !"".equals(str)) {

 		    SimpleDateFormat sdf = new SimpleDateFormat(format);

@@ -185,5 +190,46 @@ public class Util  implements Comparator{
 
 		   return flag;

 		  }

 	}

+	

+	/**

+     * 

+     * @param date1 <String>

+     * @param date2 <String>

+     * @return int

+     * @throws ParseException

+     */

+    public static int getMonthSpace(String date1, String date2)

+            throws ParseException {

+

+        int result = 0;

+

+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

+

+        Calendar c1 = Calendar.getInstance();

+        Calendar c2 = Calendar.getInstance();

+

+        c1.setTime(sdf.parse(date1));

+        c2.setTime(sdf.parse(date2));

+

+        result = c2.get(Calendar.MONTH) - c1.get(Calendar.MONTH);

+        System.out.println("result="+result);

+        return result == 0 ? 1 : Math.abs(result);

+

+    }

+    

+    public static void main(String[] args) throws ParseException {

+        

+

+    }

+    public long daysOfTwo_2(String day1,String day2) throws ParseException {

+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");

+        //跨年不会出现问题

+        //如果时间为：2016-03-18 11:59:59 和 2016-03-19 00:00:01的话差值为 0

+        java.util.Date  fDate=sdf.parse(day1);

+        java.util.Date oDate=sdf.parse(day2);

+        long days=(oDate.getTime()-fDate.getTime())/(1000*3600*24);

+        return days;

+    }  

+

 }

+ 16 - 1
src/struts.xml
Просмотреть файл 

@@ -35,6 +35,7 @@
 
     	  <action name="testingworkPersonInfo" class="com.runzhixing.action.WorkPersonInfoAction" method="testingworkPersonInfo"></action>

      	<action name="TagdataStatis" class="com.runzhixing.action.TagdataStatisAction" method="TagdataStatis"></action>

     	<action name="tagIssuingfrom" class="com.runzhixing.action.TagIssuingfromAction" method="tagIssuingfrom"></action>

+    	<action name="tagIssuingStatistics" class="com.runzhixing.action.TagIssuingfromAction" method="tagIssuingStatistics"></action>

         <action name="checkSeedataform" class="com.runzhixing.action.CheckSeedataQueryAction" method="checkSeedataQuery"></action>

         <action name="workPersonInfo" class="com.runzhixing.action.WorkPersonInfoAction" method="workPersonInfo"></action>

         <action name="fillingMachineInfo" class="com.runzhixing.action.FillingMachineInfoAction" method="fillingMachineInfo"></action>

@@ -176,7 +177,8 @@
 
 		 

 		   <action name="downloadExcel" class="com.runzhixing.action.DownloadExcelAction" method="downloadExcel">

 		 </action>

-		 

+		 <action name="checkValidity" class="com.runzhixing.action.CylinderFollowAction" method="CheckValidity1">

+		 </action>

     </package>

 

     <!-- Add packages here -->

@@ -211,6 +213,19 @@
 
             		/jsp/fail/nodata.jsp

             	</result>

 		    </action> 

+		    

+		    

+		    

+		    <action name="CheckValidity" class="com.runzhixing.action.CylinderFollowAction" method="CheckValidity">

+      			<result name="success">

+                	/jsp/rzx/dataQuery/CheckValidity.jsp

+            	</result>

+           	 	<result name="error">

+            		/jsp/fail/nodata.jsp

+            	</result>

+		    </action> 

+		    

+		    

 		    <action name="machineDetailfill" class="com.runzhixing.action.MachineDetailAction" method="machineDetail1">

       			<result name="success">

                 	/jsp/rzx/filling/CylinderdataQuery.jsp