|
@@ -1,8 +1,5 @@
|
|
|
package org.jeecg.modules.ctop.service.impl;
|
|
|
|
|
|
-import cn.com.ctop.common.module.entity.MaterialImageInfo;
|
|
|
-import cn.com.ctop.common.module.entity.SysUser;
|
|
|
-import cn.com.ctop.common.module.service.IMaterialImageInfoService;
|
|
|
import cn.com.ctop.common.module.utils.ResultMapUtils;
|
|
|
import cn.com.ctop.common.module.utils.StatusCode;
|
|
|
import cn.com.ctop.common.module.vo.*;
|
|
@@ -17,7 +14,6 @@ import org.jeecg.modules.system.service.ISysUserService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -25,8 +21,6 @@ import java.util.Map;
|
|
|
@Service
|
|
|
public class ImageReportDailyServiceImpl implements IImageReportDailyService {
|
|
|
@Autowired
|
|
|
- private IMaterialImageInfoService imageInfoService;
|
|
|
- @Autowired
|
|
|
private BytedanceReportMaterialDailyMapper bytedanceReportMaterialDailyMapper;
|
|
|
@Autowired
|
|
|
private KuaishouReportDailyImageMapper kuaishouReportDailyImageMapper;
|
|
@@ -62,23 +56,8 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
|
|
|
pageSize = 10;
|
|
|
}
|
|
|
PageHelper.startPage(pageNumber,pageSize);
|
|
|
- List<BytedanceImageCostVO> vos = bytedanceReportMaterialDailyMapper.bytedanceImageCost(startDate,endDate,accountList,code);
|
|
|
+ List<BytedanceImageCostVO> vos = bytedanceReportMaterialDailyMapper.bytedanceImageCost(startDate,endDate,accountList,code.trim());
|
|
|
PageInfo<BytedanceImageCostVO> pageInfo = new PageInfo<>(vos);
|
|
|
- if(null!=vos&&!vos.isEmpty()){
|
|
|
- List<BytedanceImageCostVO>setVos = new ArrayList<>();
|
|
|
- for(BytedanceImageCostVO vo:vos){
|
|
|
- MaterialImageInfo imageInfo = imageInfoService.getByCode(vo.getSignature());
|
|
|
- if(null!=imageInfo){
|
|
|
- vo.setUserId(imageInfo.getUserId());
|
|
|
- SysUser user = sysUserService.getById(imageInfo.getUserId());
|
|
|
- vo.setUserName(user.getUsername());
|
|
|
- }else{
|
|
|
- vo.setUserName("-");
|
|
|
- }
|
|
|
- setVos.add(vo);
|
|
|
- }
|
|
|
- pageInfo.setList(setVos);
|
|
|
- }
|
|
|
result.put("data",pageInfo);
|
|
|
ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
|
|
|
return result;
|
|
@@ -103,22 +82,7 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
|
|
|
if(null == code||code.trim().equals("")){
|
|
|
code = null;
|
|
|
}
|
|
|
- List<BytedanceImageCostVO> vos = bytedanceReportMaterialDailyMapper.bytedanceImageCost(startDate,endDate,accountList,code);
|
|
|
- List<BytedanceImageCostVOEntity>details = new ArrayList<>();
|
|
|
- if(null!=vos&&!vos.isEmpty()){
|
|
|
- for(BytedanceImageCostVO vo:vos){
|
|
|
- BytedanceImageCostVOEntity entity = new BytedanceImageCostVOEntity(vo);
|
|
|
- MaterialImageInfo imageInfo = imageInfoService.getByCode(vo.getSignature());
|
|
|
- if(null!=imageInfo){
|
|
|
- entity.setUserId(imageInfo.getUserId());
|
|
|
- SysUser user = sysUserService.getById(imageInfo.getUserId());
|
|
|
- entity.setUserName(user.getUsername());
|
|
|
- }else{
|
|
|
- entity.setUserName("-");
|
|
|
- }
|
|
|
- details.add(entity);
|
|
|
- }
|
|
|
- }
|
|
|
+ List<BytedanceImageCostVOEntity>details = bytedanceReportMaterialDailyMapper.bytedanceImageCostEntity(startDate,endDate,accountList,code.trim());
|
|
|
sheetInfoVo.setDetails(details);
|
|
|
return sheetInfoVo;
|
|
|
}
|
|
@@ -151,23 +115,8 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
|
|
|
pageSize = 10;
|
|
|
}
|
|
|
PageHelper.startPage(pageNumber,pageSize);
|
|
|
- List<KuaishouImageCostVO> vos = kuaishouReportDailyImageMapper.imageCost(startDate,endDate,accountList,code);
|
|
|
+ List<KuaishouImageCostVO> vos = kuaishouReportDailyImageMapper.imageCost(startDate,endDate,accountList,code.trim());
|
|
|
PageInfo<KuaishouImageCostVO> pageInfo = new PageInfo<>(vos);
|
|
|
- if(null!=vos&&!vos.isEmpty()){
|
|
|
- List<KuaishouImageCostVO>setVos = new ArrayList<>();
|
|
|
- for(KuaishouImageCostVO vo:vos){
|
|
|
- MaterialImageInfo imageInfo = imageInfoService.getByCode(vo.getSignature());
|
|
|
- if(null!=imageInfo){
|
|
|
- vo.setUserId(imageInfo.getUserId());
|
|
|
- SysUser user = sysUserService.getById(imageInfo.getUserId());
|
|
|
- vo.setUserName(user.getUsername());
|
|
|
- }else{
|
|
|
- vo.setUserName("-");
|
|
|
- }
|
|
|
- setVos.add(vo);
|
|
|
- }
|
|
|
- pageInfo.setList(setVos);
|
|
|
- }
|
|
|
result.put("data",pageInfo);
|
|
|
ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
|
|
|
return result;
|
|
@@ -193,22 +142,7 @@ public class ImageReportDailyServiceImpl implements IImageReportDailyService {
|
|
|
code = null;
|
|
|
}
|
|
|
sheetInfoVo.setSheetName("快手图片消耗统计");
|
|
|
- List<KuaishouImageCostVO> vos = kuaishouReportDailyImageMapper.imageCost(startDate,endDate,accountList,code);
|
|
|
- List<KuaishouImageCostVOEntity> details = new ArrayList<>();
|
|
|
- if(null!=vos&&!vos.isEmpty()){
|
|
|
- for (KuaishouImageCostVO vo:vos) {
|
|
|
- KuaishouImageCostVOEntity entity = new KuaishouImageCostVOEntity(vo);
|
|
|
- MaterialImageInfo imageInfo = imageInfoService.getByCode(vo.getSignature());
|
|
|
- if(null!=imageInfo){
|
|
|
- entity.setUserId(imageInfo.getUserId());
|
|
|
- SysUser user = sysUserService.getById(imageInfo.getUserId());
|
|
|
- entity.setUserName(user.getUsername());
|
|
|
- }else{
|
|
|
- entity.setUserName("-");
|
|
|
- }
|
|
|
- details.add(entity);
|
|
|
- }
|
|
|
- }
|
|
|
+ List<KuaishouImageCostVOEntity> details = kuaishouReportDailyImageMapper.imageCostEntity(startDate,endDate,accountList,code.trim());
|
|
|
sheetInfoVo.setDetails(details);
|
|
|
return sheetInfoVo;
|
|
|
}
|