|
@@ -1,6 +1,5 @@
|
|
|
package org.jeecg.modules.ctop.controller;
|
|
|
|
|
|
-import cn.com.ctop.common.module.entity.UserAllocation;
|
|
|
import cn.com.ctop.common.module.utils.HttpUtils;
|
|
|
import cn.com.ctop.common.module.vo.SheetInfoVo;
|
|
|
import cn.com.ctop.toutiao.modules.report.entity.BytedanceVideoEtlInfo;
|
|
@@ -8,37 +7,29 @@ import cn.com.ctop.toutiao.modules.report.service.IBytedanceVideoEtlInfoService;
|
|
|
import com.alibaba.excel.EasyExcelFactory;
|
|
|
import com.alibaba.excel.ExcelWriter;
|
|
|
import com.alibaba.excel.metadata.Sheet;
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import io.swagger.annotations.Api;
|
|
|
-import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.common.util.DateUtils;
|
|
|
-import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.modules.excelutil.entity.BytedanceVideoEtlInfoEntity;
|
|
|
-import org.jeecg.modules.excelutil.entity.KuaishouXxlEntity;
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
|
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
|
-import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
|
import org.jeecgframework.poi.excel.entity.ImportParams;
|
|
|
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
|
|
-import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
|
import java.io.OutputStream;
|
|
|
-import java.io.UnsupportedEncodingException;
|
|
|
-import java.net.URLDecoder;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* 头条视频信息清洗
|
|
@@ -81,7 +72,7 @@ public class BytedanceVideoEtlInfoController {
|
|
|
queryWrapper.gt("effect_date",startDate);
|
|
|
}
|
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
|
- queryWrapper.lt("effect_date",startDate);
|
|
|
+ queryWrapper.lt("effect_date",endDate);
|
|
|
}
|
|
|
queryWrapper.lt("effect_day_num",7);
|
|
|
}else if(type.trim().equals("hot")){
|
|
@@ -90,7 +81,7 @@ public class BytedanceVideoEtlInfoController {
|
|
|
queryWrapper.gt("",startDate);
|
|
|
}
|
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
|
- queryWrapper.lt("faddish_date",startDate);
|
|
|
+ queryWrapper.lt("faddish_date",endDate);
|
|
|
}
|
|
|
queryWrapper.lt("faddish_day_num",30);
|
|
|
}else {
|
|
@@ -99,7 +90,7 @@ public class BytedanceVideoEtlInfoController {
|
|
|
queryWrapper.gt("state_date",startDate);
|
|
|
}
|
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
|
- queryWrapper.lt("state_date",startDate);
|
|
|
+ queryWrapper.lt("state_date",endDate);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -193,7 +184,7 @@ public class BytedanceVideoEtlInfoController {
|
|
|
queryWrapper.gt("effect_date",startDate);
|
|
|
}
|
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
|
- queryWrapper.lt("effect_date",startDate);
|
|
|
+ queryWrapper.lt("effect_date",endDate);
|
|
|
}
|
|
|
queryWrapper.lt("effect_day_num",7);
|
|
|
}else if(type.trim().equals("hot")){
|
|
@@ -202,7 +193,7 @@ public class BytedanceVideoEtlInfoController {
|
|
|
queryWrapper.gt("",startDate);
|
|
|
}
|
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
|
- queryWrapper.lt("faddish_date",startDate);
|
|
|
+ queryWrapper.lt("faddish_date",endDate);
|
|
|
}
|
|
|
queryWrapper.lt("faddish_day_num",30);
|
|
|
}else {
|
|
@@ -211,7 +202,7 @@ public class BytedanceVideoEtlInfoController {
|
|
|
queryWrapper.gt("state_date",startDate);
|
|
|
}
|
|
|
if(null!=endDate&&!"".equals(endDate.trim())){
|
|
|
- queryWrapper.lt("state_date",startDate);
|
|
|
+ queryWrapper.lt("state_date",endDate);
|
|
|
}
|
|
|
}
|
|
|
}
|