|
@@ -2,10 +2,7 @@ package org.jeecg.modules.ctop.controller;
|
|
|
|
|
|
|
|
|
|
import cn.com.ctop.common.module.entity.MaterialInfo;
|
|
import cn.com.ctop.common.module.entity.MaterialInfo;
|
|
-import cn.com.ctop.common.module.service.IMaterialAscriptionService;
|
|
|
|
-import cn.com.ctop.common.module.service.IMaterialInfoService;
|
|
|
|
-import cn.com.ctop.common.module.service.IMaterialParameterService;
|
|
|
|
-import cn.com.ctop.common.module.service.IMaterialTagService;
|
|
|
|
|
|
+import cn.com.ctop.common.module.service.*;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.JsonUtil;
|
|
import cn.com.ctop.common.module.utils.JsonUtil;
|
|
import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
@@ -76,6 +73,8 @@ public class MaterialInfoController {
|
|
private IByteDanceCleanMaterialReportService byteDanceCleanMaterialReportService;
|
|
private IByteDanceCleanMaterialReportService byteDanceCleanMaterialReportService;
|
|
@Autowired
|
|
@Autowired
|
|
private IKuaiShouCleanMaterialReportService kuaiShouCleanMaterialReportService;
|
|
private IKuaiShouCleanMaterialReportService kuaiShouCleanMaterialReportService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IVideoWatermarkTaskService watermarkTaskService;
|
|
|
|
|
|
@GetMapping(value = "/report")
|
|
@GetMapping(value = "/report")
|
|
public JSONObject report(String userId) {
|
|
public JSONObject report(String userId) {
|
|
@@ -333,6 +332,7 @@ public class MaterialInfoController {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 通过id删除
|
|
* 通过id删除
|
|
*
|
|
*
|
|
@@ -347,10 +347,13 @@ public class MaterialInfoController {
|
|
materialInfoService.removeById(id);
|
|
materialInfoService.removeById(id);
|
|
Map<String, Object> deleteMap = new HashMap<>();
|
|
Map<String, Object> deleteMap = new HashMap<>();
|
|
deleteMap.put("material_id", id);
|
|
deleteMap.put("material_id", id);
|
|
-
|
|
|
|
materialAscriptionService.removeByMap(deleteMap);
|
|
materialAscriptionService.removeByMap(deleteMap);
|
|
materialParameterService.removeByMap(deleteMap);
|
|
materialParameterService.removeByMap(deleteMap);
|
|
materialTagService.removeByMap(deleteMap);
|
|
materialTagService.removeByMap(deleteMap);
|
|
|
|
+ Map<String, Object> deleteWatermarkMap = new HashMap<>();
|
|
|
|
+ deleteWatermarkMap.put("video_id", id);
|
|
|
|
+ watermarkTaskService.removeByMap(deleteWatermarkMap);
|
|
|
|
+
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
log.error("删除失败", e.getMessage());
|
|
log.error("删除失败", e.getMessage());
|
|
return Result.error("删除失败!");
|
|
return Result.error("删除失败!");
|