|  | @@ -415,3 +415,60 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 | 
	
		
			
				|  |  |  		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 | 
	
		
			
				|  |  |  		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)
 | 
	
		
			
				|  |  | +						&&(q_json.optJSONObject("company_code").isArray())) {
 | 
	
		
			
				|  |  | +					JSONArray j_tmp = q_json.getJSONArray("company_code");
 | 
	
		
			
				|  |  | +					for(int i=0;i<j_tmp.size();i++) {
 | 
	
		
			
				|  |  | +						String tmp = j_tmp.getString(i);
 | 
	
		
			
				|  |  | +						if(i==0)
 | 
	
		
			
				|  |  | +							company_code_list = "'"+tmp+"'";
 | 
	
		
			
				|  |  | +						else
 | 
	
		
			
				|  |  | +							company_code_list += ","+"'"+tmp+"'";
 | 
	
		
			
				|  |  | +					}
 | 
	
		
			
				|  |  | +				}else
 | 
	
		
			
				|  |  | +					company_code = q_json.getString("company_code");
 | 
	
		
			
				|  |  | +			}
 | 
	
		
			
				|  |  | +			company_name = q_json.has("company_name")?q_json.getString("company_name"):null;
 | 
	
		
			
				|  |  | +			if(q_json.has("device_code")) {
 | 
	
		
			
				|  |  | +				if((q_json.optJSONObject("device_code")!=null)
 | 
	
		
			
				|  |  | +						&&(q_json.optJSONObject("device_code").isArray())){
 | 
	
		
			
				|  |  | +					JSONArray j_tmp = q_json.getJSONArray("device_code");
 | 
	
		
			
				|  |  | +					for(int i=0;i<j_tmp.size();i++) {
 | 
	
		
			
				|  |  | +						String tmp = j_tmp.getString(i);
 | 
	
		
			
				|  |  | +						if(i==0)
 | 
	
		
			
				|  |  | +							device_code_list = tmp;
 | 
	
		
			
				|  |  | +						else
 | 
	
		
			
				|  |  | +							device_code_list += ","+tmp;
 | 
	
		
			
				|  |  | +					}
 | 
	
		
			
				|  |  | +				}else
 | 
	
		
			
				|  |  | +					device_code = q_json.getString("device_code");
 | 
	
		
			
				|  |  | +			}
 | 
	
		
			
				|  |  | +			time_start = q_json.has("time_start")?q_json.getString("time_start"):null;
 | 
	
		
			
				|  |  | +			time_end = q_json.has("time_end")?q_json.getString("time_end"):null;
 | 
	
		
			
				|  |  | +		}
 | 
	
		
			
				|  |  | +		if(V_LOGINNAME.equals("ypsgec")) {
 | 
	
		
			
				|  |  | +			return json.toString();
 | 
	
		
			
				|  |  | +		}else {
 | 
	
		
			
				|  |  | +			if(sort!=null) {
 | 
	
		
			
				|  |  | +				Sort = JSONArray.fromObject(sort);
 | 
	
		
			
				|  |  | +				if((Sort.isArray())&&(Sort.size()>0)) {
 | 
	
		
			
				|  |  | +					JSONObject s_json = Sort.getJSONObject(0);
 | 
	
		
			
				|  |  | +					order = s_json.has("property")?s_json.getString("property"):order;
 | 
	
		
			
				|  |  | +					dir = s_json.has("direction")?s_json.getString("direction"):dir;
 | 
	
		
			
				|  |  | +				}
 | 
	
		
			
				|  |  | +				json.put("sort", sort);
 | 
	
		
			
				|  |  | +			}
 | 
	
		
			
				|  |  | +			Start = start;
 | 
	
		
			
				|  |  | +			Limit = limit;
 | 
	
		
			
				|  |  | +			Page = page;
 | 
	
		
			
				|  |  | +			if((V_LOGINNAME!=null)&&(company_code==null)&&(company_code_list==null)) {
 | 
	
		
			
				|  |  | +				String where = " where u.id.agentid='"+V_LOGINNAME+"' ";
 | 
	
		
			
				|  |  | +				List list = ytiotVUserCompanyDao.query(where, null, null, null, null);
 | 
	
		
			
				|  |  | +				if(list.size()>0) {
 | 
	
		
			
				|  |  | +					for(int i=0;i<list.size();i++) {
 | 
	
		
			
				|  |  | +						YtiotVUsercompany o = (YtiotVUsercompany)list.get(i);
 |