从投放管理跳转到查看报表出现乱码的解决

Signed-off-by: you.chen <you.chen@cloudcross.com>

src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/report/AdvertiserReportController.java

@@ -1,5 +1,6 @@
  package com.cloudcross.ssp.web.advertiser.main.ad.report;
 
+import java.awt.color.CMMException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
@@ -29,8 +30,12 @@ import com.cloudcross.ssp.common.utils.Pager;
 import com.cloudcross.ssp.model.Account;
 import com.cloudcross.ssp.model.DeliverAnalysis;
 import com.cloudcross.ssp.model.Dimension;
+import com.cloudcross.ssp.service.IAdGroupService;
 import com.cloudcross.ssp.service.IAdReportService;
+import com.cloudcross.ssp.service.IAdvertiserService;
+import com.cloudcross.ssp.service.ICampaignService;
 import com.cloudcross.ssp.service.IDimensionService;
+import com.cloudcross.ssp.service.IOrderService;
 
 
 @Controller
@@ -45,6 +50,14 @@ public class AdvertiserReportController extends SimpleController {
 	private FreemarkerTemplateProcessor templateProcessor;
 	@Autowired
 	private GenericIBatisDao iBatisDao;
+	@Autowired
+	private IAdvertiserService advertiserService;
+	@Autowired
+	private IOrderService orderService;
+	@Autowired
+	private ICampaignService campaignService;
+	@Autowired 
+	private IAdGroupService adGroupService;
 	
 	@RequestMapping
 	public String index(Model model,@RequestParam HashMap<String, Object> paramMap,@RequestParam(defaultValue="1") int page)
@@ -78,7 +91,6 @@ public class AdvertiserReportController extends SimpleController {
 		 * 需要对这些数据进行处理和判断
 		 * @author Hao
 		 */
-		
 		if (null == paramMap.get("selectedadvertiserId")
 				|| "".equals(paramMap.get("selectedadvertiserId"))) {
 			advertiserId = null;
@@ -92,7 +104,7 @@ public class AdvertiserReportController extends SimpleController {
 			} else {
 				advertiserId = Long.parseLong((String) paramMap
 						.get("selectedadvertiserId"));
-				advertiserName = (String)paramMap.get("selectedadvertiserName");
+				advertiserName = advertiserService.findById(advertiserId).getName();
 			}
 		}
 	
@@ -109,7 +121,7 @@ public class AdvertiserReportController extends SimpleController {
 			} else {
 				orderId = Long.parseLong((String) paramMap
 						.get("selectedorderId"));
-				orderName = (String)paramMap.get("selectedorderName");
+				orderName = orderService.findById(orderId).getName();
 			}
 		}
 		
@@ -126,7 +138,7 @@ public class AdvertiserReportController extends SimpleController {
 			} else {
 				campaignId = Long.parseLong((String) paramMap
 						.get("selectedcampaignId"));
-				campaignName = (String)paramMap.get("selectedcampaignName");
+				campaignName = campaignService.findById(campaignId).getName();
 			}
 		}
 		
@@ -143,7 +155,7 @@ public class AdvertiserReportController extends SimpleController {
 			} else {
 				adGroupId = Long.parseLong((String) paramMap
 						.get("selectedadGroupId"));
-				adGroupName = (String)paramMap.get("selectedadGroupName");
+				adGroupName = adGroupService.findById(adGroupId).getAdGroupName();
 			}
 		}		
 					
@@ -400,8 +412,7 @@ public class AdvertiserReportController extends SimpleController {
 				} else {
 					advertiserId = Long.parseLong((String) paramMap
 							.get("selectedadvertiserId"));
-					advertiserName = (String) paramMap
-							.get("selectedadvertiserName");
+					advertiserName = advertiserService.findById(advertiserId).getName();
 				}
 			}
 
@@ -417,7 +428,7 @@ public class AdvertiserReportController extends SimpleController {
 				} else {
 					orderId = Long.parseLong((String) paramMap
 							.get("selectedorderId"));
-					orderName = (String) paramMap.get("selectedorderName");
+					orderName = orderService.findById(orderId).getName();
 				}
 			}
 
