Merge branch 'master' of gitlab.cloudcross.net:ssp/ssp_web

.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
 encoding//src/main/webapp/assets/back/css/public-head.css=UTF-8
+encoding/<project>=UTF-8

src/main/java/com/cloudcross/ssp/model/mapper/audit.sql.xml

@@ -25,7 +25,7 @@
 	
 	
 			
-	<select id="selectByParamsback"  parameterType="map" resultType="com.cloudcross.ssp.model.Audit">
+	<select id="selectByParamsBack"  parameterType="map" resultType="com.cloudcross.ssp.model.Audit">
 		select 
 		<include refid="base_column" />
 		,t_adv_agent.name as agentName,t_industry.name as industryName
@@ -81,7 +81,7 @@
 	
 	
 	
-	<select id="countByParamsback" parameterType="map" resultType="int">
+	<select id="countByParamsBack" parameterType="map" resultType="int">
 		select count(a.id)
 		from t_advertiser a,t_adv_agent b 
 		where b.id=a.agent_id 
@@ -138,7 +138,7 @@ from t_advertiser a,t_adv_agent b
 		limit #{pager.offset}, #{pager.limit}
 	</select>
  -->
-	<select id="selectByIdback" parameterType="int" resultType="com.cloudcross.ssp.model.Audit">
+	<select id="selectByIdBack" parameterType="int" resultType="com.cloudcross.ssp.model.Audit">
 		select 
 		<include refid="base_column" />
 		

src/main/java/com/cloudcross/ssp/model/mapper/banner.sql.xml

@@ -48,7 +48,7 @@
     <result property="supdated" column="supdated"/> 
     <association property="bannerTemplate" javaType="com.cloudcross.ssp.model.BannerTemplate" resultMap="bannerTemplate"/>
 </resultMap>  
-<resultMap type="com.cloudcross.ssp.model.BannerTemplate" id="BannerTemplate">  
+<resultMap type="com.cloudcross.ssp.model.BannerTemplate" id="bannerTemplate">  
    <id property="id" column="bannerTemplateId"/>  
    <result property="advertiserId" column="advertiserId"/>
    <result property="agentId" column="agentId"/>  

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

