控制器整合

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

src/main/java/com/cloudcross/ssp/service/impl/AdReportService.java

@@ -563,7 +563,7 @@ public class AdReportService implements IAdReportService {
 	@Override
 	public List<DeliverAnalysis> findByTotalForExcelBack(
 			Map<String, Object> paramMap) {
-		return iBatisDao.getList("back.adReportSqlMapper.findByTotalForExcelBack", paramMap);
+		return iBatisDao.getList("adReportSqlMapper.findByTotalForExcelBack", paramMap);
 	}
 
 	@Override

src/main/java/com/cloudcross/ssp/web/back/main/ad/MessageController.java

@@ -10,12 +10,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.back.model.Message;
-import com.cloudcross.ssp.back.model.MessageRead;
-import com.cloudcross.ssp.back.service.IMessageReadService;
-import com.cloudcross.ssp.back.service.IMessageService;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.model.Message;
+import com.cloudcross.ssp.model.MessageRead;
+import com.cloudcross.ssp.service.IMessageReadService;
+import com.cloudcross.ssp.service.IMessageService;
 
 @Controller("back.messageController")
 @RequestMapping("/back/main/ad/message")

src/main/java/com/cloudcross/ssp/web/back/main/ad/operator/OperatorReportController.java

@@ -19,15 +19,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.back.model.OperatorReport;
-import com.cloudcross.ssp.back.model.RptZoneHour;
-import com.cloudcross.ssp.back.service.IOperatorReportService;
-import com.cloudcross.ssp.back.service.IOperatorService;
-import com.cloudcross.ssp.back.service.IRptZoneHourService;
-import com.cloudcross.ssp.back.service.IZoneService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.model.OperatorReport;
+import com.cloudcross.ssp.model.RptZoneHour;
+import com.cloudcross.ssp.service.IOperatorReportService;
+import com.cloudcross.ssp.service.IOperatorService;
+import com.cloudcross.ssp.service.IRptZoneHourService;
+import com.cloudcross.ssp.service.IZoneService;
 
 /**
  * 统计报表页面。

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

@@ -21,14 +21,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.back.model.Account;
-import com.cloudcross.ssp.back.model.DeliverAnalysis;
-import com.cloudcross.ssp.back.model.Dimension;
-import com.cloudcross.ssp.back.service.IAdReportService;
-import com.cloudcross.ssp.back.service.IDimensionService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 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.IAdReportService;
+import com.cloudcross.ssp.service.IDimensionService;
 
 /**
  * 统计报表页面。
@@ -195,13 +195,13 @@ public class AdvertiserReportController extends SimpleController {
 		paramMap.put("dimensionId",  dimensionId);
 		paramMap.put("selecteddimensionName",  dimensionName);
 		
-		int totalRow = adReportService.findCountForDeliverEffectAnalysis(paramMap);
+		int totalRow = adReportService.findCountForDeliverEffectAnalysisBack(paramMap);
 		
 		Pager pager = new Pager();
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
 		
-		List<DeliverAnalysis> reportList = adReportService.findByTotalReport(paramMap, pager);
+		List<DeliverAnalysis> reportList = adReportService.findByTotalReportBack(paramMap, pager);
 		
 		
 		
@@ -267,7 +267,7 @@ public class AdvertiserReportController extends SimpleController {
 		
 		//维度更新表格
 		if(dimensionId == null){
-			HashMap<String,Object> dimensionmap = dimensionService.selectDimensionIdBydefault();
+			HashMap<String,Object> dimensionmap =null; //dimensionService.selectDimensionIdBydefault();
 			if(Integer.parseInt(dimensionmap.get("num").toString()) == 0){
 				model.addAttribute("dimensionLength",null);
 				model.addAttribute("dimensionTarget",null);
@@ -524,15 +524,13 @@ public class AdvertiserReportController extends SimpleController {
 		/**
 		 * 下面是对应的查询语句，逻辑很重要
 		 */
-		int totalRow = adReportService.findCountForLocation(paramMap);
-		System.out.println("aaaareport"+totalRow);
+		int totalRow = adReportService.findCountForLocationBack(paramMap);
 		Pager pager = new Pager();
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
 				
-		List<DeliverAnalysis> reportList = adReportService.findByLocation(paramMap, pager);
+		List<DeliverAnalysis> reportList = adReportService.findByLocationBack(paramMap, pager);
 			
-		System.out.println("aaaareport"+reportList);
 		model.addAllAttributes(paramMap);
 		model.addAttribute("pager", pager);
 		model.addAttribute("reportList", reportList);
@@ -1001,7 +999,7 @@ public class AdvertiserReportController extends SimpleController {
 		paramMap.put("endDate",  endDate);
 		
 		
-		List<DeliverAnalysis> reportList = adReportService.findByTotalReport(paramMap);
+		List<DeliverAnalysis> reportList = adReportService.findByTotalForExcelBack(paramMap);
 		
 		if(reportList.size() == 0){
 //			List sumList = reportList.get(0).get
@@ -1302,7 +1300,7 @@ public class AdvertiserReportController extends SimpleController {
 	//修改默认值
 	@RequestMapping("/updateDimensionDefault")
 	public @ResponseBody String updateDimensionDefault(@RequestParam long dimensionId){
-		dimensionService.updateDimensionDefault(dimensionId);
+		//dimensionService.updateDimensionDefault(dimensionId);
 		return OK;
 	}
 	

src/main/java/com/cloudcross/ssp/web/back/main/ad/report/SystemReportController.java

@@ -9,10 +9,10 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.cloudcross.ssp.back.model.SystemReport;
-import com.cloudcross.ssp.back.service.ISystemReportService;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.model.SystemReport;
+import com.cloudcross.ssp.service.ISystemReportService;
 
 /**
  * 媒体数据报表中系统报表控制
@@ -37,17 +37,13 @@ public class SystemReportController extends SimpleController{
 			
 		       paramMap.put("operatorId", operatorId);
 		       model.addAttribute("operatorId",operatorId);
-		       System.out.println("operatorId" + operatorId + "aaaaaaaaaaaaaaaa");
-			
 			
 			int totalRow = systemReportService.countByParams(paramMap);
-			System.out.println("totalRow" + totalRow + "111111111111111");
 			Pager pager = new Pager();
 			pager.setPage(page);
 			pager.setTotalRow(totalRow);
 			
 			List<SystemReport> reportList = systemReportService.findByParams(paramMap, pager);
-			System.out.println("reportList" + reportList + "22222222222222");
 			
 			model.addAllAttributes(paramMap);
 			model.addAttribute("pager",pager);

src/main/java/com/cloudcross/ssp/web/back/main/ad/report/TypeReportController.java

@@ -9,10 +9,10 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.cloudcross.ssp.back.model.TypeReport;
-import com.cloudcross.ssp.back.service.ITypeReportService;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.model.TypeReport;
+import com.cloudcross.ssp.service.ITypeReportService;
 
 
 
@@ -37,17 +37,14 @@ public class TypeReportController extends SimpleController{
 		
 	       paramMap.put("operatorId", operatorId);
 	       model.addAttribute("operatorId",operatorId);
-	       System.out.println("operatorId" + operatorId + "aaaaaaaaaaaaaaaa");
 		
 		
 		int totalRow = typeReportService.countByParams(paramMap);
-		System.out.println("totalRow" + totalRow + "111111111111111");
 		Pager pager = new Pager();
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
 		
 		List<TypeReport> reportList = typeReportService.findByParams(paramMap, pager);
-		System.out.println("reportList" + reportList + "22222222222222");
 		
 		model.addAllAttributes(paramMap);
 		model.addAttribute("pager",pager);