@@ -434,7 +445,7 @@ public class AdvertiserReportController extends SimpleController {
 				} else {
 					campaignId = Long.parseLong((String) paramMap
 							.get("selectedcampaignId"));
-					campaignName = (String) paramMap.get("selectedcampaignName");
+					campaignName = campaignService.findById(campaignId).getName();
 				}
 			}
 
@@ -451,7 +462,7 @@ public class AdvertiserReportController extends SimpleController {
 				} else {
 					adGroupId = Long.parseLong((String) paramMap
 							.get("selectedadGroupId"));
-					adGroupName = (String) paramMap.get("selectedadGroupName");
+					adGroupName = adGroupService.findById(adGroupId).getAdGroupName();
 				}
 			}
 
@@ -522,7 +533,7 @@ public class AdvertiserReportController extends SimpleController {
 			} else {
 					advertiserId = Long.parseLong(String.valueOf(paramMap
 							.get("selectedadvertiserId")));
-					advertiserName = (String)paramMap.get("selectedadvertiserName");
+					advertiserName = advertiserService.findById(advertiserId).getName();
 					agentId = null;
 			}
 		
@@ -535,7 +546,7 @@ public class AdvertiserReportController extends SimpleController {
 		} else {
 				orderId = Long.parseLong(String.valueOf(paramMap
 						.get("selectedorderId")));
-				orderName = (String)paramMap.get("selectedorderName");
+				orderName = orderService.findById(orderId).getName();
 		}
 		
 		
@@ -548,7 +559,7 @@ public class AdvertiserReportController extends SimpleController {
 		} else {
 			campaignId = Long.parseLong(String.valueOf(paramMap
 					.get("selectedcampaignId")));
-			campaignName = (String) paramMap.get("selectedcampaignId");
+			campaignName = campaignService.findById(campaignId).getName();
 		}
 		
 		
@@ -563,7 +574,7 @@ public class AdvertiserReportController extends SimpleController {
 		} else {
 			adGroupId = Long.parseLong(String.valueOf(paramMap
 					.get("selectedadGroupId")));
-			adGroupName = (String) paramMap.get("selectedadGroupId");
+			adGroupName = adGroupService.findById(adGroupId).getAdGroupName();
 		}
 					
 		//判断日期是否为默认值昨天，日期格式与上面相统一，用 to 分割
@@ -646,7 +657,7 @@ public class AdvertiserReportController extends SimpleController {
 						} else {
 							advertiserId = Long.parseLong((String) paramMap
 									.get("selectedadvertiserId"));
-							advertiserName = (String)paramMap.get("selectedadvertiserName");
+							advertiserName = advertiserService.findById(advertiserId).getName();
 						}
 					}
 				
@@ -663,7 +674,7 @@ public class AdvertiserReportController extends SimpleController {
 					} else {
 						orderId = Long.parseLong((String) paramMap
 								.get("selectedorderId"));
-						orderName = (String)paramMap.get("selectedorderName");
+						orderName = orderService.findById(orderId).getName();
 					}
 				}
 				
@@ -680,7 +691,7 @@ public class AdvertiserReportController extends SimpleController {
 					} else {
 						campaignId = Long.parseLong((String) paramMap
 								.get("selectedcampaignId"));
-						campaignName = (String)paramMap.get("selectedcampaignName");
+						campaignName = campaignService.findById(campaignId).getName();
 					}
 				}
 				
@@ -697,7 +708,7 @@ public class AdvertiserReportController extends SimpleController {
 					} else {
 						adGroupId = Long.parseLong((String) paramMap
 								.get("selectedadGroupId"));
-						adGroupName = (String)paramMap.get("selectedadGroupName");
+						adGroupName = adGroupService.findById(adGroupId).getAdGroupName();
 					}
 				}		
 							
