jichaobo 4 роки тому
батько
коміт
20fbbe2ca9

+ 12 - 11
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) {
@@ -551,14 +552,14 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 		}
 
 
-		Map map = new HashMap();
+		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);
 //						System.out.println(xjrysl);
-			map.put("zrs", zrs);
+			map3.put("zrs", zrs);
 //							System.out.println("测试0"+zrs);
 
 		}
@@ -570,9 +571,9 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 //						System.out.println(jrrw_hqlwhere);
 			int jrsj = ytiotXjEventProcessingDao.getCount(jrrw_hqlwhere);
 //						System.out.println("总数"+jrsj);
-			map.put("jrsj", jrsj);
+			map3.put("jrsj", jrsj);
 		}else {
-			map.put("jrsj", 0);
+			map3.put("jrsj", 0);
 		}
 
 		//超时事件
@@ -580,9 +581,9 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 			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);
+			map3.put("cssj", cssj);
 		}else {
-			map.put("cssj", 0);
+			map3.put("cssj", 0);
 		}
 
 		//今日解决
@@ -590,13 +591,13 @@ public class YtiotXjEventProcessingServicesImpl implements YtiotXjEventProcessin
 			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);
+			map3.put("jrjj", jrjj);
 		}else {
-			map.put("jrjj", 0);
+			map3.put("jrjj", 0);
 		}
-		JSONObject jSONObject = JSONObject.fromObject(map);
-		jSONArray.add(jSONObject);
-		json.put("RESULT2", jSONArray);
+		JSONObject jSONObject3 = JSONObject.fromObject(map3);
+		jSONArray3.add(jSONObject3);
+		json.put("RESULT2", jSONArray3);
 
 		return json.toString();
 	}