|
@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
|
+import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.modules.ctop.service.IMediaReportService;
|
|
import org.jeecg.modules.ctop.service.IMediaReportService;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -20,6 +21,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.io.OutputStream;
|
|
import java.io.OutputStream;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
|
+import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -74,12 +76,13 @@ public class MediaReportCtrl {
|
|
//获取所有产品
|
|
//获取所有产品
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequestMapping(value = "/getAllProductList")
|
|
@RequestMapping(value = "/getAllProductList")
|
|
- public Result<List<Product>> deleteProduct(HttpServletRequest request, HttpServletResponse response){
|
|
|
|
|
|
+ public Result<List<Product>> getAllProductList(@RequestBody JSONObject requestBody,
|
|
|
|
+ HttpServletRequest request, HttpServletResponse response){
|
|
log.info("/ctop/product/getAllProductList 方法开始");
|
|
log.info("/ctop/product/getAllProductList 方法开始");
|
|
Result<List<Product>> result = new Result();
|
|
Result<List<Product>> result = new Result();
|
|
|
|
|
|
try {
|
|
try {
|
|
- List<Product> allProductList = mediaReportService.getAllProductList();
|
|
|
|
|
|
+ List<Product> allProductList = mediaReportService.getAllProductList(requestBody.getInteger("mediaType"));
|
|
result.setResult(allProductList);
|
|
result.setResult(allProductList);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
log.error(e.getMessage());
|
|
log.error(e.getMessage());
|
|
@@ -221,12 +224,17 @@ public class MediaReportCtrl {
|
|
result.setMessage("参数有误");
|
|
result.setMessage("参数有误");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ String today = requestBody.getString("todayDate");
|
|
|
|
+ Date todayDate = DateUtils.parseDate(today, "yyyy-MM-dd");
|
|
|
|
+ Date yesterdayDate = DateUtils.addDay(todayDate, -1);
|
|
|
|
+ String yesterday = DateUtils.formatDate(yesterdayDate);
|
|
|
|
+
|
|
List<JSONObject> excelData = mediaReportService.exportMediaReportExcel(requestBody);
|
|
List<JSONObject> excelData = mediaReportService.exportMediaReportExcel(requestBody);
|
|
|
|
|
|
List<List<Object>> excelList= new ArrayList<>();
|
|
List<List<Object>> excelList= new ArrayList<>();
|
|
excelData.forEach(data->{
|
|
excelData.forEach(data->{
|
|
List<Object> temp= new ArrayList<>();
|
|
List<Object> temp= new ArrayList<>();
|
|
- temp.add(data.get("mediaType")==null?"-":data.get("mediaType"));
|
|
|
|
|
|
+ temp.add(data.get("mediaType")==null?"-":(data.getInteger("mediaType")==1?"头条":"快手"));
|
|
//temp.add(data.get("advertiserId")==null?"-":data.get("advertiserId"));
|
|
//temp.add(data.get("advertiserId")==null?"-":data.get("advertiserId"));
|
|
temp.add(data.get("advertiserName")==null?"-":data.get("advertiserName"));
|
|
temp.add(data.get("advertiserName")==null?"-":data.get("advertiserName"));
|
|
temp.add(data.get("productName")==null?"-":data.get("productName"));
|
|
temp.add(data.get("productName")==null?"-":data.get("productName"));
|
|
@@ -236,10 +244,11 @@ public class MediaReportCtrl {
|
|
temp.add(data.get("todayCost"));
|
|
temp.add(data.get("todayCost"));
|
|
temp.add(data.get("yesterdayCost"));
|
|
temp.add(data.get("yesterdayCost"));
|
|
temp.add(data.get("diffCost"));
|
|
temp.add(data.get("diffCost"));
|
|
|
|
+ temp.add(data.get("companyName"));
|
|
excelList.add(temp);
|
|
excelList.add(temp);
|
|
});
|
|
});
|
|
try{
|
|
try{
|
|
- String[] headers = {"媒体类型","广告主","产品","运营","销售",requestBody.getString("todayDate"),requestBody.getString("yesterdayDate"),"消耗差"};
|
|
|
|
|
|
+ String[] headers = {"媒体类型","广告主","产品","运营","销售",requestBody.getString("todayDate"),yesterday,"消耗差","区域"};
|
|
OutputStream os = response.getOutputStream();
|
|
OutputStream os = response.getOutputStream();
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
ExportExcelUtils eeu = new ExportExcelUtils();
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|
|
XSSFWorkbook workbook = new XSSFWorkbook();
|