@@ -378,7 +378,7 @@ public class AdReportService implements IAdReportService {
 
 	@Override
 	public List<DeliverAnalysis> findByTotalForExcelAdvertiser(Map<String, Object> paramMap) {
-		return iBatisDao.getList("advertiser.adReportSqlMapper.findByTotalForExcelAdvertiser", paramMap);
+		return iBatisDao.getList("adReportSqlMapper.findByTotalForExcelAdvertiser", paramMap);
 	}
 
 	@Override
@@ -541,7 +541,7 @@ public class AdReportService implements IAdReportService {
 
 	@Override
 	public int findCountForLocationBack(Map<String, Object> paramMap) {
-		return iBatisDao.get("back.adReportSqlMapper.findCountForLocationBack", paramMap);
+		return iBatisDao.get("adReportSqlMapper.findCountForLocationBack", paramMap);
 	}
 
 	@Override

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

@@ -26,7 +26,7 @@ public class AuditService implements IAuditService{
 
 	@Override
 	public Audit findById(Long id) {
-		return myBatisDao.get("auditSqlMapper.selectById", id);
+		return myBatisDao.get("auditSqlMapper.selectByIdBack", id);
 	}
 
 	@Override
@@ -34,7 +34,7 @@ public class AuditService implements IAuditService{
 		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
 		paramMap.put("key", paramMap.get("searchKey"));
 		paramMap.put("value", searchValue);
-		return myBatisDao.get("auditSqlMapper.countByParams", paramMap);
+		return myBatisDao.get("auditSqlMapper.countByParamsBack", paramMap);
 	}
 
 	@Override
@@ -44,7 +44,7 @@ public class AuditService implements IAuditService{
 		paramMap.put("key", paramMap.get("searchKey"));
 		paramMap.put("value", searchValue);
 		paramMap.put("pager", pager);
-		return myBatisDao.getList("auditSqlMapper.selectByParams", paramMap);
+		return myBatisDao.getList("auditSqlMapper.selectByParamsBack", paramMap);
 	}
 
 	@Override

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

@@ -1398,12 +1398,7 @@ public class AdvertiserReportController extends SimpleController {
 			return list;
 		}
 		
-		
-		
-		
-		
-		
-		
+
 		public String getDimensionType(String dimension){
 			String type = "";
 			if(dimension.equals("广告主")){

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

@@ -1030,7 +1030,7 @@ public class OperatorReportController extends SimpleController {
 		paramMap.put("dataSize", reportList.size());
 		paramMap.put("column", column);
 		String excelTemplate = templateProcessor.processTemplate(
-				"excel/dataReport.ftl", paramMap);
+				"excel/dataReportBack.ftl", paramMap);
 		try {
 			PrintWriter out = response.getWriter();
 			out.write(excelTemplate);

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

@@ -322,27 +322,6 @@ public class AdvertiserReportController extends SimpleController {
 		model.addAttribute("reportList", reportList);
 		return index;
 	}
-    //维度管理	
-	@RequestMapping("/dimension")
-	public String dimension(Model model,
-			@RequestParam HashMap<String, Object> paramMap,
-			@RequestParam(defaultValue="1") int page) {
-		
-		int totalRow = dimensionService.countByParams(paramMap);
-		System.out.println("bbbdimension"+totalRow);
-		Pager pager = new Pager();
-		pager.setPage(page);
-		pager.setTotalRow(totalRow);
-		
-		List<Dimension> dimensionList = dimensionService.findByParams(paramMap, pager);
-	
-		System.out.println("bbbdimension"+dimensionList);
-		model.addAllAttributes(paramMap);
-		model.addAttribute("pager", pager);
-		model.addAttribute("dimensionList", dimensionList);
-
-		return page("dimension");
-	}
 	//下面是地域报表
 
 	@RequestMapping("/regionReport")
@@ -939,52 +918,66 @@ public class AdvertiserReportController extends SimpleController {
 		paramMap.put("startDate",  startDate);
 		paramMap.put("endDate",  endDate);
 		
-		
-		List<DeliverAnalysis> reportList = adReportService.findByTotalForExcelBack(paramMap);
-		
-		if(reportList.size() == 0){
-//			List sumList = reportList.get(0).get
-			paramMap.put("impressionSum", 0);
-			paramMap.put("clickSum", 0);
-			paramMap.put("visitSum", 0);
-			paramMap.put("conversionSum", 0);
-			paramMap.put("consumeSum", 0);
-			paramMap.put("eCmpSum", 0);
-			paramMap.put("clickRatesum", 0);
-			paramMap.put("visitRatesum", 0);
-			paramMap.put("conversionRatesum", 0);
-		}
-		else {
-		//数据报表中第一栏 全部  的显示
-			paramMap.put("impressionSum", reportList.get(0).getImpressionSum());
-			paramMap.put("clickSum", reportList.get(0).getClickSum());
-			paramMap.put("visitSum", reportList.get(0).getVisitSum());
-			paramMap.put("conversionSum", reportList.get(0).getConversionSum());
-			paramMap.put("consumeSum", reportList.get(0).getConsumeSum());
-			paramMap.put("eCmpSum", reportList.get(0).geteCmpSum());
-			paramMap.put("clickRatesum", reportList.get(0).getClickRatesum());
-			paramMap.put("visitRatesum", reportList.get(0).getVisitRatesum());
-			paramMap.put("conversionRatesum", reportList.get(0).getConversionRatesum());
-		}
 		//维度数据匹配导出
-		
-		
-		
-		
-		
-		List<HashMap<String,Object>> dimensionlist = new ArrayList<HashMap<String,Object>>();
-		if(dimensionId != null && !"".equals(dimensionId)){
-			dimensionlist = getDimensionById(dimensionId);
-			if(dimensionlist.size() >0 ){
-				String content = "";
-				for (int i = 0; i < dimensionlist.size(); i++) {
-					content += dimensionlist.get(i).get("dimension")+"-";
+				List<HashMap<String,Object>> dimensionlist = new ArrayList<HashMap<String,Object>>();
+				if(dimensionId != null && !"".equals(dimensionId)){
+					dimensionlist = getDimensionById(dimensionId);
+					if(dimensionlist.size() >0 ){
+						String content = "";
+						for (int i = 0; i < dimensionlist.size(); i++) {
+							content += dimensionlist.get(i).get("dimension")+"-";
+						}
+						content = content.substring(0,content.length()-1);
+						paramMap.put("dimension",content);
+						paramMap.put("dimensionTargetlist",dimensionlist);
+						paramMap.put("dimensionStr", dimensionlist.get(dimensionlist.size()-1).get("dimensionStr"));
+					}
+				}
+				
+				List<DeliverAnalysis> reportList = adReportService.findByTotalForExcelAdvertiser(paramMap);
+				if(reportList.size() == 0){
+					paramMap.put("impression", 0);
+					paramMap.put("click", 0);
+					paramMap.put("visit", 0);
+					paramMap.put("conversion", 0);
+					paramMap.put("consume", 0);
+					paramMap.put("eCmp", 0);
+					paramMap.put("clickRate", 0);
+					paramMap.put("visitRate", 0);
+					paramMap.put("conversionRate", 0);
+				}else {
+					double impressionSum = 0;
+					double clickSum = 0;
+					double visitSum = 0;
+					double conversionSum = 0;
+					double consumeSum = 0;
+					double eCmpSum = 0;
+					double clickRatesum = 0;
+					double visitRatesum = 0;
+					double conversionRatesum = 0;
+					for(DeliverAnalysis d :reportList){
+						impressionSum = impressionSum+d.getImpression();
+						clickSum = clickSum + d.getClick();
+						visitSum = visitSum + d.getVisit();
+						conversionSum = conversionSum + d.getConversion();
+						consumeSum = consumeSum + d.getConsume();
+						eCmpSum = eCmpSum + d.geteCmp();
+						
+					}
+					clickRatesum = 100*clickSum/impressionSum;
+					visitRatesum = 100*visitSum/clickSum;
+					conversionRatesum = 100*conversionSum/visitSum;
+				//数据报表中第一栏 全部  的显示
+					paramMap.put("impressionSum",impressionSum);
+					paramMap.put("clickSum",clickSum);
+					paramMap.put("visitSum",visitSum);
+					paramMap.put("conversionSum",conversionSum);
+					paramMap.put("consumeSum",consumeSum);
+					paramMap.put("eCmpSum",eCmpSum);
+					paramMap.put("clickRatesum",clickRatesum);
+					paramMap.put("visitRatesum",visitRatesum);
+					paramMap.put("conversionRatesum",conversionRatesum);
 				}
-				content = content.substring(0,content.length()-1);
-				paramMap.put("dimension",content);
-				paramMap.put("dimensionTargetlist",dimensionlist);
-			}
-		}
 		
 		//显示的列
 		paramMap.put("impression", null);//曝光

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

@@ -706,7 +706,7 @@ public class AdvertiserReportController extends SimpleController {
 			paramMap.put("zoneName", "全部");
 		}
 		String excelTemplate = templateProcessor.processTemplate(
-				"excel/dataReport.ftl", paramMap);
+				"excel/dataReportOperator.ftl", paramMap);
 		try {
 			PrintWriter out = response.getWriter();
 			out.write(excelTemplate);
@@ -835,7 +835,7 @@ public class AdvertiserReportController extends SimpleController {
 		paramMap.put("endDate", paramMap.get("endDate"));
 
 		String excelTemplate = templateProcessor.processTemplate(
-				"excel/otherReport.ftl", paramMap);
+				"excel/otherReportOperator.ftl", paramMap);
 		try {
 			PrintWriter out = response.getWriter();
 			out.write(excelTemplate);

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/create.ftl

@@ -11,6 +11,7 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
 	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
@@ -543,19 +544,19 @@ var datefalg = true;
 			<label class="control-label">点击找回：</label>
 			<div class="controls">
 				<div class="form-align-radio">
-					<input class= "i" autocomplete="off" style="margin-left:153px;margin-top:0px;" name="retarget" type="radio" value="1"><div style="margin-left:135px;margin-top:-29px;" id="singleclick"  class="lbl"> 未设置</div>
+					<input class= "i" autocomplete="off" style="margin-left:153px;margin-top:0px;" name="retarget" type="radio" value="1"><div style="margin-left:117px;margin-top:-29px;" id="singleclick"  class="lbl"> 未设置</div>
 				</div>
 				<div class="form-align-radio">
-					<input class= "i" autocomplete="off" style="margin-left:135px;margin-top:0px;"  name="retarget" type="radio" value="2"><div style="margin-left:225px;margin-top:-29px;" id="singleclick"  class="lbl"> 点击过本广告主广告</div>
+					<input class= "i" autocomplete="off" style="margin-left:135px;margin-top:0px;"  name="retarget" type="radio" value="2"><div style="margin-left:214px;margin-top:-29px;" id="singleclick"  class="lbl"> 点击过本广告主广告</div>
 				</div>
 				<div class="form-align-radio">
-					<input class= "i" autocomplete="off" style="margin-left:212px;margin-top:0px;"  name="retarget" type="radio" value="3"><div  style="margin-left:395px;margin-top:-29px;" id="singleclick"  class="lbl"> 点击过广告</div>
+					<input class= "i" autocomplete="off" style="margin-left:212px;margin-top:0px;"  name="retarget" type="radio" value="3"><div  style="margin-left:431px;margin-top:-29px;" id="singleclick"  class="lbl"> 点击过广告</div>
 				</div>
 				<div class="form-align-radio">
-					<input class= "i" autocomplete="off" style="margin-left:161px;margin-top:0px;"  name="retarget" type="radio" value="4"><div style="margin-left:510px;margin-top:-29px;" id="singleclick"  class="lbl"> 点击过本订单广告</div>
+					<input class= "i" autocomplete="off" style="margin-left:161px;margin-top:0px;"  name="retarget" type="radio" value="4"><div style="margin-left:558px;margin-top:-29px;" id="singleclick"  class="lbl"> 点击过本订单广告</div>
 				</div>
 				<div class="form-align-radio">
-					<input class= "i" autocomplete="off" style="margin-left:200px;margin-top:0px;"  name="retarget" type="radio" value="5"><div style="margin-left:667px;margin-top:-29px;" id="singleclick"  class="lbl"> 点击过本活动广告</div>
+					<input class= "i" autocomplete="off" style="margin-left:200px;margin-top:0px;"  name="retarget" type="radio" value="5"><div style="margin-left:710px;margin-top:-50px;" id="singleclick"  class="lbl"> 点击过本活动广告</div>
 				</div>
 			</div>
 		</div>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/edit.ftl

@@ -11,6 +11,7 @@
 <link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>	
 <link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
+<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser1.css"/>
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/ad-group/list.ftl

@@ -7,6 +7,7 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/create.ftl

@@ -7,6 +7,7 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/edit.ftl

@@ -7,6 +7,7 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/zbchj.css"/>
 	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/advertiser/js/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/WEB-INF/pages/advertiser/main/ad/target/campaign/list.ftl

@@ -7,6 +7,7 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css">
 	<link rel="stylesheet" href="${ctx}/assets/css/banner-template-list.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/newforadvertiser.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

src/main/webapp/assets/css/newforadvertiser.css

@@ -0,0 +1,82 @@
+@CHARSET "UTF-8";
+
+
+*{
+	font-size:14px;
+}
+
+.all {
+    margin-left: 40px;
+    margin-top: 30px;
+
+}
+.all .shuru1{
+    margin-left: 0px;
+}
+.all .shuru2{
+    margin-left: 14px;
+}
+.all .line2 .help-inline{
+    margin-left: -300px;
+}
+.all .line3 .help-inline{
+    margin-left: -300px;
+}
+#class3 #zhuangtai .zhuangtaichoose{
+	float:left;
+    margin-top: 14px !important;
+    margin-left: 18px !important;
+    margin-bottom: 35px !important;
+}
+.control-group div input[type="text"]{
+	margin-left: 115px !important;
+    margin-top: -55px !important;
+}
+.control-group .inputtext #form-field-1{
+	margin-left: 39px !important;
+    margin-top: 1px !important;
+}
+.control-group .controls4 input[type="text"]{
+	margin-left: 100px !important;
+  //  margin-top: -55px !important;
+}
+.control-group .controls3 input[type="text"]{
+	margin-left: 85px !important;
+  //  margin-top: -55px !important;
+}
+.control-group .inputtext input[type="text"]{
+	margin-left: 116px !important;
+  //  margin-top: -55px !important;
+}
+
+.control-group .inputtext #form-field-2{
+	margin-left: 51px !important;
+    margin-top: -20px !important;
+}
+.control-group .row-fluid  #id-date-picker-1{
+	margin-left: 116px !important;
+    margin-top: -36px !important;
+}
+#totalBudget_span{
+	 margin: -13px 0 0 5px !important;
+}
+.control-group .controls #form-field-11{
+	 margin-left: -12px !important;
+     margin-top: -47px !important;
+}
+.control-group .controls #form-field-12{
+	 margin-left: -12px !important;
+     margin-top: -47px !important;
+}
+.form-align-radio .i{
+	 margin-left: 210px !important;
+     margin-top: 6px !important;
+}
+.dashed #btn-areas { 
+	margin-left: 116px !important;
+    margin-top: -45px !important;
+    }
+    .form-align-radio  #i1{
+     margin-left: 174px !important;
+     margin-top: -72px !important;
+    }

