瀏覽代碼

快手自动投放账户程序化创意创建

syh 4 年之前
父節點
當前提交
df2e74728f

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

@@ -357,6 +357,7 @@ public class SysUserController {
                 result.error500("未找到对应实体");
                 result.error500("未找到对应实体");
             } else {
             } else {
                 SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
                 SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
+                user.setLeaderName(user.getLeaderName().trim());
                 user.setUpdateTime(new Date());
                 user.setUpdateTime(new Date());
                 //String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
                 //String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
                 user.setPassword(sysUser.getPassword());
                 user.setPassword(sysUser.getPassword());

+ 8 - 8
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -95,16 +95,16 @@ spring:
         # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
         # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
       datasource:
-        master:
-          url: jdbc:mysql://139.186.27.96:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: data
-          password: hcst@2021
-          driver-class-name: com.mysql.jdbc.Driver
 #        master:
 #        master:
-#          url: jdbc:mysql://139.186.151.174:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
-#          username: hcst
-#          password: hcst@2020
+#          url: jdbc:mysql://139.186.27.96:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+#          username: data
+#          password: hcst@2021
 #          driver-class-name: com.mysql.jdbc.Driver
 #          driver-class-name: com.mysql.jdbc.Driver
+        master:
+          url: jdbc:mysql://139.186.151.174:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
+          username: hcst
+          password: hcst@2020
+          driver-class-name: com.mysql.jdbc.Driver
 #        master:
 #        master:
 #          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
 #          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
 #          username: data
 #          username: data

+ 6 - 87
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -17,8 +17,6 @@ import cn.com.ctop.oa.modules.service.IWechatNoListService;
 import cn.com.ctop.oa.modules.service.IWechatUserListService;
 import cn.com.ctop.oa.modules.service.IWechatUserListService;
 import cn.com.ctop.toutiao.modules.link.service.IETLReportBytedanceVideoService;
 import cn.com.ctop.toutiao.modules.link.service.IETLReportBytedanceVideoService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
-import cn.com.ctop.toutiao.modules.report.entity.BytedanceAccountReportTaskRecord;
-import cn.com.ctop.toutiao.modules.report.mapper.BytedanceReportMaterialDailyMapper;
 import cn.com.ctop.toutiao.modules.report.service.*;
 import cn.com.ctop.toutiao.modules.report.service.*;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
@@ -29,7 +27,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.junit4.SpringRunner;
 
 
-import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Date;
@@ -425,45 +422,20 @@ public class SampleTest {
     }
     }
 
 
     @Autowired
     @Autowired
-    private IRuleKuaiShouPlanService ruleKuaiShouPlanService;
-
-    @Autowired
     private IBytedanceAccountReportTaskRecordService reportTaskRecordService;
     private IBytedanceAccountReportTaskRecordService reportTaskRecordService;
 
 
-    @Test
-    public void execute() {
-        List<UserAllocation> allocations = allocationService.listByMediaId("3", 0);
-        for (UserAllocation allocation : allocations) {
-            BytedanceAccountReportTaskRecord reportTaskRecord1 = new BytedanceAccountReportTaskRecord(allocation.getAccountId(), "2020-10-01", "2020-10-31");
-            reportTaskRecordService.save(reportTaskRecord1);
-            BytedanceAccountReportTaskRecord reportTaskRecord2 = new BytedanceAccountReportTaskRecord(allocation.getAccountId(), "2020-11-01", "2020-11-30");
-            reportTaskRecordService.save(reportTaskRecord2);
-            BytedanceAccountReportTaskRecord reportTaskRecord3 = new BytedanceAccountReportTaskRecord(allocation.getAccountId(), "2020-12-01", "2020-12-31");
-            reportTaskRecordService.save(reportTaskRecord3);
-        }
-    }
 
 
     @Test
     @Test
     public void loadBDAccoutData() {
     public void loadBDAccoutData() {
-        CtopOauthToken token2 = tokenService.getTokenByAccountId(1674206482908163L);
-        bytedanceReportService.bytedanceMaterialReport(token2, "2020-10-14", "2020-10-14");
+        Date startDate = DateUtils.addDay(new Date(),-2000);
+        for(int i=0;i<=2000;i++){
+            Date getDate = DateUtils.addDay(startDate,i);
+            bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
+        }
     }
     }
 
 
