调整dsp模块传递参数的格式

src/main/java/com/cloudcross/ssp/common/consts/FieldValidate.java

@@ -13,7 +13,7 @@ public enum FieldValidate {
 	/**
 	 * 传入的参数判断
 	 **/
-	CHECK_DSPID_NOT_EMPTY(100, "dspid不能为空"),
+	CHECK_DSPID_NOT_EMPTY(100, "dspId不能为空"),
 	
 	CHECK_TOKEN_NOT_EMPTY(100, "token不能为空"),
 	
@@ -21,6 +21,10 @@ public enum FieldValidate {
 	
 	CHECK_BANNERID_NOT_EMPTY(102, "创意id不能为空"),
 	
+	CHECK_ADVERTISERIDS_NOT_EMPTY(101, "advertiserIds不能为空"),
+	
+	CHECK_BANNERIDS_NOT_EMPTY(102, "bannerIds不能为空"),
+	
 	CHECK_TOKEN_NOT_CONFORM(103, "令牌身份不符合"),
 	
 	CHECK_PARAMDATA_EMPTY(104, "传入的参数值为空"),

src/main/java/com/cloudcross/ssp/web/dsp/DspAdvertiserController.java

@@ -152,17 +152,32 @@ public class DspAdvertiserController extends SimpleController{
 		/** 跨域问题 ,校验身份 **/
 		result = this.checkIdentityAndCros(response, result, paramMap);
 		if(result.isEmpty()){
-			if(paramMap.containsKey("advertiserIds") && paramMap.get("advertiserIds") != null 
-					&& !"".equals(paramMap.get("advertiserIds"))){
-				List<Long> list = new ArrayList<Long>();
-				String[] ids = paramMap.get("advertiserIds").toString().split(",");
-				for (int i = 0, l = ids.length; i < l; i++) {
-					list.add(Long.valueOf(ids[i]));
+			String advertiserIdsStr = (String) paramMap.get("request");
+			if(advertiserIdsStr != null && !"".equals(advertiserIdsStr)){
+				try {
+					//解析JSONArray
+					JSONArray jsonArray = JSONArray.fromObject(advertiserIdsStr);
+					for (int i = 0, l = jsonArray.size(); i < l; i++) {
+						JSONObject obj = jsonArray.getJSONObject(i);
+						if(obj.containsKey("advertiserIds") && obj.get("advertiserIds") != null 
+							&& !"".equals(obj.get("advertiserIds"))){
+							List<Long> list = new ArrayList<Long>();
+							String[] ids = paramMap.get("advertiserIds").toString().split(",");
+							for (int j = 0, m = ids.length; j < m; j++) {
+								list.add(Long.valueOf(ids[j]));
+							}
+							paramMap.put("advertiserIdList", list);
+							result = dspAdvertiserService.get(paramMap);
+						}else{
+							result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_ADVERTISERIDS_NOT_EMPTY,false,null,0,"error"));
+						}
+					}
+				}catch (JSONException e) {
+					// TODO Auto-generated catch block
+					result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_FORMAT_ERROR,false,null,0,"error"));
 				}
-				paramMap.put("advertiserIdList", list);
-				result = dspAdvertiserService.get(paramMap);
 			}else{
-				result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_ADVERTISERID_NOT_EMPTY,false,null,0,"error"));
+				result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_EMPTY,false,null,0,"error"));
 			}
 		}
 		return result;		
