Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
jiequan.bi 4 лет назад
Родитель
Сommit
1a11c04bc1

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ads/entity/AiKuaishouStrategyTemplate.java

@@ -28,6 +28,7 @@ public class AiKuaishouStrategyTemplate {
 	private String testDirection;
 	/**素材选择方式*/
 	private String materialSelectMethod;
+
 	/**
 	 * 组内素材组合模式
 	 * single 单视频+不同封面

+ 5 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ads/service/impl/AiStrategyServiceImpl.java

@@ -107,7 +107,7 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
         List<KuaiShouVideoGet> fullVideos = new ArrayList<KuaiShouVideoGet>();
         fullVideos.addAll(highQualityVideos);
         fullVideos.addAll(newVideos);
-        if(null == fullVideos){
+        if(fullVideos.isEmpty()){
             log.info("素材获取失败=>accountId:{}",accountId);
             return;
         }
@@ -198,7 +198,7 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
                                 Long unitId = (Long) unitCreateResult.get("unitId");
                                 for(int j=0;j<15;j++){
                                     JSONObject creativeParams = creativeParams(token,unitId,highQualityVideos.get(i*15+j),unitCnt,strategy);
-                                    createCreative(token,creativeParams,campaignId,unitId,strategy,null,1,highQualityVideos.get(i*15+j));
+                                    createCreative(token,creativeParams,campaignId,unitId,strategy,null,j+1,highQualityVideos.get(i*15+j));
                                 }
                                 innerUnitCnt++;
                             }
@@ -218,7 +218,7 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
 
                             for(int j=0;j<rem;j++){
                                 JSONObject creativeParams = creativeParams(token,unitId,highQualityVideos.get(mod*15+j),unitCnt,strategy);
-                                createCreative(token,creativeParams,campaignId,unitId,strategy,null,1,highQualityVideos.get(mod*15+j));
+                                createCreative(token,creativeParams,campaignId,unitId,strategy,null,j+1,highQualityVideos.get(mod*15+j));
                             }
                         }
                     }
@@ -242,7 +242,7 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
                                 Long unitId = (Long) unitCreateResult.get("unitId");
                                 for(int j=0;j<15;j++){
                                     JSONObject creativeParams = creativeParams(token,unitId,newVideos.get(i*15+j),unitCnt,strategy);
-                                    createCreative(token,creativeParams,campaignId,unitId,strategy,null,1,newVideos.get(i*15+j));
+                                    createCreative(token,creativeParams,campaignId,unitId,strategy,null,j+1,newVideos.get(i*15+j));
                                 }
                                 innerUnitCnt++;
                             }
@@ -262,7 +262,7 @@ public class AiStrategyServiceImpl implements IAiStrategyService {
 
                             for(int j=0;j<rem;j++){
                                 JSONObject creativeParams = creativeParams(token,unitId,newVideos.get(mod*15+j),unitCnt,strategy);
-                                createCreative(token,creativeParams,campaignId,unitId,strategy,null,1,newVideos.get(mod*15+j));
+                                createCreative(token,creativeParams,campaignId,unitId,strategy,null,j+1,newVideos.get(mod*15+j));
                             }
                         }
                     }

+ 10 - 19
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BytedanceVideoEtlInfoController.java

@@ -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);
 			  }
 		  }
 	  }

+ 6 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/KuaishouVideoEtlInfoController.java

@@ -69,7 +69,7 @@ public class KuaishouVideoEtlInfoController {
 					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")){
@@ -78,7 +78,7 @@ public class KuaishouVideoEtlInfoController {
 					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 {
@@ -87,7 +87,7 @@ public class KuaishouVideoEtlInfoController {
 					queryWrapper.gt("state_date",startDate);
 				}
 				if(null!=endDate&&!"".equals(endDate.trim())){
-					queryWrapper.lt("state_date",startDate);
+					queryWrapper.lt("state_date",endDate);
 				}
 			}
 		}
@@ -181,7 +181,7 @@ public class KuaishouVideoEtlInfoController {
 				  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")){
@@ -190,7 +190,7 @@ public class KuaishouVideoEtlInfoController {
 				  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 {
@@ -199,7 +199,7 @@ public class KuaishouVideoEtlInfoController {
 				  queryWrapper.gt("state_date",startDate);
 			  }
 			  if(null!=endDate&&!"".equals(endDate.trim())){
-				  queryWrapper.lt("state_date",startDate);
+				  queryWrapper.lt("state_date",endDate);
 			  }
 		  }
 	  }

+ 12 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -6,6 +6,8 @@ import cn.com.ctop.common.module.entity.SysRole;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.model.SysUserSysDepartModel;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.common.module.vo.SysDepartUsersVO;
 import cn.com.ctop.common.module.vo.SysUserRoleVO;
 import cn.com.ctop.common.module.vo.SysUserVo;
@@ -111,6 +113,16 @@ public class SysUserController {
         return map;
     }
 
+    @RequestMapping(value = "/getAllDesigner", method = RequestMethod.GET)
+    public Map<String, Object> getAllDesigner() {
+        Map<String, Object> map = new HashMap<>();
+        List<SysUser> userList = sysUserService.getAllDesigner();
+        map.put("data",userList);
+        ResultMapUtils.setResultMap(map, StatusCode.COMMON_SUCCESS);
+        return map;
+    }
+
+
     @Autowired
     private UserCompanyMapper userCompanyMapper;
 

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -260,4 +260,7 @@ public interface ISysUserService extends IService<SysUser> {
     List<SysUser> queryByDepIds(List<String> departIds, String username);
 
     List<SysUserVo> getAllUser(String userName);
+
+    List<SysUser> getAllDesigner();
+
 }

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -275,6 +275,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
+    public List<SysUser> getAllDesigner() {
+        return userMapper.selectAllDesigner();
+    }
+
+    @Override
     public Map<String, String> getDepNamesByUserIds(List<String> userIds) {
         List<SysUserDepVo> list = this.baseMapper.getDepNamesByUserIds(userIds);
         Map<String, String> res = new HashMap<String, String>();

+ 23 - 17
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -1,6 +1,5 @@
 package org.jeecg;
 
-import cn.com.ctop.alarm.modules.service.IAlarmEventSendService;
 import cn.com.ctop.common.module.entity.BindAccountLogin;
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.UserAllocation;
@@ -13,17 +12,14 @@ import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskServic
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
-import cn.com.ctop.kuaishou.modules.report.service.IKuaishouCostGroupService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAgentService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouVideoEtlInfoService;
 import cn.com.ctop.kuaishou.modules.report.service.IRuleKuaiShouPlanService;
 import cn.com.ctop.oa.modules.service.IWechatCheckinDataService;
 import cn.com.ctop.oa.modules.service.IWechatNoListService;
 import cn.com.ctop.oa.modules.service.IWechatUserListService;
-import cn.com.ctop.toutiao.modules.material.entity.ByteDanceAdvertisePlan;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.modules.report.service.*;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.junit.Test;
@@ -377,15 +373,23 @@ public class SampleTest {
     }
 
     @Autowired
+    private IRuleKuaiShouPlanService ruleKuaiShouPlanService;
+
+    @Test
+    public void execute() {
+        CtopOauthToken token = tokenService.getTokenByAccountId(9589905L);
+        ruleKuaiShouPlanService.cleanRuleDataTarget(token.getAccountId(), 1);
+    }
+    @Autowired
     private IKuaishouVideoEtlInfoService kuaishouVideoEtlInfoService;
     @Test
     public void etlKuaishouData(){
-        String dateString = "2020-08-29";
+        String dateString = "2020-12-25";
         Date startDate = DateUtils.parseDate(dateString,"yyyy-MM-dd");
-        for(int i=0;i<=185;i++){
+        for(int i=0;i<=10;i++){
             Date getDate = DateUtils.addDay(startDate,i);
             kuaishouVideoEtlInfoService.etlKuaishouVideoInfo(getDate);
-//            bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
+            bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
         }
     }
 
@@ -393,12 +397,12 @@ public class SampleTest {
     private IBytedanceVideoEtlInfoService bytedanceVideoEtlInfoService;
     @Test
     public void etlBytedanceData(){
-        String dateString = "2020-07-01";
+        String dateString = "2020-12-23";
         Date startDate = DateUtils.parseDate(dateString,"yyyy-MM-dd");
-        for(int i=0;i<=310;i++){
+        for(int i=0;i<=10;i++){
             Date getDate = DateUtils.addDay(startDate,i);
             bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
-//            kuaishouVideoEtlInfoService.etlKuaishouVideoInfo(getDate);
+            kuaishouVideoEtlInfoService.etlKuaishouVideoInfo(getDate);
         }
     }
 
@@ -412,17 +416,19 @@ public class SampleTest {
 
     @Test
     public void loadKuaishouVideo(){
-        String endDate = DateUtils.getNowDate("yyyy-MM-dd");
-        CtopOauthToken token = tokenService.getTokenByAccountId(9718688L);
-//        kuaishouInterfaceService.getVideoList(token, endDate, endDate);
-        kuaishouInterfaceService.getAdvertiserCreativeReportDaily(token, new Date(), new Date(), null, null);
+        Date date = new Date();
+        CtopOauthToken token = tokenService.getTokenByAccountId(9556344L);
+//        kuaishouInterfaceService.getAdvertiserCreativeReportDaily(token, new Date(), new Date(), null, null);
+        kuaishouInterfaceService.getVideoList(token, DateUtils.formatDate(DateUtils.addDay(date,-5)), DateUtils.formatDate(date));
+        // 获取图片信息数据
+//        kuaishouInterfaceService.getImageList(token, DateUtils.getNowDate("yyyy-MM-dd"));
     }
 
-    @Autowired
-    IRuleByteDanceAccountService ruleByteDanceAccountService;
+
+
 
     @Autowired
-    IRuleKuaiShouPlanService ruleKuaiShouPlanService;
+    IRuleByteDanceAccountService ruleByteDanceAccountService;
 
     @Test
     public void cleanRuleDataAccount(){

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/SysUser.java

@@ -198,4 +198,9 @@ public class SysUser implements Serializable {
     @TableField(exist = false)
     private String depart;
 
+    /**
+     * 部门
+     */
+    @TableField(exist = false)
+    private String roleName;
 }