@@ -728,7 +739,6 @@ public class AdvertiserReportController extends SimpleController {
 		 * 搜索查询对应的数据
 		 */
 				int totalRow = adReportService.findCountForOs(paramMap);
-				System.out.println("aaaareport"+totalRow);
 				Pager pager = new Pager();
 				pager.setPage(page);
 				pager.setTotalRow(totalRow);
@@ -765,7 +775,6 @@ public class AdvertiserReportController extends SimpleController {
 				map.put("visitRatesum", reportList.get(0).getVisitRatesum());
 				map.put("conversionRatesum", reportList.get(0).getConversionRatesum());
 				model.addAttribute("reportMap", map);
-				System.out.println("tttttttttt");
 				}
 				
 				model.addAllAttributes(paramMap);
@@ -775,7 +784,6 @@ public class AdvertiserReportController extends SimpleController {
 	}
 	
 	//下面是场景报表
-
 	@RequestMapping("/sceneReport")
 	public String sceneReport(Model model,
 			@RequestParam HashMap<String, Object> paramMap,
@@ -816,7 +824,7 @@ public class AdvertiserReportController extends SimpleController {
 						} else {
 							advertiserId = Long.parseLong((String) paramMap
 									.get("selectedadvertiserId"));
-							advertiserName = (String)paramMap.get("selectedadvertiserName");
+							advertiserName = advertiserService.findById(advertiserId).getName();
 						}
 					}
 				
@@ -833,7 +841,7 @@ public class AdvertiserReportController extends SimpleController {
 					} else {
 						orderId = Long.parseLong((String) paramMap
 								.get("selectedorderId"));
-						orderName = (String)paramMap.get("selectedorderName");
+						orderName = orderService.findById(orderId).getName();
 					}
 				}
 				
@@ -850,7 +858,7 @@ public class AdvertiserReportController extends SimpleController {
 					} else {
 						campaignId = Long.parseLong((String) paramMap
 								.get("selectedcampaignId"));
-						campaignName = (String)paramMap.get("selectedcampaignName");
+						campaignName = campaignService.findById(campaignId).getName();
 					}
 				}
 				
@@ -867,7 +875,7 @@ public class AdvertiserReportController extends SimpleController {
 					} else {
 						adGroupId = Long.parseLong((String) paramMap
 								.get("selectedadGroupId"));
-						adGroupName = (String)paramMap.get("selectedadGroupName");
+						adGroupName = adGroupService.findById(adGroupId).getAdGroupName();
 					}
 				}		
 							
@@ -969,11 +977,7 @@ public class AdvertiserReportController extends SimpleController {
 				} else {
 					advertiserId = Long.parseLong((String) paramMap
 							.get("selectedadvertiserId"));
-					try {
-						advertiserName = new String(((String) paramMap.get("selectedadvertiserName")).getBytes("ISO-8859-1"),"UTF-8");
-					} catch (UnsupportedEncodingException e) {
-						e.printStackTrace();
-					}
+					advertiserName = advertiserService.findById(advertiserId).getName();
 				}
 			}
 		
@@ -988,11 +992,7 @@ public class AdvertiserReportController extends SimpleController {
 			} else {
 				orderId = Long.parseLong((String) paramMap
 						.get("selectedorderId"));
-				try {
-					orderName = new String(((String) paramMap.get("selectedorderName")).getBytes("ISO-8859-1"),"UTF-8");
-				} catch (UnsupportedEncodingException e) {
-					e.printStackTrace();
-				}
+				orderName = orderService.findById(orderId).getName();
 			}
 		}
 		
@@ -1007,11 +1007,7 @@ public class AdvertiserReportController extends SimpleController {
 			} else {
 				campaignId = Long.parseLong((String) paramMap
 						.get("selectedcampaignId"));
-				try {
-					campaignName = new String(((String) paramMap.get("selectedcampaignName")).getBytes("ISO-8859-1"),"UTF-8");
-				} catch (UnsupportedEncodingException e) {
-					e.printStackTrace();
-				}
+				campaignName = campaignService.findById(campaignId).getName();
 			}
 		}
 		
