|
@@ -23,10 +23,12 @@ import com.cloudcross.ssp.common.utils.Common;
|
|
import com.cloudcross.ssp.common.utils.FieldInfo;
|
|
import com.cloudcross.ssp.common.utils.FieldInfo;
|
|
import com.cloudcross.ssp.model.DspBanner;
|
|
import com.cloudcross.ssp.model.DspBanner;
|
|
import com.cloudcross.ssp.model.Log;
|
|
import com.cloudcross.ssp.model.Log;
|
|
|
|
+import com.cloudcross.ssp.service.IDspAgentService;
|
|
import com.cloudcross.ssp.service.IDspBannerService;
|
|
import com.cloudcross.ssp.service.IDspBannerService;
|
|
import com.cloudcross.ssp.service.ILogService;
|
|
import com.cloudcross.ssp.service.ILogService;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
+import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
/**
|
|
/**
|
|
*
|
|
*
|
|
@@ -47,6 +49,9 @@ public class DspBannerController extends SimpleController{
|
|
@Autowired
|
|
@Autowired
|
|
private IDspBannerService dspBannerService;
|
|
private IDspBannerService dspBannerService;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private IDspAgentService dspAgentService;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private ILogService logService;
|
|
private ILogService logService;
|
|
|
|
|
|
@@ -57,22 +62,28 @@ public class DspBannerController extends SimpleController{
|
|
*/
|
|
*/
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
@RequestMapping("/add")
|
|
@RequestMapping("/add")
|
|
- public @ResponseBody List<Map<String,Object>> add(HttpServletRequest request,@RequestParam Map<String,Object> paramMap){
|
|
|
|
|
|
+ public @ResponseBody List<Map<String,Object>> add(HttpServletRequest request,
|
|
|
|
+ HttpServletResponse response,@RequestParam Map<String,Object> paramMap){
|
|
List<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
|
|
List<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
|
|
- List<DspBanner> list = new ArrayList<DspBanner>();
|
|
|
|
- String dspBannerList = (String) paramMap.get("request");
|
|
|
|
- Map<String, FieldInfo> fieldInfoMap = DspBanner.getFieldInfoForDspBanner();
|
|
|
|
- if(dspBannerList != null && !"".equals(dspBannerList)){
|
|
|
|
- Map<String,Object> mapObj = this.getDspBannerList(dspBannerList, result, list, fieldInfoMap,"add");
|
|
|
|
- list = (List<DspBanner>) mapObj.get("list");
|
|
|
|
- result = (List<Map<String,Object>>) mapObj.get("result");
|
|
|
|
- if(!list.isEmpty()){
|
|
|
|
- dspBannerService.add(list);
|
|
|
|
- /*** 新增日志 ***/
|
|
|
|
- this.addLog(request, list, "add");
|
|
|
|
|
|
+ /** 跨域问题 ,校验身份 **/
|
|
|
|
+ result = this.checkIdentityAndCros(response, result, paramMap);
|
|
|
|
+ if(result.isEmpty()){
|
|
|
|
+ List<DspBanner> list = new ArrayList<DspBanner>();
|
|
|
|
+ String dspBannerList = (String) paramMap.get("request");
|
|
|
|
+ Map<String, FieldInfo> fieldInfoMap = DspBanner.getFieldInfoForDspBanner();
|
|
|
|
+ if(dspBannerList != null && !"".equals(dspBannerList)){
|
|
|
|
+ Map<String,Object> mapObj = this.getDspBannerList(dspBannerList, result, list, fieldInfoMap,"add",
|
|
|
|
+ Long.valueOf(paramMap.get("dspId").toString()));
|
|
|
|
+ list = (List<DspBanner>) mapObj.get("list");
|
|
|
|
+ result = (List<Map<String,Object>>) mapObj.get("result");
|
|
|
|
+ if(!list.isEmpty()){
|
|
|
|
+ dspBannerService.add(list);
|
|
|
|
+ /*** 新增日志 ***/
|
|
|
|
+ this.addLog(request, list, "add");
|
|
|
|
+ }
|
|
|
|
+ }else{
|
|
|
|
+ result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_EMPTY,false,null,0,"error"));
|
|
}
|
|
}
|
|
- }else{
|
|
|
|
- result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_EMPTY,false,null,0,"error"));
|
|
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
@@ -84,22 +95,28 @@ public class DspBannerController extends SimpleController{
|
|
*/
|
|
*/
|
|
@SuppressWarnings("unchecked")
|
|
@SuppressWarnings("unchecked")
|
|
@RequestMapping("/update")
|
|
@RequestMapping("/update")
|
|
- public @ResponseBody List<Map<String,Object>> update(HttpServletRequest request,@RequestParam Map<String,Object> paramMap){
|
|
|
|
|
|
+ public @ResponseBody List<Map<String,Object>> update(HttpServletRequest request,
|
|
|
|
+ HttpServletResponse response,@RequestParam Map<String,Object> paramMap){
|
|
List<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
|
|
List<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
|
|
- List<DspBanner> list = new ArrayList<DspBanner>();
|
|
|
|
- String dspBannerList = (String) paramMap.get("request");
|
|
|
|
- Map<String, FieldInfo> fieldInfoMap = DspBanner.getFieldInfoForDspBanner();
|
|
|
|
- if(dspBannerList != null && !"".equals(dspBannerList)){
|
|
|
|
- Map<String,Object> mapObj = this.getDspBannerList(dspBannerList, result, list, fieldInfoMap,"edit");
|
|
|
|
- list = (List<DspBanner>) mapObj.get("list");
|
|
|
|
- result = (List<Map<String,Object>>) mapObj.get("result");
|
|
|
|
- if(!list.isEmpty()){
|
|
|
|
- dspBannerService.update(list);
|
|
|
|
- /*** 新增日志 ***/
|
|
|
|
- this.addLog(request, list, "add");
|
|
|
|
|
|
+ /** 跨域问题 ,校验身份 **/
|
|
|
|
+ result = this.checkIdentityAndCros(response, result, paramMap);
|
|
|
|
+ if(result.isEmpty()){
|
|
|
|
+ List<DspBanner> list = new ArrayList<DspBanner>();
|
|
|
|
+ String dspBannerList = (String) paramMap.get("request");
|
|
|
|
+ Map<String, FieldInfo> fieldInfoMap = DspBanner.getFieldInfoForDspBanner();
|
|
|
|
+ if(dspBannerList != null && !"".equals(dspBannerList)){
|
|
|
|
+ Map<String,Object> mapObj = this.getDspBannerList(dspBannerList, result, list, fieldInfoMap,"edit",
|
|
|
|
+ Long.valueOf(paramMap.get("dspId").toString()));
|
|
|
|
+ list = (List<DspBanner>) mapObj.get("list");
|
|
|
|
+ result = (List<Map<String,Object>>) mapObj.get("result");
|
|
|
|
+ if(!list.isEmpty()){
|
|
|
|
+ dspBannerService.update(list);
|
|
|
|
+ /*** 新增日志 ***/
|
|
|
|
+ this.addLog(request, list, "add");
|
|
|
|
+ }
|
|
|
|
+ }else{
|
|
|
|
+ result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_EMPTY,false,null,0,"error"));
|
|
}
|
|
}
|
|
- }else{
|
|
|
|
- result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_EMPTY,false,null,0,"error"));
|
|
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
@@ -110,17 +127,24 @@ public class DspBannerController extends SimpleController{
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@RequestMapping("/getAll")
|
|
@RequestMapping("/getAll")
|
|
- public @ResponseBody List<DspBanner> getAll(HttpServletRequest request,@RequestParam Map<String,Object> paramMap){
|
|
|
|
- List<DspBanner> result = new ArrayList<DspBanner>();
|
|
|
|
- if(paramMap.get("dspId") != null && !"".equals(paramMap.get("dspId")) &&
|
|
|
|
- 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]));
|
|
|
|
|
|
+ public @ResponseBody List<Map<String,Object>> getAll(HttpServletRequest request,
|
|
|
|
+ HttpServletResponse response,@RequestParam Map<String,Object> paramMap){
|
|
|
|
+ List<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
|
|
|
|
+ /** 跨域问题 ,校验身份 **/
|
|
|
|
+ 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 = dspBannerService.getAll(paramMap);
|
|
|
|
+ }else{
|
|
|
|
+ result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_ADVERTISERID_NOT_EMPTY,false,null,0,"error"));
|
|
}
|
|
}
|
|
- paramMap.put("advertiserIdList", list);
|
|
|
|
- result = dspBannerService.getAll(paramMap);
|
|
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
@@ -133,16 +157,24 @@ public class DspBannerController extends SimpleController{
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@RequestMapping("/get")
|
|
@RequestMapping("/get")
|
|
- public @ResponseBody List<DspBanner> get(HttpServletRequest request,@RequestParam Map<String,Object> paramMap){
|
|
|
|
- List<DspBanner> result = new ArrayList<DspBanner>();
|
|
|
|
- if(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]));
|
|
|
|
|
|
+ public @ResponseBody List<Map<String,Object>> get(HttpServletRequest request,
|
|
|
|
+ HttpServletResponse response,@RequestParam Map<String,Object> paramMap){
|
|
|
|
+ List<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
|
|
|
|
+ /** 跨域问题 ,校验身份 **/
|
|
|
|
+ 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.get(paramMap);
|
|
|
|
+ }else{
|
|
|
|
+ result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_BANNERID_NOT_EMPTY,false,null,0,"error"));
|
|
}
|
|
}
|
|
- paramMap.put("bannerIdList", list);
|
|
|
|
- result = dspBannerService.get(paramMap);
|
|
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
@@ -155,25 +187,33 @@ public class DspBannerController extends SimpleController{
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@RequestMapping("/queryState")
|
|
@RequestMapping("/queryState")
|
|
- public @ResponseBody List<Map<String,Object>> queryState(HttpServletRequest request,@RequestParam Map<String,Object> paramMap){
|
|
|
|
|
|
+ public @ResponseBody List<Map<String,Object>> queryState(HttpServletRequest request,
|
|
|
|
+ HttpServletResponse response,@RequestParam Map<String,Object> paramMap){
|
|
List<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
|
|
List<Map<String,Object>> result = new ArrayList<Map<String,Object>>();
|
|
- if(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", "检查未通过");
|
|
|
|
|
|
+ /** 跨域问题 ,校验身份 **/
|
|
|
|
+ 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", "检查未通过");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+ }else{
|
|
|
|
+ result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_BANNERID_NOT_EMPTY,false,null,0,"error"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
@@ -188,7 +228,7 @@ public class DspBannerController extends SimpleController{
|
|
* @return tab 标识:添加或编辑
|
|
* @return tab 标识:添加或编辑
|
|
*/
|
|
*/
|
|
private Map<String,Object> getDspBannerList(String dspBannerList, List<Map<String,Object>> result,
|
|
private Map<String,Object> getDspBannerList(String dspBannerList, List<Map<String,Object>> result,
|
|
- List<DspBanner> list, Map<String, FieldInfo> fieldInfoMap, String tab){
|
|
|
|
|
|
+ List<DspBanner> list, Map<String, FieldInfo> fieldInfoMap, String tab, Long dspId){
|
|
Map<String,Object> mapObj = new HashMap<String,Object>();
|
|
Map<String,Object> mapObj = new HashMap<String,Object>();
|
|
try {
|
|
try {
|
|
//解析JSONArray
|
|
//解析JSONArray
|
|
@@ -200,10 +240,6 @@ public class DspBannerController extends SimpleController{
|
|
result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_BANNERID_NOT_EMPTY,false,null,(i+1),"error"));
|
|
result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_BANNERID_NOT_EMPTY,false,null,(i+1),"error"));
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- if(!obj.containsKey("dspId")){//没有dspId这下面的代码不需要执行
|
|
|
|
- result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_DSPID_NOT_EMPTY,false,null,(i+1),"error"));
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
if(!obj.containsKey("advertiserId")){//没有advertiserId这下面的代码不需要执行
|
|
if(!obj.containsKey("advertiserId")){//没有advertiserId这下面的代码不需要执行
|
|
result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_ADVERTISERID_NOT_EMPTY,false,null,(i+1),"error"));
|
|
result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_ADVERTISERID_NOT_EMPTY,false,null,(i+1),"error"));
|
|
continue;
|
|
continue;
|
|
@@ -220,12 +256,13 @@ public class DspBannerController extends SimpleController{
|
|
result.add(map);
|
|
result.add(map);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ obj.put("dspId", dspId);
|
|
if(!flag){
|
|
if(!flag){
|
|
Long bannerId = null;
|
|
Long bannerId = null;
|
|
if("edit".equals(tab)){
|
|
if("edit".equals(tab)){
|
|
bannerId = Long.valueOf(obj.get("id").toString());
|
|
bannerId = Long.valueOf(obj.get("id").toString());
|
|
}
|
|
}
|
|
- Long id = this.getDataMaxId(Long.valueOf(obj.get("dspId").toString()), Long.valueOf(obj.get("advertiserId").toString()), bannerId);
|
|
|
|
|
|
+ Long id = this.getDataMaxId(dspId, Long.valueOf(obj.get("advertiserId").toString()), bannerId);
|
|
if(id != null && id != 0){
|
|
if(id != null && id != 0){
|
|
if("add".equals(tab)){
|
|
if("add".equals(tab)){
|
|
result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_ADD_REPEAT,false,null,(i+1),"error"));
|
|
result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_PARAMDATA_ADD_REPEAT,false,null,(i+1),"error"));
|
|
@@ -285,9 +322,9 @@ public class DspBannerController extends SimpleController{
|
|
}
|
|
}
|
|
//下面这几个字段目前后端数据没有得到。所以仅作测试用!
|
|
//下面这几个字段目前后端数据没有得到。所以仅作测试用!
|
|
log.setActionTime("100");
|
|
log.setActionTime("100");
|
|
- log.setAccountId(new Long(getLoginUser().getId()));
|
|
|
|
|
|
+ log.setAccountId(Long.valueOf(obj.get("dspId").toString()));
|
|
log.setUserIp(Common.toIpAddr(request));
|
|
log.setUserIp(Common.toIpAddr(request));
|
|
- log.setAccountName(getLoginUser().getAccountName());
|
|
|
|
|
|
+ log.setAccountName("dsp对接方");
|
|
logService.add(log);
|
|
logService.add(log);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -329,4 +366,27 @@ public class DspBannerController extends SimpleController{
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 解决跨域问题,校验身份
|
|
|
|
+ */
|
|
|
|
+ private List<Map<String,Object>> checkIdentityAndCros(HttpServletResponse response,
|
|
|
|
+ List<Map<String,Object>> result,Map<String,Object> paramMap){
|
|
|
|
+ response.reset();
|
|
|
|
+ response.addHeader("ACCESS_CONTROL_ALLOW_ORIGIN", "*");
|
|
|
|
+ response.addHeader("Content-Type","application/x-www-form-urlencoded;charset=UTF-8");
|
|
|
|
+ if(!paramMap.containsKey("dspId") || paramMap.get("dspId") == null || "".equals(paramMap.get("dspId"))){//没有dspId这下面的代码不需要执行
|
|
|
|
+ result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_DSPID_NOT_EMPTY,false,null,0,"error"));
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ if(!paramMap.containsKey("token") || paramMap.get("token") == null || "".equals(paramMap.get("token"))){//没有dspId这下面的代码不需要执行
|
|
|
|
+ result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_TOKEN_NOT_EMPTY,false,null,0,"error"));
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ Long count = dspAgentService.checkIdentity(paramMap);
|
|
|
|
+ if(count > 0 ){
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ result.add(FieldInfo.getErrorMessage(FieldValidate.CHECK_TOKEN_NOT_CONFORM,false,null,0,"error"));
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
}
|
|
}
|