+ 1 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/SysUserMapper.java

@@ -25,6 +25,7 @@ import java.util.Map;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
     List<SysUser> selectAllUser();
+    List<SysUser> selectAllDesigner();
 
     /**
      * 通过用户账号查询用户信息

+ 6 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml

@@ -254,4 +254,10 @@ SELECT
         INNER JOIN  ctop_user_allocation t2 ON t1.id = t2.user_id
         WHERE t2.account_id = #{accountId}
     </select>
+    <select id="selectAllDesigner" resultType="cn.com.ctop.common.module.entity.SysUser">
+        select user.realname,user.id,role.role_name from sys_user_role userRole left join sys_user user on userRole.user_id = user.id
+        left join sys_role role on userRole.role_id = role.id
+            where role.role_code in ('plane','plan','shot','clip')
+            and user.status = 1
+    </select>
 </mapper>

+ 7 - 6
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/UserAllocationMapper.xml

@@ -65,14 +65,15 @@
 
     <select id="getAccountIdsByUserId" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-            account_id,
-            auth_name,
-            project_name
+            allocation.account_id,
+            allocation.auth_name,
+            project.project_name as project_name
         FROM
-            ctop_user_allocation
+            ctop_user_allocation allocation
+            left join ctop_project project on allocation.project_id = project.id
         WHERE
-            user_id = #{userId}
-          and account_status=0
+            allocation.user_id = #{userId}
+          and allocation.account_status=0
     </select>
 
     <select id="getProjectIdByAccountId" resultType="java.lang.Long">