|
@@ -12,9 +12,11 @@ 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.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
+import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.common.util.DateUtils;
|
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
@@ -66,8 +68,16 @@ public class MaterialInfoController {
|
|
|
return materialInfoService.getDetail(materialId);
|
|
|
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ @PostMapping("watermark")
|
|
|
+ public Result<Object> watermarkVideo(@RequestParam(name = "id")String id,@RequestParam(name = "watermarketTemplateId")Integer watermarketTemplateId){
|
|
|
+ Result<Object> result = new Result<>();
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ materialInfoService.watermarkVideo(id,watermarketTemplateId,sysUser.getId());
|
|
|
+ result.setCode(200);
|
|
|
+ result.setSuccess(true);
|
|
|
+ result.setMessage("水印合成任务执行成功,请稍后查看");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
/**
|
|
|
* 分页列表查询
|
|
|
*
|
|
@@ -77,8 +87,6 @@ public class MaterialInfoController {
|
|
|
* @param req
|
|
|
* @return
|
|
|
*/
|
|
|
-
|
|
|
-
|
|
|
@AutoLog(value = "素材信息-分页列表查询")
|
|
|
@ApiOperation(value = "素材信息-分页列表查询", notes = "素材信息-分页列表查询")
|
|
|
@GetMapping(value = "/list")
|