|
@@ -83,6 +83,8 @@ public class MaterialInfoController {
|
|
|
IUserCompanyService userCompanyService;
|
|
|
@Autowired
|
|
|
private IByteDanceCreativeWordPackageService byteDanceGeneralCopywriterService;
|
|
|
+ @Autowired
|
|
|
+ private ISysUserService userService;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -106,7 +108,7 @@ public class MaterialInfoController {
|
|
|
if (Check.isNull(toProjectIds)) {
|
|
|
throw new Exception("请传入需同步的项目ID");
|
|
|
}
|
|
|
- materialInfoService.materialSync(projectId, toProjectIds);
|
|
|
+ materialInfoService.materialSync(projectId, toProjectIds);
|
|
|
result.setSuccess(true);
|
|
|
|
|
|
|
|
@@ -220,10 +222,9 @@ public class MaterialInfoController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("watermark")
|
|
|
- public Result<Object> watermarkVideo(@RequestParam(name = "id") String id, @RequestParam(name = "watermarkTemplateId") Long watermarkTemplateId) {
|
|
|
+ public Result<Object> watermarkVideo(@RequestParam(name = "id") String id, @RequestParam(name = "watermarkTemplateId") Long watermarkTemplateId, @RequestParam(name = "userId") String userId) {
|
|
|
Result<Object> result = new Result<>();
|
|
|
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
- Thread thread = new Thread(() -> materialInfoService.watermarkVideo(id, watermarkTemplateId, sysUser.getId()));
|
|
|
+ Thread thread = new Thread(() -> materialInfoService.watermarkVideo(id, watermarkTemplateId, userId));
|
|
|
thread.start();
|
|
|
result.setCode(200);
|
|
|
result.setSuccess(true);
|