Merge remote-tracking branch 'origin/master' into master

WebRoot/view/springhandle/scripts/springHandle.js

@@ -2930,7 +2930,7 @@ Ext.onReady(function(){
 		        success: function(result){
 		            var json = eval('(' + result + ')');
 		            if(json.action=='getEventProcessingList'){
-		                ConfirmStore = json.RESULT;
+		                ConfirmStore = json.RESULT2;
 		                ConfirmStore1 = json.RESULT1;
 		                piedarHtml2();
 		       

src/cn/com/usky/iot/xjeventprocessing/service/YtiotXjEventProcessingServicesImpl.java

@@ -342,6 +342,7 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 		JSONObject q_json = null;		
 		JSONArray jSONArray = new JSONArray();
 		JSONArray jSONArray1 = new JSONArray();
+		JSONArray jSONArray3 = new JSONArray();
 		JSONObject json = new JSONObject();
 		json.put("action", "getEventProcessingList");
 		if(queryJson!=null) {
@@ -540,50 +541,64 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 						map.put("phone", "--");
 					}
 					
-					//人员总数量
-					if(V_LOGINNAME!=null) {
-						zsl_hqlwhere = " where u."+fieldname("data2")+"='"+V_LOGINNAME+"' and u."+fieldname("zn")+" in (4,5,6,7)";
+					JSONObject jSONObject = JSONObject.fromObject(map);
+					jSONArray.add(jSONObject);
+				}
+				json.put("RESULT", jSONArray);
+				
+
+			}
+
+		}
+
+
+		Map map3 = new HashMap();
+		//人员总数量
+		if(V_LOGINNAME!=null) {
+			zsl_hqlwhere = " where u."+fieldname("data2")+"='"+V_LOGINNAME+"' and u."+fieldname("zn")+" in (4,5,6,7)";
 //						System.out.println(xjrysl_hqlwhere);
-						int zrs = ytiotXjInspectorsDao.getCount(zsl_hqlwhere);
+			int zrs = ytiotXjInspectorsDao.getCount(zsl_hqlwhere);
 //						System.out.println(xjrysl);
-							map.put("zrs", zrs);
+			map3.put("zrs", zrs);
 //							System.out.println("测试0"+zrs);
-							
-					}
-					
-					
-					//今日事件
-					if(dqsj!=null) {
-						jrrw_hqlwhere = " where u."+fieldname("y_complete_time")+" like '%"+dqsj+"%' and u."+fieldname("user_name")+"='"+V_LOGINNAME+"'";
+
+		}
+
+
+		//今日事件
+		if(dqsj!=null) {
+			jrrw_hqlwhere = " where u."+fieldname("y_complete_time")+" like '%"+dqsj+"%' and u."+fieldname("user_name")+"='"+V_LOGINNAME+"'";
 //						System.out.println(jrrw_hqlwhere);
-						int jrsj = ytiotXjEventProcessingDao.getCount(jrrw_hqlwhere);
+			int jrsj = ytiotXjEventProcessingDao.getCount(jrrw_hqlwhere);
 //						System.out.println("总数"+jrsj);
-						map.put("jrsj", jrsj);	
-					}
-					
-					//超时事件
-					if(V_LOGINNAME!=null) {
-						csrw_hqlwhere = " where u."+fieldname("user_name")+"='"+V_LOGINNAME+"' and u.clType=5";
+			map3.put("jrsj", jrsj);
+		}else {
+			map3.put("jrsj", 0);
+		}
+
+		//超时事件
+		if(V_LOGINNAME!=null) {
+			csrw_hqlwhere = " where u."+fieldname("user_name")+"='"+V_LOGINNAME+"' and u.clType=5";
 //						System.out.println(jrrw_hqlwhere);
-						int cssj = ytiotXjEventProcessingDao.getCount(csrw_hqlwhere);
-						map.put("cssj", cssj);
-					}
-					
-					//今日解决
-					if(V_LOGINNAME!=null&&dqsj!=null) {
-						jrjj_hqlwhere = " where u."+fieldname("user_name")+"='"+V_LOGINNAME+"' and u.clType=4 and u.shTime like '%"+dqsj+"%'";
+			int cssj = ytiotXjEventProcessingDao.getCount(csrw_hqlwhere);
+			map3.put("cssj", cssj);
+		}else {
+			map3.put("cssj", 0);
+		}
+
+		//今日解决
+		if(V_LOGINNAME!=null&&dqsj!=null) {
+			jrjj_hqlwhere = " where u."+fieldname("user_name")+"='"+V_LOGINNAME+"' and u.clType=4 and u.shTime like '%"+dqsj+"%'";
 //						System.out.println(jrrw_hqlwhere);
-						int jrjj = ytiotXjEventProcessingDao.getCount(jrjj_hqlwhere);
-						map.put("jrjj", jrjj);
-					}
-					
-					JSONObject jSONObject = JSONObject.fromObject(map);
-					jSONArray.add(jSONObject);
-				}
-				
-				json.put("RESULT", jSONArray);
-			}
+			int jrjj = ytiotXjEventProcessingDao.getCount(jrjj_hqlwhere);
+			map3.put("jrjj", jrjj);
+		}else {
+			map3.put("jrjj", 0);
 		}
+		JSONObject jSONObject3 = JSONObject.fromObject(map3);
+		jSONArray3.add(jSONObject3);
+		json.put("RESULT2", jSONArray3);
+
 		return json.toString();
 	}
 	

src/cn/com/usky/iot/xjinspectionpoints/service/YtiotXjInspectionPointsServicesImpl.java

@@ -385,7 +385,7 @@ public class YtiotXjInspectionPointsServicesImpl implements YtiotXjInspectionPoi
 				&&chk_string_param(equipment_code)&&chk_string_param(remarks)&&chk_string_param(V_LOGINNAME)) {
 			YtiotXjInspectionPoints o = new YtiotXjInspectionPoints();
 			UUID uuid = UUID.randomUUID();
-			ew_rtue = "/var/lib/tomcat/webapps/YtIoT/";
+			ew_rtue = "/usr/local/apache-tomcat-8.5.61/webapps/YtIoT/";
 			spot_label_route = "userUpload/"+uuid+".png";
 			ew_rtue1 = ew_rtue+spot_label_route;
 					
@@ -470,7 +470,7 @@ public class YtiotXjInspectionPointsServicesImpl implements YtiotXjInspectionPoi
 				&&chk_string_param(equipment_code)&&chk_string_param(remarks)&&chk_string_param(V_LOGINNAME)) {
 			YtiotXjInspectionPoints o = new YtiotXjInspectionPoints();
 			UUID uuid = UUID.randomUUID();
-			ew_rtue = "/var/lib/tomcat/webapps/YtIoT/";
+			ew_rtue = "/usr/local/apache-tomcat-8.5.61/webapps/YtIoT/";
 			spot_label_route = "userUpload/"+uuid+".png";
 			ew_rtue1 = ew_rtue+spot_label_route;