浏览代码

Merge remote-tracking branch 'origin/master'

yumeng 4 年之前
父节点
当前提交
320d99eb81

+ 2 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -149,7 +149,8 @@ public class MaterialInfoController {
     public Result<Object> watermarkVideo(@RequestParam(name = "id") String id, @RequestParam(name = "watermarkTemplateId") Long watermarkTemplateId) {
         Result<Object> result = new Result<>();
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        materialInfoService.watermarkVideo(id, watermarkTemplateId, sysUser.getId());
+        Thread thread = new Thread(()-> materialInfoService.watermarkVideo(id, watermarkTemplateId, sysUser.getId()));
+        thread.start();
         result.setCode(200);
         result.setSuccess(true);
         result.setMessage("水印合成任务执行成功,请稍后查看");

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

@@ -11,6 +11,7 @@ import cn.com.ctop.kuaishou.modules.report.mapper.EtlKuaishouAccountMaterialRepo
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyImageService;
 import cn.com.ctop.oa.modules.service.IWechatNoListService;
 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.IByteDanceCampaignService;
 import cn.com.ctop.toutiao.modules.report.service.*;
 import com.csvreader.CsvReader;
@@ -122,18 +123,13 @@ public class SampleTest {
     @Autowired
     private IBytedanceReportService bytedanceReportService;
 
+    @Autowired
+    private IByteDanceAdvertiserDataService advertiserDataService;
+
     @Test
     public void loadBytedanceVideoReportData() {
-        String startDate = "2021-04-01";
-        String endDate = "2021-04-26";
-        List<CtopOauthToken> tokens = tokenService.selectToutiaoToken();
-        Long start = System.currentTimeMillis();
-
-        tokens.forEach(token -> {
-            bytedanceReportService.bytedanceVideoMaterialReport(token, startDate, endDate);
-        });
-        Long end = System.currentTimeMillis();
-        log.info("查询素材消耗用时:{}毫秒", end - start);
+        CtopOauthToken token = tokenService.getTokenByAccountId(1696831659659278L);
+        advertiserDataService.getMaterialList(token);
     }
 
     @Autowired

+ 5 - 5
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -55,13 +55,13 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     private ITencentWatermarkTemplateService tencentWatermarkTemplateService;
     @Resource
     private IVideoWatermarkTaskService videoWatermarkTaskService;
-    @Autowired
+    @Resource
     private MaterialInfoMapper materialInfoMapper;
-    @Autowired
+    @Resource
     private MaterialParameterMapper materialParameterMapper;
-    @Autowired
+    @Resource
     private MaterialAscriptionMapper materialAscriptionMapper;
-    @Autowired
+    @Resource
     private MaterialTagMapper materialTagMapper;
     @Resource
     private IMaterialCutFrameService materialCutFrameService;
@@ -508,7 +508,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             info.setProjectId(projectId);
             info.setWatermarkCode(json.getString("watermarkCode"));
             info.setStatus(0);
-            info.setMaterialName(json.getString("materialName"));
+            info.setMaterialName(StringUtils.getFileNameNoEx(json.getString("materialName")));
             info.setWatermarkMaterialName(json.getString("watermarkMaterialName"));
             info.setMaterialDescribe(json.getString("materialDescribe"));
             info.setCreateTime(new Date());

+ 10 - 0
module-common/src/main/java/cn/com/ctop/common/module/utils/StringUtils.java

@@ -21,6 +21,16 @@ public class StringUtils {
         return list;
     }
 
+    public static String getFileNameNoEx(String filename) {
+        if ((filename != null) && (filename.length() > 0)) {
+            int dot = filename.lastIndexOf('.');
+            if ((dot >-1) && (dot < (filename.length()))) {
+                return filename.substring(0, dot);
+            }
+        }
+        return filename;
+    }
+
     /**
      * 将下划线风格转换为驼峰风格
      * @param inputString

+ 1 - 1
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceAiCreateJob.java

@@ -9,7 +9,7 @@ import java.util.Date;
 
 @Component
 public class BytedanceAiCreateJob {
-    private static final String URLPREFIX = "http://118.24.244.213:8080/bytedance-api//advertiser/aiBytedanceAdvertiserStrategy/autoCreateCreative?hour=";
+    private static final String URLPREFIX = "http://118.24.244.213:8080/bytedance-api/advertiser/aiBytedanceAdvertiserStrategy/autoCreateCreative?hour=";
     @XxlJob("bytedanceAutoCreateJob")
     public void execute() throws Exception {
         String hour = DateUtils.getNowHour(new Date());