-    @Resource
-    private BytedanceReportMaterialDailyMapper bytedanceReportMaterialDailyMapper;
 
 
-    private void load12AccountData(CtopOauthToken token) {
-        reportService.getAdvertiserReport(token, DateUtils.parseDate("2020-10-01", "yyyy-MM-dd"), DateUtils.parseDate("2020-10-31", "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-        reportService.getAdvertiserReport(token, DateUtils.parseDate("2020-11-01", "yyyy-MM-dd"), DateUtils.parseDate("2020-11-30", "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-        reportService.getAdvertiserReport(token, DateUtils.parseDate("2020-12-01", "yyyy-MM-dd"), DateUtils.parseDate("2020-12-31", "yyyy-MM-dd"), CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
-    }
 
 
-    private void load12Data(CtopOauthToken token) {
-        bytedanceReportService.bytedanceMaterialReport(token, "2020-10-11", "2020-10-13");
-        bytedanceReportService.bytedanceMaterialReport(token, "2020-10-14", "2020-10-16");
-        bytedanceReportService.bytedanceMaterialReport(token, "2020-10-17", "2020-10-19");
-        bytedanceReportService.bytedanceMaterialReport(token, "2020-10-20", "2020-10-21");
-    }
 
 
     @Autowired
     @Autowired
     private IKuaishouVideoEtlInfoService kuaishouVideoEtlInfoService;
     private IKuaishouVideoEtlInfoService kuaishouVideoEtlInfoService;
@@ -474,7 +446,6 @@ public class SampleTest {
         Date startDate = DateUtils.parseDate(dateString, "yyyy-MM-dd");
         Date startDate = DateUtils.parseDate(dateString, "yyyy-MM-dd");
         for (int i = 0; i <= 10; i++) {
         for (int i = 0; i <= 10; i++) {
             Date getDate = DateUtils.addDay(startDate, i);
             Date getDate = DateUtils.addDay(startDate, i);
-            kuaishouVideoEtlInfoService.etlKuaishouVideoInfo(getDate);
             bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
             bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
         }
         }
     }
     }
@@ -508,59 +479,7 @@ public class SampleTest {
 
 
     @Test
     @Test
     public void testLoadBytedanceDataV2() {
     public void testLoadBytedanceDataV2() {
-        String accountIds =
-                "1675440464386062," +
-                        "1688606248211533," +
-                        "1669181787105294," +
-                        "1687571097467912," +
-                        "1650079154438157," +
-                        "1680697900744711," +
-                        "1678156679964680," +
-                        "1670727177043982," +
-                        "1676160388944910," +
-                        "1687559760306190," +
-                        "1687382871519240," +
-                        "1680312075164686," +
-                        "1675440465991688," +
-                        "1664657972166663," +
-                        "1688193173408782," +
-                        "1675616147056647," +
-                        "1687308848716814," +
-                        "1686394621234247," +
-                        "1683594409340935," +
-                        "1683676478859341," +
-                        "1686384860112904," +
-                        "1668290872519693," +
-                        "1674063202781191," +
-                        "1685024266033160," +
-                        "1669714891201544," +
-                        "1687758256277512," +
-                        "1675434231118856," +
-                        "1686394621807687," +
-                        "1678411706704903," +
-                        "1686223489547271," +
-                        "1660120711467022," +
-                        "1686833795211278," +
-                        "1680697899143175," +
-                        "1661313994984462," +
-                        "1661313995480077," +
-                        "1636295780727820," +
-                        "1676540490482759," +
-                        "1675342904713223," +
-                        "1686771461984327," +
-                        "1685841129360391," +
-                        "1683676477736973," +
-                        "1661313994470413," +
-                        "1663465141771272," +
-                        "1687758256732174," +
-                        "1686223482927117," +
-                        "1686835166313479," +
-                        "1642648003678215," +
-                        "1639753233213454," +
-                        "1675239584963662," +
-                        "1674634579279885," +
-                        "1650263841162253," +
-                        "1672178052130888";
+        String accountIds = "1675440464386062";
         String[] accountArray = accountIds.split(",");
         String[] accountArray = accountIds.split(",");
         for (int i = 0; i < accountArray.length; i++) {
         for (int i = 0; i < accountArray.length; i++) {
             CtopOauthToken token = tokenService.getTokenByAccountId(Long.parseLong(accountArray[i]));
             CtopOauthToken token = tokenService.getTokenByAccountId(Long.parseLong(accountArray[i]));

+ 3 - 2
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialAscriptionServiceImpl.java

@@ -5,10 +5,11 @@ import cn.com.ctop.common.module.mapper.MaterialAscriptionMapper;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
+
 /**
 /**
  * 素材归属标
  * 素材归属标
  *
  *
@@ -19,7 +20,7 @@ import org.springframework.stereotype.Service;
 @Service
 @Service
 @Primary
 @Primary
 public class MaterialAscriptionServiceImpl extends ServiceImpl<MaterialAscriptionMapper, MaterialAscription> implements IMaterialAscriptionService {
 public class MaterialAscriptionServiceImpl extends ServiceImpl<MaterialAscriptionMapper, MaterialAscription> implements IMaterialAscriptionService {
-    @Autowired
+    @Resource
     private MaterialAscriptionMapper ascriptionMapper;
     private MaterialAscriptionMapper ascriptionMapper;
 
 
     @Override
     @Override

+ 0 - 18
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/KuaishouAgentAccount.java

@@ -28,76 +28,58 @@ public class KuaishouAgentAccount {
 
 
 	/**id*/
 	/**id*/
 	@TableId(type = IdType.INPUT)
 	@TableId(type = IdType.INPUT)
-    @ApiModelProperty(value = "id")
 	@JsonProperty("accountId")
 	@JsonProperty("accountId")
 	private Long id;
 	private Long id;
 	/**accountId*/
 	/**accountId*/
 	@Excel(name = "userId", width = 15)
 	@Excel(name = "userId", width = 15)
-    @ApiModelProperty(value = "userId")
 	private Long userId;
 	private Long userId;
 	/**accountName*/
 	/**accountName*/
 	@Excel(name = "accountName", width = 15)
 	@Excel(name = "accountName", width = 15)
-    @ApiModelProperty(value = "accountName")
 	private String accountName;
 	private String accountName;
 	/**balance*/
 	/**balance*/
 	@Excel(name = "balance", width = 15)
 	@Excel(name = "balance", width = 15)
-    @ApiModelProperty(value = "balance")
 	private java.math.BigDecimal balance;
 	private java.math.BigDecimal balance;
 	/**creditBalance*/
 	/**creditBalance*/
 	@Excel(name = "creditBalance", width = 15)
 	@Excel(name = "creditBalance", width = 15)
-    @ApiModelProperty(value = "creditBalance")
 	private java.math.BigDecimal creditBalance;
 	private java.math.BigDecimal creditBalance;
 	/**extendedBalance*/
 	/**extendedBalance*/
 	@Excel(name = "extendedBalance", width = 15)
 	@Excel(name = "extendedBalance", width = 15)
-    @ApiModelProperty(value = "extendedBalance")
 	private java.math.BigDecimal extendedBalance;
 	private java.math.BigDecimal extendedBalance;
 	/**rebate*/
 	/**rebate*/
 	@Excel(name = "rebate", width = 15)
 	@Excel(name = "rebate", width = 15)
-    @ApiModelProperty(value = "rebate")
 	private java.math.BigDecimal rebate;
 	private java.math.BigDecimal rebate;
 	/**preRebate*/
 	/**preRebate*/
 	@Excel(name = "preRebate", width = 15)
 	@Excel(name = "preRebate", width = 15)
-    @ApiModelProperty(value = "preRebate")
 	private java.math.BigDecimal preRebate;
 	private java.math.BigDecimal preRebate;
 	/**contractRebate*/
 	/**contractRebate*/
 	@Excel(name = "contractRebate", width = 15)
 	@Excel(name = "contractRebate", width = 15)
-    @ApiModelProperty(value = "contractRebate")
 	private java.math.BigDecimal contractRebate;
 	private java.math.BigDecimal contractRebate;
 	/**directRebate*/
 	/**directRebate*/
 	@Excel(name = "directRebate", width = 15)
 	@Excel(name = "directRebate", width = 15)
-    @ApiModelProperty(value = "directRebate")
 	private java.math.BigDecimal directRebate;
 	private java.math.BigDecimal directRebate;
 	/**totalBalance*/
 	/**totalBalance*/
 	@Excel(name = "totalBalance", width = 15)
 	@Excel(name = "totalBalance", width = 15)
-    @ApiModelProperty(value = "totalBalance")
 	private java.math.BigDecimal totalBalance;
 	private java.math.BigDecimal totalBalance;
 	/**kuaibiBalance*/
 	/**kuaibiBalance*/
 	@Excel(name = "kuaibiBalance", width = 15)
 	@Excel(name = "kuaibiBalance", width = 15)
-    @ApiModelProperty(value = "kuaibiBalance")
 	private java.math.BigDecimal kuaibiBalance;
 	private java.math.BigDecimal kuaibiBalance;
 	/**pushBalance*/
 	/**pushBalance*/
 	@Excel(name = "pushBalance", width = 15)
 	@Excel(name = "pushBalance", width = 15)
-    @ApiModelProperty(value = "pushBalance")
 	private java.math.BigDecimal pushBalance;
 	private java.math.BigDecimal pushBalance;
 	/**recharged*/
 	/**recharged*/
 	@Excel(name = "recharged", width = 15)
 	@Excel(name = "recharged", width = 15)
-    @ApiModelProperty(value = "recharged")
 	private Boolean recharged;
 	private Boolean recharged;
 	/**corporationName*/
 	/**corporationName*/
 	@Excel(name = "corporationName", width = 15)
 	@Excel(name = "corporationName", width = 15)
-    @ApiModelProperty(value = "corporationName")
 	private String corporationName;
 	private String corporationName;
 	/**reviewStatus*/
 	/**reviewStatus*/
 	@Excel(name = "reviewStatus", width = 15)
 	@Excel(name = "reviewStatus", width = 15)
-    @ApiModelProperty(value = "reviewStatus")
 	private Integer reviewStatus;
 	private Integer reviewStatus;
 	/**frozenStatus*/
 	/**frozenStatus*/
 	@Excel(name = "frozenStatus", width = 15)
 	@Excel(name = "frozenStatus", width = 15)
-    @ApiModelProperty(value = "frozenStatus")
 	private Integer frozenStatus;
 	private Integer frozenStatus;
 	/**transferAccountStatus*/
 	/**transferAccountStatus*/
 	@Excel(name = "transferAccountStatus", width = 15)
 	@Excel(name = "transferAccountStatus", width = 15)
-    @ApiModelProperty(value = "transferAccountStatus")
 	private Boolean transferAccountStatus;
 	private Boolean transferAccountStatus;
 	/**createTime*/
 	/**createTime*/
     @Excel(name = "transferAccountStatus", width = 15)
     @Excel(name = "transferAccountStatus", width = 15)

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyAgentServiceImpl.java

@@ -204,6 +204,7 @@ public class KuaishouReportDailyAgentServiceImpl extends ServiceImpl<KuaishouRep
             String postData = "{\"pageInfo\":{\"currentPage\":" + currentPage + ",\"pageSize\":200,\"total\":1000},\"reviewStatus\":\"-1\",\"selectType\":1,\"selectValue\":\"\",\"createBeginTime\":0,\"createEndTime\":0}";
             String postData = "{\"pageInfo\":{\"currentPage\":" + currentPage + ",\"pageSize\":200,\"total\":1000},\"reviewStatus\":\"-1\",\"selectType\":1,\"selectValue\":\"\",\"createBeginTime\":0,\"createEndTime\":0}";
             String listUrl = "https://agent.e.kuaishou.com/rest/dsp/agent/account/list";
             String listUrl = "https://agent.e.kuaishou.com/rest/dsp/agent/account/list";
             String result = HttpUtils2.httpPostRequestTest(listUrl, postData, headerMap);
             String result = HttpUtils2.httpPostRequestTest(listUrl, postData, headerMap);
+            System.out.println(result);
             ObjectMapper mapper = new ObjectMapper();
             ObjectMapper mapper = new ObjectMapper();
             mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
             mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
             JsonNode resultNode = mapper.readTree(result);
             JsonNode resultNode = mapper.readTree(result);

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/ByteDanceVideoReportDailyServiceImpl.java

@@ -14,9 +14,9 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
@@ -32,7 +32,7 @@ import java.util.List;
 @Slf4j
 @Slf4j
 public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceVideoReportDailyMapper, ByteDanceVideoReportDaily> implements IByteDanceVideoReportDailyService {
 public class ByteDanceVideoReportDailyServiceImpl extends ServiceImpl<ByteDanceVideoReportDailyMapper, ByteDanceVideoReportDaily> implements IByteDanceVideoReportDailyService {
 
 
-    @Autowired
+    @Resource
     private ByteDanceVideoReportDailyMapper byteDanceVideoReportDailyMapper;
     private ByteDanceVideoReportDailyMapper byteDanceVideoReportDailyMapper;
 
 
     @Override
     @Override

+ 36 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceVideoEtlInfoServiceImpl.java

@@ -2,7 +2,6 @@ package cn.com.ctop.toutiao.modules.report.service.impl;
 
 
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
-import cn.com.ctop.toutiao.modules.report.entity.BytedanceReportMaterialDaily;
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceVideoEtlInfo;
 import cn.com.ctop.toutiao.modules.report.entity.BytedanceVideoEtlInfo;
 import cn.com.ctop.toutiao.modules.report.mapper.BytedanceVideoEtlInfoMapper;
 import cn.com.ctop.toutiao.modules.report.mapper.BytedanceVideoEtlInfoMapper;
 import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportMaterialDailyService;
 import cn.com.ctop.toutiao.modules.report.service.IBytedanceReportMaterialDailyService;
@@ -15,6 +14,7 @@ import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
@@ -33,7 +33,7 @@ import java.util.concurrent.Executors;
 public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideoEtlInfoMapper, BytedanceVideoEtlInfo> implements IBytedanceVideoEtlInfoService {
 public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideoEtlInfoMapper, BytedanceVideoEtlInfo> implements IBytedanceVideoEtlInfoService {
     @Autowired
     @Autowired
     private IBytedanceReportMaterialDailyService materialDailyService;
     private IBytedanceReportMaterialDailyService materialDailyService;
-    @Autowired
+    @Resource
     private UserAllocationMapper userAllocationMapper;
     private UserAllocationMapper userAllocationMapper;
     static ExecutorService executorService = Executors.newFixedThreadPool(100);
     static ExecutorService executorService = Executors.newFixedThreadPool(100);
     @Autowired
     @Autowired
@@ -119,7 +119,40 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
                             etlInfo.setUpdateTime(new Date());
                             etlInfo.setUpdateTime(new Date());
                             this.save(etlInfo);
                             this.save(etlInfo);
                         }else{
                         }else{
-                            //只需要更新汇总数据
+                            JSONObject ascription = materialAscriptionService.getDetailByCode(signature);
+                            String planId = null;
+                            if(null!=ascription){
+                                planId = ascription.getString("planId");
+                                if(null!=planId&&!planId.trim().equals("")){
+                                    etlInfo.setPlanId(planId);
+                                }
+                                String planName =  ascription.getString("planName");
+                                if(null!=planName&&!planName.trim().equals("")){
+                                    etlInfo.setPlanName(planName);
+                                }
+                                String clipId = ascription.getString("clipId");
+                                if(null!=clipId&&!clipId.trim().equals("")){
+                                    etlInfo.setClipId(clipId);
+                                }
+                                String clipName = ascription.getString("clipName");
+                                if(null!=clipName&&!clipName.trim().equals("")){
+                                    etlInfo.setClipName(clipName);
+                                }
+                                String shotId = ascription.getString("shotId");
+                                if(null!=shotId&&!shotId.trim().equals("")){
+                                    etlInfo.setShotId(shotId);
+                                }
+                                String shotName = ascription.getString("shotName");
+                                if(null!=shotName&&!shotName.trim().equals("")){
+                                    etlInfo.setShotName(shotName);
+                                }
+                            }
+                            if(null!=planId){
+                                String companyName = userAllocationMapper.getCompanyNameByUserId(planId);
+                                if (null!=companyName&&!companyName.trim().equals("")){
+                                    etlInfo.setCompanyName(companyName);
+                                }
+                            }
                             etlInfo.setTotalCost(nowData.getTotalCost());
                             etlInfo.setTotalCost(nowData.getTotalCost());
                             BigDecimal totalCost = etlInfo.getTotalCost();
                             BigDecimal totalCost = etlInfo.getTotalCost();
                             etlInfo.setClickNum(nowData.getClickNum());
                             etlInfo.setClickNum(nowData.getClickNum());