Merge branch 'master' of http://git.yaozhitech.com/yinli/yangguang

src/main/java/com/ylcm/sys/controller/SpecialAnalysisController.java

@@ -1,5 +1,7 @@
 package com.ylcm.sys.controller;
 
+import java.util.List;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
@@ -8,9 +10,11 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ylcm.sys.common.Constants;
 import com.ylcm.sys.form.AdSpecialAnalysisQueryForm;
 import com.ylcm.sys.service.SpecialAnalysisService;
 import com.ylcm.sys.vo.AdSpecialAnalysisVO;
+import com.ylcm.sys.vo.AdSpecialTopVO;
 
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
@@ -30,7 +34,7 @@ public class SpecialAnalysisController extends BaseController{
 		return "analysis/special_analysis";
 	}
 	
-	@RequestMapping(value = "/ajax_brand_analysis_list.do")
+	@RequestMapping(value = "/ajax_special_analysis_list.do")
 	public void ajaxSearchList(HttpServletResponse response, AdSpecialAnalysisQueryForm queryForm) {
 		try {
 			
@@ -40,6 +44,24 @@ public class SpecialAnalysisController extends BaseController{
 			 */
 			JSONObject jsonobj = new JSONObject();
 			jsonobj.put("data", page);
+			jsonobj.put("code", Constants.CODE_SUCCESS);
+			ajaxJson(jsonobj.toString(), response);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			ajaxJson("{\"code\":\"0\",\"msg\":\"获取列表失败\"}", response);
+		}
+	}
+	
+	//产品专题广告投放排名
+	@RequestMapping(value = "/list_special_product_rank.do")
+	public void list_special_product_rank(HttpServletResponse response, Integer type, String startDate, String endDate) {
+		try {
+			
+			List<AdSpecialTopVO> list = specialAnalysisService.specialTop(type, startDate, endDate);
+			
+			JSONObject jsonobj = new JSONObject();
+			jsonobj.put("data", list);
+			jsonobj.put("code", Constants.CODE_SUCCESS);
 			ajaxJson(jsonobj.toString(), response);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);

src/main/java/com/ylcm/sys/mapper/AdSpecialMapper.java

@@ -1,5 +1,7 @@
 package com.ylcm.sys.mapper;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -7,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ylcm.sys.domain.AdSpecial;
 import com.ylcm.sys.form.AdSpecialAnalysisQueryForm;
 import com.ylcm.sys.vo.AdSpecialAnalysisVO;
+import com.ylcm.sys.vo.AdSpecialTopVO;
 
 /**
  * <p>
@@ -19,4 +22,11 @@ import com.ylcm.sys.vo.AdSpecialAnalysisVO;
 public interface AdSpecialMapper extends BaseMapper<AdSpecial> {
 
 	IPage<AdSpecialAnalysisVO> getPage(IPage<AdSpecial> page, @Param("queryBean") AdSpecialAnalysisQueryForm analysisQueryForm);
+	
+	/**
+	 * 产品专题广告投放排名
+	 * @param type
+	 * @return
+	 */
+	List<AdSpecialTopVO> specialTop(@Param("type") Integer type, @Param("startDate") String startDate, @Param("endDate") String endDate);
 }

src/main/java/com/ylcm/sys/service/SpecialAnalysisService.java

@@ -1,8 +1,11 @@
 package com.ylcm.sys.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ylcm.sys.form.AdSpecialAnalysisQueryForm;
 import com.ylcm.sys.vo.AdSpecialAnalysisVO;
+import com.ylcm.sys.vo.AdSpecialTopVO;
 
 
 public interface SpecialAnalysisService {
@@ -12,4 +15,10 @@ public interface SpecialAnalysisService {
 	 * @return
 	 */
 	IPage<AdSpecialAnalysisVO> page(AdSpecialAnalysisQueryForm queryForm);
+	
+	/**
+	 * 专题top30
+	 * @param type 0产品 1栏目
+	 */
+	List<AdSpecialTopVO> specialTop(Integer type, String startDate, String endDate);
 }

src/main/java/com/ylcm/sys/service/impl/SpecialAnalysisServiceImpl.java

@@ -1,5 +1,7 @@
 package com.ylcm.sys.service.impl;
 
+import java.util.List;
+
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
@@ -11,6 +13,7 @@ import com.ylcm.sys.form.AdSpecialAnalysisQueryForm;
 import com.ylcm.sys.mapper.AdSpecialMapper;
 import com.ylcm.sys.service.SpecialAnalysisService;
 import com.ylcm.sys.vo.AdSpecialAnalysisVO;
+import com.ylcm.sys.vo.AdSpecialTopVO;
 
 @Service
 public class SpecialAnalysisServiceImpl implements SpecialAnalysisService {
@@ -23,5 +26,11 @@ public class SpecialAnalysisServiceImpl implements SpecialAnalysisService {
 		return adSpecialMapper.getPage(new Page<AdSpecial>(queryForm.getPageNo(), queryForm.getPageSize()), queryForm);
 	}
 
+	@Override
+	public List<AdSpecialTopVO> specialTop(Integer type, String startDate, String endDate) {
+		return adSpecialMapper.specialTop(type, startDate, endDate);
+	}
+
+	
 	
 }

src/main/java/com/ylcm/sys/task/SpecialTopTask.java

@@ -0,0 +1,52 @@
+package com.ylcm.sys.task;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import com.ylcm.sys.service.SpecialAnalysisService;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Component
+@Slf4j
+public class SpecialTopTask {
+
+	private SpecialAnalysisService specialAnalysisService;
+	/**
+	 * 一周的每天运行 产品专题广告投放排名
+	 */
+	@Scheduled(cron = "0 0 0/2 * * ?")
+	public void topTaskWeek(){
+		log.info("产品专题广告投放排名---start");
+		LocalDate now = LocalDate.now();
+		LocalDate day7before = now.minusDays(7);
+		specialAnalysisService.specialTop(0, now.format(DateTimeFormatter.ISO_DATE), day7before.format(DateTimeFormatter.ISO_DATE));
+		specialAnalysisService.specialTop(1, now.format(DateTimeFormatter.ISO_DATE), day7before.format(DateTimeFormatter.ISO_DATE));
+		log.info("产品专题广告投放排名---end");
+	}
+	
+	/**
+	 * 月的每天运行一次
+	 */
+	@Scheduled(cron = "0 0 1 * * ?")
+	public void topTaskMonth(){
+		log.info("产品专题广告投放排名---start");
+		LocalDate now = LocalDate.now();
+		LocalDate day7before = now.minusDays(30);
+		specialAnalysisService.specialTop(0, now.format(DateTimeFormatter.ISO_DATE), day7before.format(DateTimeFormatter.ISO_DATE));
+		specialAnalysisService.specialTop(1, now.format(DateTimeFormatter.ISO_DATE), day7before.format(DateTimeFormatter.ISO_DATE));
+		
+		LocalDate day365before = now.minusDays(365);
+		specialAnalysisService.specialTop(0, now.format(DateTimeFormatter.ISO_DATE), day365before.format(DateTimeFormatter.ISO_DATE));
+		specialAnalysisService.specialTop(1, now.format(DateTimeFormatter.ISO_DATE), day365before.format(DateTimeFormatter.ISO_DATE));
+		
+		log.info("产品专题广告投放排名---end");
+	}
+	
+	
+	
+	
+}

src/main/java/com/ylcm/sys/vo/AdSpecialAnalysisVO.java

@@ -17,11 +17,9 @@ public class AdSpecialAnalysisVO {
     private String brandName;
     
     @ApiModelProperty(value = "一级行业")
-    @TableField("first_ind")
     private String firstInd;
 
     @ApiModelProperty(value = "二级行业")
-    @TableField("second_ind")
     private String secondInd;
 
     @ApiModelProperty(value = "广告主")

src/main/java/com/ylcm/sys/vo/AdSpecialTopVO.java

@@ -0,0 +1,20 @@
+package com.ylcm.sys.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AdSpecialTopVO {
+
+	@ApiModelProperty("产品/栏目名")
+	private String productName;
+	
+	@ApiModelProperty("一级行业")
+	private String firstInd;
+	
+	@ApiModelProperty("频次")
+	private Integer frequency;
+	
+	@ApiModelProperty("时长")
+	private Integer duration;
+}

src/main/resource/mapper/AdSpecialMapper.xml

@@ -38,5 +38,26 @@
     		</if>
     	</where>
     </select>
+    
+    <select id="specialTop" resultType="com.ylcm.sys.vo.AdSpecialTopVO">
+    	SELECT 
+    		product_name,sum(show_duration) show_duration,SUM(1) frequency
+		FROM
+			ad_special
+		<where>
+			<if test="type != null">
+				AND type = 0
+			</if>
+			<if test="startDate != null and startDate != ''">
+				AND show_date >= #{startDate}
+			</if>
+			<if test="endDate != null and endDate != ''">
+				AND #{endDate} >= show_date
+			</if>
+		</where> 
+
+		GROUP BY product_name
+		ORDER BY sum(show_duration) DESC LIMIT 30
+    </select>
 
 </mapper>

src/main/webapp/static/js/analysis/special_analysis.js

@@ -56,13 +56,13 @@ function changeTab(day){
 	}
 	$(".text").input();
 	getBrandAnalysisList(1);
-	getPlacementDetailList(1);
+	/*getPlacementDetailList(1);
 	getPieData(cur_type);
 	getRatingCharts(cur_type);
 	getNetChart(cur_type,'');
 	getDoubanChart(cur_type);
 	getRankList(cur_type);
-	changeTagName();
+	changeTagName();*/
 }
 
 function changeType(type){
@@ -89,56 +89,43 @@ function getBrandAnalysisList(page){
 	var pageSize = "10", data = {
 		"pageNo": page,
 		"pageSize": pageSize,
-		"name": $("#keyword").val(),
+		"keyword": $("#keyword").val(),
+		"type": $("#type").val(),
 		"second_ind":$("#second_ind").val(),
 		"beginDate": $("#start_time").val(),
 		"endDate": $("#end_time").val()
 	}, html = "";
 	$("#brand_analysis_page, #brand_analysis_list").empty();
-	ajax("ajax_brand_analysis_list.do",data,function(res){
-		if(res.code == 1 && res.list.length > 0){
-			$.each(res.list, function(index, item){
+	ajax("ajax_special_analysis_list.do",data,function(res){
+		if(res.code == 1 && res.data.records.length > 0){
+			$.each(res.data.records, function(index, item){
 				if(index == 0){
 					cur_brand = item.brand;
 				}
-				//eg:1|歌手/1|快乐大本营/1|快乐大本营
-				var types = item.types ? item.types.split("/") : [];
-				var count_1 = [],count_2 = [],count_3 = [],count_4 = [];
-				for(var i in types){
-					if(types[i].split('|')[0] == "1")
-						count_1.push(types[i].split('|')[1]);
-					else if(types[i].split('|')[0] == "2")
-						count_2.push(types[i].split('|')[1]);
-					else if(types[i].split('|')[0] == "3")
-						count_3.push(types[i].split('|')[1]);
-					else if(types[i].split('|')[0] == "4")
-						count_4.push(types[i].split('|')[1]);
-				}
-				count_1 = unique(count_1);
-				count_2 = unique(count_2);
-				count_3 = unique(count_3);
-				count_4 = unique(count_4);
 				html += "<tr data-brand='"+item.brand+"'>"+
 					"<td>"+$.orderNum(page,pageSize,index)+"</td>"+
-					"<td>"+item.brand+"</td>"+
-                    "<td>"+(item.second_ind ? item.second_ind : '-')+"</td>"+ //"<td>"+(item.advertiser ? item.advertiser : '-')+"</td>"+
-					"<td>"+(item.model_count ? item.model_count : '-')+"</td>"+
-					"<td>"+count_1.length+"</td>"+
-					"<td>"+count_2.length+"</td>"+
-					"<td>"+count_3.length+"</td>"+
-					"<td>"+count_4.length+"</td>"+
-					"<td>"+item.sum_frequency+"</td>"+
-					"<td>"+item.sum_length+"</td>"+
-					"<td>"+item.sum_price+"</td>"+
+					"<td>"+item.mediaName+"</td>"+
+                    "<td>"+item.showTime+"</td>"+
+					"<td>"+item.showDate+"</td>"+
+					"<td>"+item.showEnv+"</td>"+
+					"<td>"+item.tvName+"</td>"+
+					"<td>"+item.showDuration+"</td>"+
+					"<td>"+item.productName+"</td>"+
+					"<td>"+item.brandName+"</td>"+
+					"<td>"+item.firstInd+"</td>"+
+					"<td>"+item.secondInd+"</td>"+
+					"<td>"+item.advMaster+"</td>"+
+					"<td>"+item.phone+"</td>"+
+					"<td>"+item.price+"</td>"+
 					"<td><input type='checkbox' class='checkbox {click:itemCheck}' name='item' "+($.cookie.get("benchCheckNum").indexOf(item.brand) != -1 ? 'checked':'')+" value='"+item.brand+"' /><label></label></td>"+
 				"</tr>";
 			});
 			$("#brand_analysis_list").html(html);
 			$.radio();
 			$.checkbox();
-			var newpage = new createPage(res.count,page,pageSize,3,"brandAnalysisPageGo");
+			var newpage = new createPage(res.data.total,page,pageSize,3,"brandAnalysisPageGo");
 			$("#brand_analysis_page").html(newpage.pageHtml);
-			$('#brand_analysis_count').html(res.count);
+			$('#brand_analysis_count').html(res.data.count);
 			/**
 			 * 点击事件
 			 */
@@ -160,12 +147,12 @@ brandAnalysisPageGo = getBrandAnalysisList;
 
 function getPlacementDetailList(page){
 	page = page || 1;
-	var pageSize = "10",name =  $("#keyword").val(),beginDate = $("#start_time").val(),
+	var pageSize = "10",keyword =  $("#keyword").val(),beginDate = $("#start_time").val(),
 		endDate = $("#end_time").val(),data = {
+		"type": $("#type").val(),
 		"pageNo": page,
 		"pageSize": pageSize,
-		"brand":cur_brand,
-		"name": name,
+		"keyword": keyword,
 		"beginDate": beginDate,
 		"endDate": endDate
 	}, html = "";
@@ -423,7 +410,7 @@ function getDoubanChart(type){
 
 
 /**
- * 节目及品牌软性广告投放排名
+ * 产品专题广告投放排名
  */
 function getRankList(type){
 	var data = {
@@ -432,7 +419,7 @@ function getRankList(type){
 			"beginDate": $("#start_time").val(),
 			"endDate": $("#end_time").val()
 		},html="";
-	ajax("list_program_brand_rank.do",data,function(res){
+	ajax("list_special_product_rank.do",data,function(res){
 		if(res.code == 1 && res.data){
 			if(res.data.programRankList.length > 0){
 				var list = sortProgramRankList(res.data.programRankList,program_arr);