@@ -182,27 +197,42 @@ public class DspAdvertiserController extends SimpleController{
 		/** 跨域问题 ,校验身份 **/
 		result = this.checkIdentityAndCros(response, result, paramMap);
 		if(result.isEmpty()){
-			if(paramMap.containsKey("advertiserIds") && paramMap.get("advertiserIds") != null 
-					&& !"".equals(paramMap.get("advertiserIds"))){
-				List<Long> list = new ArrayList<Long>();
-				String[] ids = paramMap.get("advertiserIds").toString().split(",");
-				for (int i = 0, l = ids.length; i < l; i++) {
-					list.add(Long.valueOf(ids[i]));
-				}
-				paramMap.put("advertiserIdList", list);
-				result = dspAdvertiserService.queryState(paramMap);
-				for (int i = 0, l = result.size(); i < l; i++) {
-					Map<String,Object> map = result.get(i);
-					if(Integer.parseInt(map.get("state").toString()) == 0){
-						map.put("stateValue", "通过");
-					}else if(Integer.parseInt(map.get("state").toString()) == 1){
-						map.put("stateValue", "待检查");
-					}else if(Integer.parseInt(map.get("state").toString()) == 2){
-						map.put("stateValue", "检查未通过");
+			String advertiserIdsStr = (String) paramMap.get("request");
+			if(advertiserIdsStr != null && !"".equals(advertiserIdsStr)){
+				try {
+					//解析JSONArray
+					JSONArray jsonArray = JSONArray.fromObject(advertiserIdsStr);
+					for (int i = 0, l = jsonArray.size(); i < l; i++) {
+						JSONObject obj = jsonArray.getJSONObject(i);
+						if(obj.containsKey("advertiserIds") && obj.get("advertiserIds") != null 
+							&& !"".equals(obj.get("advertiserIds"))){
+							List<Long> list = new ArrayList<Long>();
+							String[] ids = obj.get("advertiserIds").toString().split(",");
+							for (int j = 0, m = ids.length; j < m; j++) {
+								list.add(Long.valueOf(ids[j]));
+							}
+							paramMap.put("advertiserIdList", list);
+							result = dspAdvertiserService.queryState(paramMap);
+							for (int k = 0, n = result.size(); k < n; k++) {
+								Map<String,Object> map = result.get(k);
+								if(Integer.parseInt(map.get("state").toString()) == 0){
+									map.put("stateValue", "通过");
+								}else if(Integer.parseInt(map.get("state").toString()) == 1){
+									map.put("stateValue", "待检查");
+								}else if(Integer.parseInt(map.get("state").toString()) == 2){
+									map.put("stateValue", "检查未通过");
+								}
+							}
+						}else{
+							result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_ADVERTISERIDS_NOT_EMPTY,false,null,0,"error"));
+						}
 					}
+				}catch (JSONException e) {
+					// TODO Auto-generated catch block
+					result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_FORMAT_ERROR,false,null,0,"error"));
 				}
 			}else{
-				result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_ADVERTISERID_NOT_EMPTY,false,null,0,"error"));
+				result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_EMPTY,false,null,0,"error"));
 			}
 		}
 		return result;		

src/main/java/com/cloudcross/ssp/web/dsp/DspBannerController.java

@@ -133,17 +133,32 @@ public class DspBannerController extends SimpleController{
 		/** 跨域问题 ,校验身份 **/
 		result = this.checkIdentityAndCros(response, result, paramMap);
 		if(result.isEmpty()){
-			if(paramMap.containsKey("advertiserIds") && paramMap.get("advertiserIds") != null 
-					&& !"".equals(paramMap.get("advertiserIds"))){
-				List<Long> list = new ArrayList<Long>();
-				String[] ids = paramMap.get("advertiserIds").toString().split(",");
-				for (int i = 0, l = ids.length; i < l; i++) {
-					list.add(Long.valueOf(ids[i]));
+			String advertiserIdsStr = (String) paramMap.get("request");
+			if(advertiserIdsStr != null && !"".equals(advertiserIdsStr)){
+				try {
+					//解析JSONArray
+					JSONArray jsonArray = JSONArray.fromObject(advertiserIdsStr);
+					for (int i = 0, l = jsonArray.size(); i < l; i++) {
+						JSONObject obj = jsonArray.getJSONObject(i);
+						if(obj.containsKey("advertiserIds") && obj.get("advertiserIds") != null 
+							&& !"".equals(obj.get("advertiserIds"))){
+							List<Long> list = new ArrayList<Long>();
+							String[] ids = paramMap.get("advertiserIds").toString().split(",");
+							for (int j = 0, m = ids.length; j < m; j++) {
+								list.add(Long.valueOf(ids[j]));
+							}
+							paramMap.put("advertiserIdList", list);
+							result = dspBannerService.getAll(paramMap);
+						}else{
+							result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_ADVERTISERIDS_NOT_EMPTY,false,null,0,"error"));
+						}
+					}
+				}catch (JSONException e) {
+					// TODO Auto-generated catch block
+					result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_FORMAT_ERROR,false,null,0,"error"));
 				}
-				paramMap.put("advertiserIdList", list);
-				result = dspBannerService.getAll(paramMap);
 			}else{
-				result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_ADVERTISERID_NOT_EMPTY,false,null,0,"error"));
+				result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_EMPTY,false,null,0,"error"));
 			}
 		}
 		return result;		
