| 
					
				 | 
			
			
				@@ -2019,3 +2019,100 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						map.put("clnr", id.getClnr());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						map.put("clr", id.getClr());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						map.put("clwb", id.getClwb());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("clzt", id.getClzt()==0?"未处理":"已处理");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("clsj", df.format(id.getClsj()));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("company_code", id.getCompanyCode());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("company_name", id.getCompanyName());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("data1", id.getData1());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("data2", id.getData2());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("data3", id.getData3());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("data4", id.getData4()+(id.getData1().equals("WP1")?"MPa"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("WP2")?"MPa"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("WP3")?"MPa"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("WP4")?"MPa"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("WP0")?"MPa"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("LL1")?"m"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("LL2")?"m"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("LL3")?"m"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("LL0")?"m":""))))))))));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("data5", id.getData5());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						if(id.getClzt()==1)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							map.put("clsj", df.format(id.getClsj()));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						else
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							map.put("clsj", "");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("device_code", id.getDeviceCode());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("id", id.getId());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("name", id.getName());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("ncmd", id.getNcmd());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("port", id.getPort());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("position", id.getPosition());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("status", id.getStatus());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("time", df.format(id.getTime()));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("vidoe", id.getVideo());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("fullname", id.getName());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("data", id.getData1().equals("WP1")?"低压"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("WP2")?"高压"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("WP3")?"故障"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("WP4")?"离线"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("WP0")?"正常"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("LL1")?"低压"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("LL2")?"高压"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("LL3")?"故障"
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								:(id.getData1().equals("LL0")?"正常":id.getData1())))))))));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						if((id.getClr().length()>0)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								&&(ulist.size()>0)){
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							for(int j=0;j<ulist.size();j++) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								YtiotVUserphone po = (YtiotVUserphone)ulist.get(j);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								YtiotVUserphoneId poid = po.getId();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								if(id.getClr().equals(poid.getPhone())) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+									cl_name = poid.getUsername();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+									break;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+								}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						map.put("clr_name", cl_name.length()>0?cl_name:id.getClr());
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						JSONObject jSONObject = JSONObject.fromObject(map);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						jSONArray.add(jSONObject);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+					json.put("RESULT", jSONArray);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			return json.toString();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	@Override
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	public String getRtuVList(String queryJson, String page, String start, String limit, String sort) throws Exception {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		// TODO Auto-generated method stub
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String address = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String clzt = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String company_code = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String company_code_list = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String Company_Code_List = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String company_name = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String device_code = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String device_code_list = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String time_start = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String time_end = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String COMMSTATUS = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String V_LOGINNAME = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String hqlwhere = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String order = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String dir = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String Start = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String Limit = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String Page = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		String order_str = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		JSONObject q_json = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		JSONArray Sort = null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		JSONArray jSONArray = new JSONArray();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		JSONObject json = new JSONObject();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		json.put("action", "getRtuVList");
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		if(queryJson!=null) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			q_json = JSONObject.fromObject(queryJson);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			address = q_json.has("address")?q_json.getString("address"):null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			clzt = q_json.has("clzt")?q_json.getString("clzt"):null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			COMMSTATUS = q_json.has("COMMSTATUS")?q_json.getString("COMMSTATUS"):null;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			if(q_json.has("company_code")) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				if((q_json.optJSONObject("company_code")!=null)
 
			 |