@@ -1026,11 +1022,7 @@ public class AdvertiserReportController extends SimpleController {
 			} else {
 				adGroupId = Long.parseLong((String) paramMap
 						.get("selectedadGroupId"));
-				try {
-					adGroupName = new String(((String) paramMap.get("selectedadGroupName")).getBytes("ISO-8859-1"),"UTF-8");
-				} catch (UnsupportedEncodingException e) {
-					e.printStackTrace();
-				}
+				adGroupName = adGroupService.findById(adGroupId).getAdGroupName();
 			}
 		}		
 					
@@ -1213,11 +1205,7 @@ public class AdvertiserReportController extends SimpleController {
 		} else {
 			advertiserId = Long.parseLong(String.valueOf(paramMap
 					.get("selectedadvertiserId")));
-			try {
-				advertiserName = new String(((String) paramMap.get("selectedadvertiserName")).getBytes("ISO-8859-1"),"UTF-8");
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
+			advertiserName = advertiserService.findById(advertiserId).getName();
 			agentId = null;
 		}
 
@@ -1230,11 +1218,7 @@ public class AdvertiserReportController extends SimpleController {
 		} else {
 			orderId = Long.parseLong(String.valueOf(paramMap
 					.get("selectedorderId")));
-			try {
-				orderName = new String(((String) paramMap.get("selectedorderName")).getBytes("ISO-8859-1"),"UTF-8");
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
+			orderName = orderService.findById(orderId).getName();
 		}
 
 		// 对传递过来的活动id的处理
@@ -1247,11 +1231,7 @@ public class AdvertiserReportController extends SimpleController {
 		} else {
 			campaignId = Long.parseLong(String.valueOf(paramMap
 					.get("selectedcampaignId")));
-			try {
-				campaignName = new String(((String) paramMap.get("selectedcampaignName")).getBytes("ISO-8859-1"),"UTF-8");
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
+			campaignName = campaignService.findById(campaignId).getName();
 		}
 
 		// 对传递过来的投放id的处理
@@ -1263,11 +1243,7 @@ public class AdvertiserReportController extends SimpleController {
 		} else {
 			adGroupId = Long.parseLong(String.valueOf(paramMap
 					.get("selectedadGroupId")));
-			try {
-				adGroupName = new String(((String) paramMap.get("selectedadGroupName")).getBytes("ISO-8859-1"),"UTF-8");
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
+			adGroupName = adGroupService.findById(adGroupId).getAdGroupName();
 		}
 
 		// 判断日期是否为默认值昨天，日期格式与上面相统一，用 to 分割
@@ -1314,7 +1290,6 @@ public class AdvertiserReportController extends SimpleController {
 		 */
 		if(paramMap.containsKey("location")) {
 			paramMap.put("location", "location");
-			System.out.println("chenyou:paramMap" + paramMap);
 			reportList = adReportService.findByLocation(paramMap);
 		}
 		if(paramMap.containsKey("system")) {

src/main/java/com/cloudcross/ssp/web/advertiser/main/finance/FinanceDataController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.cloudcross.ssp.model.Account;
 import com.cloudcross.ssp.model.Finance;
 import com.cloudcross.ssp.service.IAdvBalanceService;
+import com.cloudcross.ssp.service.IAdvertiserService;
 import com.cloudcross.ssp.service.IFinanceService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
@@ -40,6 +41,8 @@ public class FinanceDataController extends SimpleController {
     
 	@Autowired
 	private FreemarkerTemplateProcessor templateProcessor;
+	@Autowired
+	private IAdvertiserService advertiserService;
     
    
     @RequestMapping
@@ -222,7 +225,7 @@ public class FinanceDataController extends SimpleController {
 				} else {
 					advertiserId = Long.parseLong((String) paramMap
 							.get("selectedAdvertiserId"));
-					advertiserName = advBalanceService.findById(advertiserId).getAdvertiserName();
+					advertiserName = advertiserService.findById(advertiserId).getName();
 				}
 			}