@@ -163,17 +178,32 @@ public class DspBannerController extends SimpleController{
 		/** 跨域问题 ,校验身份 **/
 		result = this.checkIdentityAndCros(response, result, paramMap);
 		if(result.isEmpty()){
-			if(paramMap.containsKey("bannerIds") && paramMap.get("bannerIds") != null 
-					&& !"".equals(paramMap.get("bannerIds"))){
-				List<Long> list = new ArrayList<Long>();
-				String[] ids = paramMap.get("bannerIds").toString().split(",");
-				for (int i = 0, l = ids.length; i < l; i++) {
-					list.add(Long.valueOf(ids[i]));
+			String bannerIdsStr = (String) paramMap.get("request");
+			if(bannerIdsStr != null && !"".equals(bannerIdsStr)){
+				try {
+					//解析JSONArray
+					JSONArray jsonArray = JSONArray.fromObject(bannerIdsStr);
+					for (int i = 0, l = jsonArray.size(); i < l; i++) {
+						JSONObject obj = jsonArray.getJSONObject(i);
+						if(obj.containsKey("bannerIds") && obj.get("bannerIds") != null 
+							&& !"".equals(obj.get("bannerIds"))){
+							List<Long> list = new ArrayList<Long>();
+							String[] ids = paramMap.get("bannerIds").toString().split(",");
+							for (int j = 0, m = ids.length; j < m; j++) {
+								list.add(Long.valueOf(ids[j]));
+							}
+							paramMap.put("bannerIdList", list);
+							result = dspBannerService.get(paramMap);
+						}else{
+							result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_BANNERIDS_NOT_EMPTY,false,null,0,"error"));
+						}
+					}
+				}catch (JSONException e) {
+					// TODO Auto-generated catch block
+					result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_FORMAT_ERROR,false,null,0,"error"));
 				}
-				paramMap.put("bannerIdList", list);
-				result = dspBannerService.get(paramMap);
 			}else{
-				result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_BANNERID_NOT_EMPTY,false,null,0,"error"));
+				result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_EMPTY,false,null,0,"error"));
 			}
 		}
 		return result;		
@@ -193,27 +223,42 @@ public class DspBannerController extends SimpleController{
 		/** 跨域问题 ,校验身份 **/
 		result = this.checkIdentityAndCros(response, result, paramMap);
 		if(result.isEmpty()){
-			if(paramMap.containsKey("bannerIds") && paramMap.get("bannerIds") != null 
-					&& !"".equals(paramMap.get("bannerIds"))){
-				List<Long> list = new ArrayList<Long>();
-				String[] ids = paramMap.get("bannerIds").toString().split(",");
-				for (int i = 0, l = ids.length; i < l; i++) {
-					list.add(Long.valueOf(ids[i]));
-				}
-				paramMap.put("bannerIdList", list);
-				result = dspBannerService.queryState(paramMap);
-				for (int i = 0, l = result.size(); i < l; i++) {
-					Map<String,Object> map = result.get(i);
-					if(Integer.parseInt(map.get("state").toString()) == 0){
-						map.put("stateValue", "通过");
-					}else if(Integer.parseInt(map.get("state").toString()) == 1){
-						map.put("stateValue", "待检查");
-					}else if(Integer.parseInt(map.get("state").toString()) == 2){
-						map.put("stateValue", "检查未通过");
+			String bannerIdsStr = (String) paramMap.get("request");
+			if(bannerIdsStr != null && !"".equals(bannerIdsStr)){
+				try {
+					//解析JSONArray
+					JSONArray jsonArray = JSONArray.fromObject(bannerIdsStr);
+					for (int i = 0, l = jsonArray.size(); i < l; i++) {
+						JSONObject obj = jsonArray.getJSONObject(i);
+						if(obj.containsKey("bannerIds") && obj.get("bannerIds") != null 
+							&& !"".equals(obj.get("bannerIds"))){
+							List<Long> list = new ArrayList<Long>();
+							String[] ids = paramMap.get("bannerIds").toString().split(",");
+							for (int j = 0, m = ids.length; j < m; j++) {
+								list.add(Long.valueOf(ids[j]));
+							}
+							paramMap.put("bannerIdList", list);
+							result = dspBannerService.queryState(paramMap);
+							for (int k = 0, n = result.size(); k < n; k++) {
+								Map<String,Object> map = result.get(k);
+								if(Integer.parseInt(map.get("state").toString()) == 0){
+									map.put("stateValue", "通过");
+								}else if(Integer.parseInt(map.get("state").toString()) == 1){
+									map.put("stateValue", "待检查");
+								}else if(Integer.parseInt(map.get("state").toString()) == 2){
+									map.put("stateValue", "检查未通过");
+								}
+							}
+						}else{
+							result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_BANNERIDS_NOT_EMPTY,false,null,0,"error"));
+						}
 					}
+				}catch (JSONException e) {
+					// TODO Auto-generated catch block
+					result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_FORMAT_ERROR,false,null,0,"error"));
 				}
 			}else{
-				result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_BANNERID_NOT_EMPTY,false,null,0,"error"));
+				result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_EMPTY,false,null,0,"error"));
 			}
 		}
 		return result;