src/main/webapp/assets/css/newforadvertiser1.css

@@ -0,0 +1,101 @@
+@CHARSET "UTF-8";
+
+
+*{
+	font-size:14px;
+}
+
+.all {
+    margin-left: 40px;
+    margin-top: 30px;
+
+}
+.all .shuru1{
+    margin-left: 0px;
+}
+.all .shuru2{
+    margin-left: 14px;
+}
+.all .line2 .help-inline{
+    margin-left: -300px;
+}
+.all .line3 .help-inline{
+    margin-left: -300px;
+}
+#class3 #zhuangtai .zhuangtaichoose{
+	float:left;
+    margin-top: 14px !important;
+    margin-left: 18px !important;
+    margin-bottom: 35px !important;
+}
+						//	.control-group div input[type="text"]{
+						//		 margin-left: -248px !important;
+						//	    margin-top: 0 !important;
+						//	}
+.control-group .inputtext #form-field-1{
+	margin-left: 39px !important;
+    margin-top: 1px !important;
+}
+.control-group .controls4 input[type="text"]{
+	margin-left: -64px !important;
+  //  margin-top: -55px !important;
+}
+.control-group .controls3 input[type="text"]{
+	margin-left: -79px !important;
+  //  margin-top: -55px !important;
+}
+.control-group .inputtext input[type="text"]{
+	margin-left: 116px !important;
+  //  margin-top: -55px !important;
+}
+
+.control-group .controls1 #form-field-2{
+	 margin-left: -88px !important;
+     margin-top: -4px !important;
+}
+.control-group .row-fluid  #id-date-picker-1{
+	margin-left: -50px !important;
+    margin-top: -36px !important;
+}
+#totalBudget_span{
+	 margin: 5px 0 0 5px !important;
+}
+.control-group .controls #form-field-11{
+	 margin-left: -172px !important;
+    margin-top: -3px !important;
+}
+.control-group .controls #form-field-12{
+	 margin-left: -172px !important;
+    margin-top: -2px !important;
+}
+.form-align-radio .i{
+	 margin-left: 110px !important;
+     margin-top: 6px !important;
+}
+.dashed #btn-areas { 
+	margin-left: -58px !important;
+    margin-top: 0px !important;
+    }
+    .form-align-radio  #i1{
+     margin-left: 174px !important;
+     margin-top: -72px !important;
+    }
+    .controls2 #form-field-3{
+    margin-left: -60px !important;
+    }
+       .controls5 input[type="text"]{
+    margin-left: -50px !important;
+    }
+#form-field-1{
+	margin-left: -231px !important;
+	
+}
+.controls-reset #form-field-11 {
+	 margin-left: -49px !important;
+}
+.controls-reset #form-field-12 {
+	 margin-left: -49px !important;
+}
+.controls7 #form-field-13 {
+	 margin-left: -49px !important;
+}

src/main/webapp/assets/css/newforwebback.css

@@ -86,4 +86,8 @@
 }
 .chart_index{
 	width:95% !important;
+}
+#tableList button {
+
+    width: 85px !important;
 }