去除敏感字 后端返回

src/cn/com/usky/iot/EfAnalysis/service/YtiotTEfAnalysisServicesImpl.java

@@ -208,7 +208,7 @@ public class YtiotTEfAnalysisServicesImpl implements YtiotTEfAnalysisService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {

src/cn/com/usky/iot/admin/service/YtiotTAdminServicesImpl.java

@@ -110,7 +110,7 @@ public class YtiotTAdminServicesImpl implements YtiotTAdminService {
 			T_COMMIT = q_json.has("T_COMMIT")?q_json.getString("T_COMMIT"):"";
 			UQ_PERMISSIONGROUP_ID = q_json.has("UQ_PERMISSIONGROUP_ID")?q_json.getString("UQ_PERMISSIONGROUP_ID"):"";
 			E_STATUS = q_json.has("E_STATUS")?q_json.getString("E_STATUS").toUpperCase():"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(V_ADMIN_NAME)&&chk_string_param(V_LOGINNAME)&&chk_string_param(T_COMMIT)
 				&&chk_string_param(V_PASSWORD)&&chk_string_param(V_EDITOR_ID)
@@ -158,7 +158,7 @@ public class YtiotTAdminServicesImpl implements YtiotTAdminService {
 			T_COMMIT = q_json.has("T_COMMIT")?q_json.getString("T_COMMIT"):"";
 			UQ_PERMISSIONGROUP_ID = q_json.has("UQ_PERMISSIONGROUP_ID")?q_json.getString("UQ_PERMISSIONGROUP_ID"):"";
 			E_STATUS = q_json.has("E_STATUS")?q_json.getString("E_STATUS").toUpperCase():null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(UQ_ADMIN_ID)&&chk_string_param(V_EDITOR_ID)&&chk_string_param(V_ADMIN_NAME)&&chk_string_param(V_LOGINNAME)&&chk_string_param(T_COMMIT)
 				&&chk_string_param(V_PASSWORD)&&chk_string_param(UQ_PERMISSIONGROUP_ID)
@@ -274,7 +274,7 @@ public class YtiotTAdminServicesImpl implements YtiotTAdminService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 
 		if(sort!=null) {
@@ -407,7 +407,7 @@ public class YtiotTAdminServicesImpl implements YtiotTAdminService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(sort!=null) {
 			Sort = JSONArray.fromObject(sort);

src/cn/com/usky/iot/admin/service/YtiotVUserCompanyServiceImpl.java

@@ -69,7 +69,7 @@ public class YtiotVUserCompanyServiceImpl implements YtiotVUserCompanyService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(sort!=null) {
 			Sort = JSONArray.fromObject(sort);

src/cn/com/usky/iot/area/service/YtiotTAreaServicesImpl.java

@@ -117,7 +117,7 @@ public class YtiotTAreaServicesImpl implements YtiotTAreaService {
 			V_COMMENT = q_json.has("V_COMMENT")?q_json.getString("V_COMMENT"):"";
 			V_ZIPCODE = q_json.has("V_ZIPCODE")?q_json.getString("V_ZIPCODE"):"";
 			E_LEVEL = q_json.has("E_LEVEL")?q_json.getString("E_LEVEL").toUpperCase():"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(V_AREA_NAME)&&chk_string_param(V_PARENT_ID)&&chk_string_param(V_COMMENT)
 				&&chk_string_param(V_AREA_SHORTNAME)&&chk_string_param(V_CITYCODE)
@@ -177,7 +177,7 @@ public class YtiotTAreaServicesImpl implements YtiotTAreaService {
 			V_COMMENT = q_json.has("V_COMMENT")?q_json.getString("V_COMMENT"):"";
 			V_ZIPCODE = q_json.has("V_ZIPCODE")?q_json.getString("V_ZIPCODE"):"";
 			E_LEVEL = q_json.has("E_LEVEL")?q_json.getString("E_LEVEL").toUpperCase():null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(V_AREA_ID)&&chk_string_param(UQ_ADMIN_ID)&&chk_string_param(V_AREA_NAME)&&chk_string_param(V_PARENT_ID)&&chk_string_param(V_COMMENT)
 				&&chk_string_param(V_AREA_SHORTNAME)&&chk_string_param(V_ZIPCODE)

src/cn/com/usky/iot/building/service/YtiotTBuildingServicesImpl.java

@@ -141,7 +141,7 @@ public class YtiotTBuildingServicesImpl implements YtiotTBuildingService {
 			V_COMMENT = q_json.has("V_COMMENT")?q_json.getString("V_COMMENT"):"";
 			V_AREA_ID = q_json.has("V_AREA_ID")?q_json.getString("V_AREA_ID"):null;
 //			E_LEVEL = q_json.has("E_LEVEL")?q_json.getString("E_LEVEL").toUpperCase():"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(V_BUILDING_NAME)&&chk_string_param(UQ_POINT_ID)&&chk_string_param(V_COMMENT)
 				&&chk_string_param(UQ_COMPANY_ID)&&chk_string_param(V_ADDR_0)
@@ -197,7 +197,7 @@ public class YtiotTBuildingServicesImpl implements YtiotTBuildingService {
 			I_MIN_FLOOR = q_json.has("I_MIN_FLOOR")?q_json.getInt("I_MIN_FLOOR"):-1;
 			V_COMMENT = q_json.has("V_COMMENT")?q_json.getString("V_COMMENT"):"";
 			V_AREA_ID = q_json.has("V_AREA_ID")?q_json.getString("V_AREA_ID"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(V_AREA_ID!=null)
 			hqlwhere =  "u."+fieldname("V_MERGERNAME")+"='"+V_AREA_ID+"'";
@@ -282,7 +282,7 @@ public class YtiotTBuildingServicesImpl implements YtiotTBuildingService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 
 		if(sort!=null) {
@@ -424,7 +424,7 @@ public class YtiotTBuildingServicesImpl implements YtiotTBuildingService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 			
 		}
 		if(sort!=null) {

src/cn/com/usky/iot/company/service/YtiotTCompanyServicesImpl.java

@@ -110,7 +110,7 @@ public class YtiotTCompanyServicesImpl implements YtiotTCompanyService {
 //			E_STATUS = q_json.has("E_STATUS")?q_json.getString("E_STATUS"):null;
 			UQ_ADMIN_ID = q_json.has("UQ_ADMIN_ID")?q_json.getString("UQ_ADMIN_ID"):null;
 			V_COMMENT = q_json.has("V_COMMENT")?q_json.getString("V_COMMENT"):"";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(UQ_PARENT_ID)//&&chk_string_param(UQ_PARENT_COMPANY_ID)
 				&&chk_string_param(V_COMPANY_NAME)&&chk_string_param(V_COMPANY_ADDRESS_0)
@@ -165,7 +165,7 @@ public class YtiotTCompanyServicesImpl implements YtiotTCompanyService {
 			UQ_ADMIN_ID = q_json.has("UQ_ADMIN_ID")?q_json.getString("UQ_ADMIN_ID"):null;			
 //			UQ_PARENT_COMPANY_ID = q_json.has("UQ_PARENT_COMPANY_ID")?q_json.getString("UQ_PARENT_COMPANY_ID"):null;			
 			E_STATUS = q_json.has("E_STATUS")?q_json.getString("E_STATUS").toUpperCase():null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(UQ_COMPANY_ID)&&chk_string_param(V_COMPANY_NAME)&&chk_string_param(V_COMPANY_ADDRESS_0)
 //				&&chk_string_param(V_COMPANY_ADDRESS_1)&&chk_string_param(V_COMPANY_ADDRESS_2)
@@ -313,7 +313,7 @@ public class YtiotTCompanyServicesImpl implements YtiotTCompanyService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {
@@ -440,7 +440,7 @@ public class YtiotTCompanyServicesImpl implements YtiotTCompanyService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {

src/cn/com/usky/iot/company/service/YtiotVCompanyServiceImpl.java

@@ -253,7 +253,7 @@ public class YtiotVCompanyServiceImpl implements YtiotVCompanyService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(sort!=null) {
 			Sort = JSONArray.fromObject(sort);
@@ -496,7 +496,7 @@ public class YtiotVCompanyServiceImpl implements YtiotVCompanyService {
 					xmlx = q_json.getString("xmlx");
 			}
 			xmlx = q_json.has("xmlx")?q_json.getString("xmlx"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
 			V_PASSWORD = q_json.has("V_PASSWORD")?q_json.getString("V_PASSWORD"):null;
 		}
@@ -604,7 +604,7 @@ public class YtiotVCompanyServiceImpl implements YtiotVCompanyService {
 		if(queryJson!=null) {
 			q_json = JSONObject.fromObject(queryJson);
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}	
 		
 			if(V_LOGINNAME!=null) {
@@ -712,7 +712,7 @@ public class YtiotVCompanyServiceImpl implements YtiotVCompanyService {
 			start_data = q_json.has("start_data")?q_json.getString("start_data"):null;
 			end_data = q_json.has("end_data")?q_json.getString("end_data"):null;
 			company_code = q_json.has("build_code")?q_json.getString("build_code"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 
 		Date startData = null;

src/cn/com/usky/iot/excel/service/ExcelServiceImpl.java

@@ -256,7 +256,7 @@ public class ExcelServiceImpl implements ExcelService {
 		if(queryJson!=null){
 			JSONObject q_json = JSONObject.fromObject(queryJson);
 			Filename = q_json.has("Filename")?q_json.getString("Filename"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if((Filename!=null)&&(path!=null)){
 			File file = new File(path,Filename);
@@ -325,7 +325,7 @@ public class ExcelServiceImpl implements ExcelService {
 			JSONObject q_json = JSONObject.fromObject(queryJson);
 			Filename = q_json.has("Filename")?q_json.getString("Filename"):null;
 			Sheetname = q_json.has("Sheetname")?q_json.getString("Sheetname"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if((Filename!=null)&&(path!=null)&&(Sheetname!=null)){
 			File file = new File(path,Filename);
@@ -371,7 +371,7 @@ public class ExcelServiceImpl implements ExcelService {
 			Filename = q_json.has("Filename")?q_json.getString("Filename"):null;
 			Sheetname = q_json.has("Sheetname")?q_json.getString("Sheetname"):null;
 			TitleRow = q_json.has("TitleRow")?q_json.getString("TitleRow"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if((Filename!=null)&&(path!=null)&&(Sheetname!=null)&&(TitleRow!=null)){
 			File file = new File(path,Filename);

src/cn/com/usky/iot/inspectionrecord/service/YtiotTInspectionRecordServicesImpl.java

@@ -220,7 +220,7 @@ public class YtiotTInspectionRecordServicesImpl implements YtiotTInspectionRecor
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
@@ -518,7 +518,7 @@ public class YtiotTInspectionRecordServicesImpl implements YtiotTInspectionRecor
 			
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
@@ -783,7 +783,7 @@ public class YtiotTInspectionRecordServicesImpl implements YtiotTInspectionRecor
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {

src/cn/com/usky/iot/inspectors/service/YtiotTInspectorsServicesImpl.java

@@ -95,7 +95,7 @@ public class YtiotTInspectorsServicesImpl implements YtiotTInspectorsService {
 			phone      = q_json.has("phone")?q_json.getString("phone"):null;
 			Job_duties  = q_json.has("Job_duties")?q_json.getString("Job_duties"):null;	
 			company_code  = q_json.has("company_code")?q_json.getString("company_code"):null;	
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(name)&&chk_string_param(phone)
 				&&chk_string_param(Job_duties)&&chk_string_param(company_code)) {
@@ -138,7 +138,7 @@ public class YtiotTInspectorsServicesImpl implements YtiotTInspectorsService {
 			phone      = q_json.has("phone")?q_json.getString("phone"):null;
 			Job_duties  = q_json.has("Job_duties")?q_json.getString("Job_duties"):null;	
 //			company_code  = q_json.has("company_code")?q_json.getString("company_code"):null;	
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		
 		if((V_LOGINNAME!=null)&&(Company_Code_List==null)&&(!V_LOGINNAME.equals("admin"))) {
@@ -198,7 +198,7 @@ public class YtiotTInspectorsServicesImpl implements YtiotTInspectorsService {
 			phone      = q_json.has("phone")?q_json.getString("phone"):null;
 			Job_duties  = q_json.has("Job_duties")?q_json.getString("Job_duties"):null;	
 			company_code  = q_json.has("company_code")?q_json.getString("company_code"):null;	
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(name)&&chk_string_param(phone)
 				&&chk_string_param(Job_duties)) {
@@ -253,7 +253,7 @@ public class YtiotTInspectorsServicesImpl implements YtiotTInspectorsService {
 			phone      = q_json.has("phone")?q_json.getString("phone"):null;
 			Job_duties  = q_json.has("Job_duties")?q_json.getString("Job_duties"):null;	
 			company_code  = q_json.has("company_code")?q_json.getString("company_code"):null;	
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(name)&&chk_string_param(phone)
 				&&chk_string_param(Job_duties)) {

src/cn/com/usky/iot/maintenance/service/YtiotTMaintenanceServicesImpl.java

@@ -121,7 +121,7 @@ public class YtiotTMaintenanceServicesImpl implements YtiotTMaintenanceService {
 			xj_name 	 = q_json.has("xj_name")?q_json.getString("xj_name"):null;	
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
 //			UQ_ADMIN_ID = q_json.has("UQ_ADMIN_ID")?q_json.getString("UQ_ADMIN_ID"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if((V_LOGINNAME!=null)&&(Company_Code_List==null)&&(!V_LOGINNAME.equals("admin"))) {
 			String where = " where u.id.agentid='"+V_LOGINNAME+"' ";
@@ -183,7 +183,7 @@ public class YtiotTMaintenanceServicesImpl implements YtiotTMaintenanceService {
 			equipment_id  = q_json.has("equipment_id")?q_json.getString("equipment_id"):null;
 			xj_name 	 = q_json.has("xj_name")?q_json.getString("xj_name"):null;		
 //			UQ_ADMIN_ID = q_json.has("UQ_ADMIN_ID")?q_json.getString("UQ_ADMIN_ID"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(label)&&chk_string_param(address)
 				&&chk_string_param(equipment_id)&&chk_string_param(xj_name)) {

src/cn/com/usky/iot/maintenanceplan/service/YtiotTMaintenancePlanServicesImpl.java

@@ -236,7 +236,7 @@ public class YtiotTMaintenancePlanServicesImpl implements YtiotTMaintenancePlanS
 			end_data = q_json.has("end_data")?q_json.getString("end_data"):null;
 			completion_status = q_json.has("completion_status")?q_json.getString("completion_status"):null;
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 //		if((V_LOGINNAME!=null)&&(Company_Code_List==null)&&(!V_LOGINNAME.equals("admin"))) {
 //			String where = " where u.id.agentid='"+V_LOGINNAME+"' ";
@@ -306,7 +306,7 @@ public class YtiotTMaintenancePlanServicesImpl implements YtiotTMaintenancePlanS
 			start_time 	 = q_json.has("start_time")?q_json.getString("start_time"):null;		
 			end_time = q_json.has("end_time")?q_json.getString("end_time"):null;
 			completion_status = q_json.has("completion_status")?q_json.getString("completion_status"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(personnel!=null)
 			hqlwhere =  "u."+fieldname("name")+"='"+personnel+"'";
@@ -402,7 +402,7 @@ public class YtiotTMaintenancePlanServicesImpl implements YtiotTMaintenancePlanS
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(personnel!=null) {
 			hqlwhere3 =  "u."+fieldname("name")+"='"+personnel+"'";
@@ -565,7 +565,7 @@ public class YtiotTMaintenancePlanServicesImpl implements YtiotTMaintenancePlanS
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if((personnel!=null)&&(personnel.length()>0)) {
 			hqlwhere3 =  "u."+fieldname("name")+"='"+personnel+"'";
@@ -714,7 +714,7 @@ public class YtiotTMaintenancePlanServicesImpl implements YtiotTMaintenancePlanS
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
@@ -928,7 +928,7 @@ public class YtiotTMaintenancePlanServicesImpl implements YtiotTMaintenancePlanS
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
 			
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {

src/cn/com/usky/iot/outcrypackage/service/YtiotTOutcryPackageServicesImpl.java

@@ -134,7 +134,7 @@ public class YtiotTOutcryPackageServicesImpl implements YtiotTOutcryPackageServi
 			I_NUMBER_OF_BARS = q_json.has("I_NUMBER_OF_BARS")?q_json.getString("I_NUMBER_OF_BARS"):null;			
 			I_CYCLE = q_json.has("I_CYCLE")?q_json.getString("I_CYCLE"):null;
 			V_PHONE = q_json.has("V_PHONE")?q_json.getString("V_PHONE"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(UQ_COMPANY_ID)&&chk_string_param(UQ_CATEGORY)&&chk_string_param(D_START_STORETIME)
 				&&chk_string_param(D_END_STORETIME)&&chk_string_param(I_NUMBER_OF_BARS)
@@ -196,7 +196,7 @@ public class YtiotTOutcryPackageServicesImpl implements YtiotTOutcryPackageServi
 			I_NUMBER_OF_BARS = q_json.has("I_NUMBER_OF_BARS")?q_json.getString("I_NUMBER_OF_BARS"):null;
 			I_CYCLE = q_json.has("I_CYCLE")?q_json.getString("I_CYCLE"):null;
 			E_STATUS = q_json.has("E_STATUS")?q_json.getString("E_STATUS").toUpperCase():null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(UQ_COMPANY_ID)&&chk_string_param(D_START_STORETIME)&&chk_string_param(D_END_STORETIME)
 				&&chk_string_param(UQ_CATEGORY)&&chk_string_param(I_NUMBER_OF_BARS)&&chk_string_param(I_CYCLE)
@@ -345,7 +345,7 @@ public class YtiotTOutcryPackageServicesImpl implements YtiotTOutcryPackageServi
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {

src/cn/com/usky/iot/outcrypackage/service/YtiotVCompanyServiceImpl.java

@@ -206,7 +206,7 @@ public class YtiotVCompanyServiceImpl implements YtiotVCompanyService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(sort!=null) {
 			Sort = JSONArray.fromObject(sort);
@@ -448,7 +448,7 @@ public class YtiotVCompanyServiceImpl implements YtiotVCompanyService {
 					xmlx = q_json.getString("xmlx");
 			}
 			xmlx = q_json.has("xmlx")?q_json.getString("xmlx"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
 			V_PASSWORD = q_json.has("V_PASSWORD")?q_json.getString("V_PASSWORD"):null;
 		}

src/cn/com/usky/iot/point/service/YtiotTPointServicesImpl.java

@@ -95,7 +95,7 @@ public class YtiotTPointServicesImpl implements YtiotTPointService {
 			F_HEIGHT  = q_json.has("F_HEIGHT")?q_json.getString("F_HEIGHT"):null;
 			V_COMMENT = q_json.has("V_COMMENT")?q_json.getString("V_COMMENT"):null;		
 			UQ_ADMIN_ID = q_json.has("UQ_ADMIN_ID")?q_json.getString("UQ_ADMIN_ID"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(V_POINT_ADDRESS)&&(I_FLOOR>-1)&&chk_string_param(F_HEIGHT)
 				&&chk_string_param(V_COMMENT)&&chk_string_param(UQ_ADMIN_ID)) {
@@ -139,7 +139,7 @@ public class YtiotTPointServicesImpl implements YtiotTPointService {
 			F_HEIGHT  = q_json.has("F_HEIGHT")?q_json.getString("F_HEIGHT"):null;
 			V_COMMENT = q_json.has("V_COMMENT")?q_json.getString("V_COMMENT"):null;		
 			UQ_ADMIN_ID = q_json.has("UQ_ADMIN_ID")?q_json.getString("UQ_ADMIN_ID"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(V_POINT_ADDRESS)&&(I_FLOOR>-1)&&chk_string_param(F_HEIGHT)
 				&&chk_string_param(V_COMMENT)&&chk_string_param(UQ_ADMIN_ID)&&chk_string_param(UQ_POINT_ID)) {
@@ -254,7 +254,7 @@ public class YtiotTPointServicesImpl implements YtiotTPointService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {
@@ -367,7 +367,7 @@ public class YtiotTPointServicesImpl implements YtiotTPointService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {

src/cn/com/usky/iot/qrcodeanalysis/service/YtiotTQrcodeAnalysisServicesImpl.java

@@ -77,7 +77,7 @@ public class YtiotTQrcodeAnalysisServicesImpl implements YtiotTQrcodeAnalysisSer
 		if(queryJson!=null) {
 			q_json 	  	 = JSONObject.fromObject(queryJson);
 			analysis_content 	  	 = q_json.has("analysis_content")?q_json.getString("analysis_content"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(analysis_content)) {
 			YtiotTQrcodeAnalysis o = new YtiotTQrcodeAnalysis();
@@ -111,7 +111,7 @@ public class YtiotTQrcodeAnalysisServicesImpl implements YtiotTQrcodeAnalysisSer
 			q_json 	  	 = JSONObject.fromObject(queryJson);
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
 			analysis_content 	  	 = q_json.has("analysis_content")?q_json.getString("analysis_content"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		
 		if((V_LOGINNAME!=null)&&(Company_Code_List==null)&&(!V_LOGINNAME.equals("admin"))) {
@@ -163,7 +163,7 @@ public class YtiotTQrcodeAnalysisServicesImpl implements YtiotTQrcodeAnalysisSer
 			id 	  	 = q_json.has("id")?q_json.getString("id"):null;
 			
 			analysis_content 	  	 = q_json.has("analysis_content")?q_json.getString("analysis_content"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(analysis_content)) {
 			if(id!=null) {
@@ -205,7 +205,7 @@ public class YtiotTQrcodeAnalysisServicesImpl implements YtiotTQrcodeAnalysisSer
 			id 	  	 = q_json.has("id")?q_json.getString("id"):null;
 			
 			analysis_content 	  	 = q_json.has("analysis_content")?q_json.getString("analysis_content"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(analysis_content)) {
 			if(id!=null) {
@@ -298,7 +298,7 @@ public class YtiotTQrcodeAnalysisServicesImpl implements YtiotTQrcodeAnalysisSer
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {
@@ -391,7 +391,7 @@ public class YtiotTQrcodeAnalysisServicesImpl implements YtiotTQrcodeAnalysisSer
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 		if(V_LOGINNAME!=null) {
@@ -501,7 +501,7 @@ public class YtiotTQrcodeAnalysisServicesImpl implements YtiotTQrcodeAnalysisSer
 			
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 		if(V_LOGINNAME!=null) {

src/cn/com/usky/iot/qrcodeanalysis2/service/YtiotTQrcodeAnalysis2ServicesImpl.java

@@ -78,7 +78,7 @@ public class YtiotTQrcodeAnalysis2ServicesImpl implements YtiotTQrcodeAnalysis2S
 		if(queryJson!=null) {
 			q_json 	  	 = JSONObject.fromObject(queryJson);
 			analysis_content 	  	 = q_json.has("analysis_content")?q_json.getString("analysis_content"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(analysis_content)) {
 			YtiotTQrcodeAnalysis2 o = new YtiotTQrcodeAnalysis2();
@@ -112,7 +112,7 @@ public class YtiotTQrcodeAnalysis2ServicesImpl implements YtiotTQrcodeAnalysis2S
 			q_json 	  	 = JSONObject.fromObject(queryJson);
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
 			analysis_content 	  	 = q_json.has("analysis_content")?q_json.getString("analysis_content"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 		if((V_LOGINNAME!=null)&&(Company_Code_List==null)&&(!V_LOGINNAME.equals("admin"))) {
@@ -164,7 +164,7 @@ public class YtiotTQrcodeAnalysis2ServicesImpl implements YtiotTQrcodeAnalysis2S
 			id 	  	 = q_json.has("id")?q_json.getString("id"):null;
 			
 			analysis_content 	  	 = q_json.has("analysis_content")?q_json.getString("analysis_content"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(analysis_content)) {
 			if(id!=null) {
@@ -206,7 +206,7 @@ public class YtiotTQrcodeAnalysis2ServicesImpl implements YtiotTQrcodeAnalysis2S
 			id 	  	 = q_json.has("id")?q_json.getString("id"):null;
 			
 			analysis_content 	  	 = q_json.has("analysis_content")?q_json.getString("analysis_content"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(analysis_content)) {
 			if(id!=null) {
@@ -299,7 +299,7 @@ public class YtiotTQrcodeAnalysis2ServicesImpl implements YtiotTQrcodeAnalysis2S
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {
@@ -392,7 +392,7 @@ public class YtiotTQrcodeAnalysis2ServicesImpl implements YtiotTQrcodeAnalysis2S
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 		if(V_LOGINNAME!=null) {
@@ -502,7 +502,7 @@ public class YtiotTQrcodeAnalysis2ServicesImpl implements YtiotTQrcodeAnalysis2S
 			
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 		if(V_LOGINNAME!=null) {

src/cn/com/usky/iot/route/service/YtiotTRouteServicesImpl.java

@@ -110,7 +110,7 @@ public class YtiotTRouteServicesImpl implements YtiotTRouteService {
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
 //			xjzq  = q_json.has("xjzq")?q_json.getString("xjzq"):null;		
 //			UQ_ADMIN_ID = q_json.has("UQ_ADMIN_ID")?q_json.getString("UQ_ADMIN_ID"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if((V_LOGINNAME!=null)&&(Company_Code_List==null)&&(!V_LOGINNAME.equals("admin"))) {
 			String where = " where u.id.agentid='"+V_LOGINNAME+"' ";
@@ -167,7 +167,7 @@ public class YtiotTRouteServicesImpl implements YtiotTRouteService {
 			route 	  	 = q_json.has("route")?q_json.getString("route"):null;
 			route_name      = q_json.has("route_name")?q_json.getString("route_name"):null;
 //			xjzq  = q_json.has("xjzq")?q_json.getString("xjzq"):null;		
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(route)&&chk_string_param(route_name)) {
 			YtiotTRoute o = new YtiotTRoute();
@@ -204,7 +204,7 @@ public class YtiotTRouteServicesImpl implements YtiotTRouteService {
 			route_name      = q_json.has("route_name")?q_json.getString("route_name"):null;
 			company_code      = q_json.has("company_code")?q_json.getString("company_code"):null;
 //			xjzq  = q_json.has("xjzq")?q_json.getString("xjzq"):null;		
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(route)&&chk_string_param(route_name)&&chk_string_param(company_code)) {
 			if(id!=null) {
@@ -254,7 +254,7 @@ public class YtiotTRouteServicesImpl implements YtiotTRouteService {
 			route 	  	 = q_json.has("route")?q_json.getString("route"):null;
 			route_name      = q_json.has("route_name")?q_json.getString("route_name"):null;
 //			xjzq  = q_json.has("xjzq")?q_json.getString("xjzq"):null;		
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(route)&&chk_string_param(route_name)) {
 			if(id!=null) {
@@ -365,7 +365,7 @@ public class YtiotTRouteServicesImpl implements YtiotTRouteService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -509,7 +509,7 @@ public class YtiotTRouteServicesImpl implements YtiotTRouteService {
 			
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -624,7 +624,7 @@ public class YtiotTRouteServicesImpl implements YtiotTRouteService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 //		System.out.println()

src/cn/com/usky/iot/route2/service/YtiotTRoute2ServicesImpl.java

@@ -104,7 +104,7 @@ public class YtiotTRoute2ServicesImpl implements YtiotTRoute2Service {
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
 //			xjzq  = q_json.has("xjzq")?q_json.getString("xjzq"):null;		
 //			UQ_ADMIN_ID = q_json.has("UQ_ADMIN_ID")?q_json.getString("UQ_ADMIN_ID"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if((V_LOGINNAME!=null)&&(Company_Code_List==null)&&(!V_LOGINNAME.equals("admin"))) {
 			String where = " where u.id.agentid='"+V_LOGINNAME+"' ";
@@ -161,7 +161,7 @@ public class YtiotTRoute2ServicesImpl implements YtiotTRoute2Service {
 			route 	  	 = q_json.has("route")?q_json.getString("route"):null;
 			route_name      = q_json.has("route_name")?q_json.getString("route_name"):null;
 //			xjzq  = q_json.has("xjzq")?q_json.getString("xjzq"):null;		
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(route)&&chk_string_param(route_name)) {
 			YtiotTRoute2 o = new YtiotTRoute2();
@@ -198,7 +198,7 @@ public class YtiotTRoute2ServicesImpl implements YtiotTRoute2Service {
 			route_name      = q_json.has("route_name")?q_json.getString("route_name"):null;
 			company_code      = q_json.has("company_code")?q_json.getString("company_code"):null;
 //			xjzq  = q_json.has("xjzq")?q_json.getString("xjzq"):null;		
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(route)&&chk_string_param(route_name)&&chk_string_param(company_code)) {
 			if(id!=null) {
@@ -248,7 +248,7 @@ public class YtiotTRoute2ServicesImpl implements YtiotTRoute2Service {
 			route 	  	 = q_json.has("route")?q_json.getString("route"):null;
 			route_name      = q_json.has("route_name")?q_json.getString("route_name"):null;
 //			xjzq  = q_json.has("xjzq")?q_json.getString("xjzq"):null;		
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(route)&&chk_string_param(route_name)) {
 			if(id!=null) {
@@ -380,7 +380,7 @@ public class YtiotTRoute2ServicesImpl implements YtiotTRoute2Service {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -526,7 +526,7 @@ public class YtiotTRoute2ServicesImpl implements YtiotTRoute2Service {
 			
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -641,7 +641,7 @@ public class YtiotTRoute2ServicesImpl implements YtiotTRoute2Service {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		
 //		System.out.println()

src/cn/com/usky/iot/unitmodel/service/YtiotTUnitmodelServicesImpl.java

@@ -118,7 +118,7 @@ public class YtiotTUnitmodelServicesImpl implements YtiotTUnitmodelService {
 			
 			V_COMMENT = q_json.has("V_COMMENT")?q_json.getString("V_COMMENT"):null;
 			UQ_ADMIN_ID = q_json.has("UQ_ADMIN_ID")?q_json.getString("UQ_ADMIN_ID"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(V_UNIT_MODEL)&&chk_string_param(UQ_PROTOCOL_ID)&&chk_string_param(UQ_COMPANY_ID)
 				&&chk_string_param(V_COMMENT)&&chk_string_param(UQ_ADMIN_ID)	) {
@@ -165,7 +165,7 @@ public class YtiotTUnitmodelServicesImpl implements YtiotTUnitmodelService {
 			V_COMMENT = q_json.has("V_COMMENT")?q_json.getString("V_COMMENT"):null;
 			UQ_ADMIN_ID = q_json.has("UQ_ADMIN_ID")?q_json.getString("UQ_ADMIN_ID"):null;
 			E_STATUS  = q_json.has("E_STATUS")?q_json.getString("E_STATUS"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(UQ_UNIT_MODEL_ID)&&chk_string_param(V_UNIT_MODEL)&&chk_string_param(UQ_PROTOCOL_ID)&&chk_string_param(UQ_COMPANY_ID)
 				&&chk_string_param(V_COMMENT)&&chk_string_param(UQ_ADMIN_ID)&&chk_string_param(E_STATUS)	) {
@@ -276,7 +276,7 @@ public class YtiotTUnitmodelServicesImpl implements YtiotTUnitmodelService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {
@@ -407,7 +407,7 @@ public class YtiotTUnitmodelServicesImpl implements YtiotTUnitmodelService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+		//	json.put("query", queryJson);
 		}
 //		System.out.println();
 		if(sort!=null) {

src/cn/com/usky/iot/xjinspectors/service/YtiotXjInspectorsServicesImpl.java

@@ -145,7 +145,7 @@ public class YtiotXjInspectorsServicesImpl implements YtiotXjInspectorsService {
 			phone      = q_json.has("phone")?q_json.getString("phone"):null;
 			zn  = q_json.has("zn")?q_json.getString("zn"):null;
 			V_LOGINNAME   = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(name)&&chk_string_param(phone)&&chk_string_param(zn)&&chk_string_param(inspect_role)) {
 				YtiotXjInspectors o = new YtiotXjInspectors();
@@ -191,7 +191,7 @@ public class YtiotXjInspectorsServicesImpl implements YtiotXjInspectorsService {
 			phone      = q_json.has("phone")?q_json.getString("phone"):null;
 //			inspect_role  = q_json.has("inspect_role")?q_json.getString("inspect_role"):null;
 			zn  = q_json.has("zn")?q_json.getString("zn"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(name)&&chk_string_param(phone)
 				&&chk_string_param(zn)&&chk_string_param(inspect_role)) {
@@ -311,7 +311,7 @@ public class YtiotXjInspectorsServicesImpl implements YtiotXjInspectorsService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -445,7 +445,7 @@ public class YtiotXjInspectorsServicesImpl implements YtiotXjInspectorsService {
 			
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 	
 		
@@ -554,7 +554,7 @@ public class YtiotXjInspectorsServicesImpl implements YtiotXjInspectorsService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		
 //		System.out.println();

src/cn/com/usky/iot/xjplanmaster/service/YtiotXjPlanMasterServicesImpl.java

@@ -235,7 +235,7 @@ public class YtiotXjPlanMasterServicesImpl implements YtiotXjPlanMasterService {
 //			System.out.println("测试a8"+company_code);
 //			System.out.println("测试a9"+V_LOGINNAME);
 //			System.out.println("测试a10"+spot_id);
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 		if(chk_string_param(plan_name)&&chk_string_param(team_id)&&chk_string_param(cycle)&&chk_string_param(start_inspect_time)&&chk_string_param(spot_id)
@@ -330,7 +330,7 @@ public class YtiotXjPlanMasterServicesImpl implements YtiotXjPlanMasterService {
 //			System.out.println("测试a8"+company_code);
 //			System.out.println("测试a9"+V_LOGINNAME);
 //			System.out.println("测试a10"+spot_id);
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 		if(chk_string_param(plan_name)&&chk_string_param(team_id)&&chk_string_param(cycle)&&chk_string_param(start_inspect_time)&&chk_string_param(spot_id)
@@ -419,7 +419,7 @@ public class YtiotXjPlanMasterServicesImpl implements YtiotXjPlanMasterService {
 			company_code  = q_json.has("company_code")?q_json.getString("company_code"):null;
 			spot_id  = q_json.has("spot_id")?q_json.getString("spot_id"):null;
 			V_LOGINNAME = q_json.has("V_LOGINNAME")?q_json.getString("V_LOGINNAME"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(plan_name)&&chk_string_param(team_id)&&chk_string_param(cycle)&&chk_string_param(start_inspect_time)&&chk_string_param(spot_id)
 				&&chk_string_param(start_date)&&chk_string_param(end_date)&&chk_string_param(end_inspect_time)&&chk_string_param(V_LOGINNAME)&&chk_string_param(spot_id)) {
@@ -687,7 +687,7 @@ public class YtiotXjPlanMasterServicesImpl implements YtiotXjPlanMasterService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 			
 			if(sort!=null) {
@@ -882,7 +882,7 @@ public class YtiotXjPlanMasterServicesImpl implements YtiotXjPlanMasterService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 			
 			if(sort!=null) {
@@ -1123,7 +1123,7 @@ public class YtiotXjPlanMasterServicesImpl implements YtiotXjPlanMasterService {
 			
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}	
 //		System.out.println(plan_name);
 		
@@ -1283,7 +1283,7 @@ public class YtiotXjPlanMasterServicesImpl implements YtiotXjPlanMasterService {
 			
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}	
 //		System.out.println(plan_name);
 		

src/cn/com/usky/iot/yypzb/service/YtiotYyPzbServicesImpl.java

@@ -181,7 +181,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			lbsl   = q_json.has("lbsl")?q_json.getString("lbsl"):null;
 			username   = q_json.has("username")?q_json.getString("username"):null;
 			sbtype   = q_json.has("sbtype")?q_json.getString("sbtype"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(
 //				chk_string_param(bjxh)&&chk_string_param(bjhm)&&
@@ -259,7 +259,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 //			krq   = q_json.has("krq")?q_json.getString("krq"):null;
 //			jrq   = q_json.has("jrq")?q_json.getString("jrq"):null;
 			
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(company_name)&&chk_string_param(czed)&&chk_string_param(xysj)) {
 			if(company_name!=null&&!company_name.equals("null")&&!company_name.equals("")) {
@@ -459,7 +459,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			lbsl   = q_json.has("lbsl")?q_json.getString("lbsl"):null;
 			sbtype   = q_json.has("sbtype")?q_json.getString("sbtype"):null;
 			username   = q_json.has("username")?q_json.getString("username"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(company_name)&&chk_string_param(name)&&chk_string_param(bjhm)&&chk_string_param(bjxh)&&chk_string_param(zed)&&chk_string_param(username)&&chk_string_param(pzlb)&&chk_string_param(lbsl)) {
 				YtiotYyPzb o = new YtiotYyPzb();
@@ -561,7 +561,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			lbsl   = q_json.has("lbsl")?q_json.getString("lbsl"):null;
 			username   = q_json.has("username")?q_json.getString("username"):null;
 			sbtype   = q_json.has("sbtype")?q_json.getString("sbtype"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(bjxh)&&chk_string_param(bjhm)&&chk_string_param(zed)&&chk_string_param(krq)&&chk_string_param(jrq)
 				&&chk_string_param(username)&&chk_string_param(sbtype)) {
@@ -648,7 +648,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			pzlb  = q_json.has("pzlb")?q_json.getString("pzlb"):null;
 			lbsl   = q_json.has("lbsl")?q_json.getString("lbsl"):null;
 			sbtype   = q_json.has("sbtype")?q_json.getString("sbtype"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(company_name)&&chk_string_param(name)&&chk_string_param(bjhm)&&chk_string_param(bjxh)) {
 			if(id!=null) {
@@ -822,7 +822,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -1029,7 +1029,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -1208,7 +1208,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -1335,7 +1335,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 		json.put("action", "getPzbSl");
 		if(queryJson!=null) {
 			q_json = JSONObject.fromObject(queryJson);			
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 
@@ -1400,7 +1400,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			q_json = JSONObject.fromObject(queryJson);			
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -1468,7 +1468,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			id = q_json.has("id")?q_json.getString("id"):null;
 			order = q_json.has("order")?q_json.getString("order"):null;
 			dir = q_json.has("dir")?q_json.getString("dir"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -1538,7 +1538,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
 			Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
 			Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		
 //		System.out.println();
@@ -1627,7 +1627,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			xh   = q_json.has("xh")?q_json.getString("xh"):null;
 			AccessKeyId   = q_json.has("AccessKeyId")?q_json.getString("AccessKeyId"):null;
 			AccessKeySecret      = q_json.has("AccessKeySecret")?q_json.getString("AccessKeySecret"):null;
-			json.put("query", queryJson);
+			//json.put("query", queryJson);
 		}
 		if(chk_string_param(xh)&&chk_string_param(AccessKeyId)&&chk_string_param(AccessKeySecret)) {
 				YtiotYyXhconfig o = new YtiotYyXhconfig();
@@ -1674,7 +1674,7 @@ public class YtiotYyPzbServicesImpl implements YtiotYyPzbService {
 			xh 	  	 = q_json.has("xh")?q_json.getString("xh"):null;
 			AccessKeyId      = q_json.has("AccessKeyId")?q_json.getString("AccessKeyId"):null;
 			AccessKeySecret  = q_json.has("AccessKeySecret")?q_json.getString("AccessKeySecret"):null;
-			json.put("query", queryJson);
+//			json.put("query", queryJson);
 		}
 		if(chk_string_param(id)&&chk_string_param(xh)&&chk_string_param(AccessKeyId)&&chk_string_param(AccessKeySecret)) {
 			if(id!=null) {