|
@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
|
|
import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
|
|
|
|
+import org.jeecg.modules.orderplatform.entity.PlatformScript;
|
|
import org.jeecg.modules.orderplatform.service.IPlatformMaterialService;
|
|
import org.jeecg.modules.orderplatform.service.IPlatformMaterialService;
|
|
import org.jeecg.modules.orderplatform.service.IPlatformOrderService;
|
|
import org.jeecg.modules.orderplatform.service.IPlatformOrderService;
|
|
import org.jeecg.modules.orderplatform.util.DictHandler;
|
|
import org.jeecg.modules.orderplatform.util.DictHandler;
|
|
@@ -43,14 +44,14 @@ public class PlatformMaterialCtrl {
|
|
*/
|
|
*/
|
|
@GetMapping(value = "/listByOrderCode")
|
|
@GetMapping(value = "/listByOrderCode")
|
|
public Result<PageInfo<PlatformMaterial>> listByOrderCode(PlatformMaterial platformMaterial,
|
|
public Result<PageInfo<PlatformMaterial>> listByOrderCode(PlatformMaterial platformMaterial,
|
|
- @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
- @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
|
- HttpServletRequest req) {
|
|
|
|
|
|
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
|
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
|
+ HttpServletRequest req) {
|
|
Result<PageInfo<PlatformMaterial>> result = new Result<>();
|
|
Result<PageInfo<PlatformMaterial>> result = new Result<>();
|
|
QueryWrapper<PlatformMaterial> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<PlatformMaterial> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.setEntity(platformMaterial);
|
|
queryWrapper.setEntity(platformMaterial);
|
|
- PageHelper.startPage(pageNo,pageSize);
|
|
|
|
- List<PlatformMaterial> platformMaterialList= platformMaterialService.list(queryWrapper);
|
|
|
|
|
|
+ PageHelper.startPage(pageNo, pageSize);
|
|
|
|
+ List<PlatformMaterial> platformMaterialList = platformMaterialService.list(queryWrapper);
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(new PageInfo<>(dictHandler.dictHandlerMaterial(platformMaterialList)));
|
|
result.setResult(new PageInfo<>(dictHandler.dictHandlerMaterial(platformMaterialList)));
|
|
return result;
|
|
return result;
|
|
@@ -87,6 +88,22 @@ public class PlatformMaterialCtrl {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 脚本是否可更新
|
|
|
|
+ */
|
|
|
|
+ @GetMapping(value = "/verifyScript")
|
|
|
|
+ public Result<Object> verifyScript(String materialCode, String scriptId) {
|
|
|
|
+ Result<Object> result = new Result<>();
|
|
|
|
+ QueryWrapper<PlatformMaterial> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.eq("material_code", materialCode);
|
|
|
|
+ PlatformMaterial platformMaterial = platformMaterialService.getOne(queryWrapper);
|
|
|
|
+ if (platformMaterial.getScriptId().equals(scriptId)) {
|
|
|
|
+ result.setSuccess(true);
|
|
|
|
+ } else {
|
|
|
|
+ result.error500("脚本信息已被更改,请刷新后操作");
|
|
|
|
+ }
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
/**
|
|
* 运营审核脚本
|
|
* 运营审核脚本
|
|
@@ -100,7 +117,7 @@ public class PlatformMaterialCtrl {
|
|
platformMaterial.setVideoStatus(0);
|
|
platformMaterial.setVideoStatus(0);
|
|
boolean ok = platformMaterialService.updateById(platformMaterial);
|
|
boolean ok = platformMaterialService.updateById(platformMaterial);
|
|
if (ok) {
|
|
if (ok) {
|
|
- operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"ACCEPT_SCRIPT");
|
|
|
|
|
|
+ operateRecordHandler.Approval(platformMaterial.getMaterialCode(), "ACCEPT_SCRIPT");
|
|
result.success("脚本审核通过!");
|
|
result.success("脚本审核通过!");
|
|
} else {
|
|
} else {
|
|
result.error500("脚本审核失败!请联系管理员");
|
|
result.error500("脚本审核失败!请联系管理员");
|
|
@@ -117,7 +134,7 @@ public class PlatformMaterialCtrl {
|
|
platformMaterial.setScriptStatus(2);
|
|
platformMaterial.setScriptStatus(2);
|
|
boolean ok = platformMaterialService.updateById(platformMaterial);
|
|
boolean ok = platformMaterialService.updateById(platformMaterial);
|
|
if (ok) {
|
|
if (ok) {
|
|
- operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"REJECT_SCRIPT");
|
|
|
|
|
|
+ operateRecordHandler.Approval(platformMaterial.getMaterialCode(), "REJECT_SCRIPT");
|
|
result.success("脚本已驳回!");
|
|
result.success("脚本已驳回!");
|
|
} else {
|
|
} else {
|
|
result.error500("脚本驳回失败!请联系管理员");
|
|
result.error500("脚本驳回失败!请联系管理员");
|
|
@@ -138,6 +155,23 @@ public class PlatformMaterialCtrl {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
|
|
+ * 视频是否可以更新
|
|
|
|
+ */
|
|
|
|
+ @GetMapping(value = "/verifyVideo")
|
|
|
|
+ public Result<Object> verifyVideo(String materialCode, String videoId) {
|
|
|
|
+ Result<Object> result = new Result<>();
|
|
|
|
+ QueryWrapper<PlatformMaterial> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.eq("material_code", materialCode);
|
|
|
|
+ PlatformMaterial platformMaterial = platformMaterialService.getOne(queryWrapper);
|
|
|
|
+ if (platformMaterial.getVideoId().equals(videoId)) {
|
|
|
|
+ result.setSuccess(true);
|
|
|
|
+ } else {
|
|
|
|
+ result.error500("视频信息已被更改,请刷新后操作");
|
|
|
|
+ }
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
* 运营审核视频
|
|
* 运营审核视频
|
|
*/
|
|
*/
|
|
@PostMapping(value = "/video/accept")
|
|
@PostMapping(value = "/video/accept")
|
|
@@ -145,7 +179,7 @@ public class PlatformMaterialCtrl {
|
|
Result<Object> result = new Result<>();
|
|
Result<Object> result = new Result<>();
|
|
//视频通过同步到素材库
|
|
//视频通过同步到素材库
|
|
boolean sync = platformMaterialService.syncVideo2CTopMaterial(platformMaterial);
|
|
boolean sync = platformMaterialService.syncVideo2CTopMaterial(platformMaterial);
|
|
- if(!sync){
|
|
|
|
|
|
+ if (!sync) {
|
|
result.error500("视频同步素材库失败");
|
|
result.error500("视频同步素材库失败");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
@@ -157,7 +191,7 @@ public class PlatformMaterialCtrl {
|
|
//更新订单的素材完成数
|
|
//更新订单的素材完成数
|
|
boolean order = platformOrderService.updateOrderFinishAmount(platformMaterial.getOrderCode());
|
|
boolean order = platformOrderService.updateOrderFinishAmount(platformMaterial.getOrderCode());
|
|
if (order) {
|
|
if (order) {
|
|
- operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"ACCEPT_VIDEO");
|
|
|
|
|
|
+ operateRecordHandler.Approval(platformMaterial.getMaterialCode(), "ACCEPT_VIDEO");
|
|
//修改素材库审核状态
|
|
//修改素材库审核状态
|
|
//platformMaterialService.updateMaterialStatusById(platformMaterial.getVideoId());
|
|
//platformMaterialService.updateMaterialStatusById(platformMaterial.getVideoId());
|
|
result.success("视频审核通过!");
|
|
result.success("视频审核通过!");
|
|
@@ -177,7 +211,7 @@ public class PlatformMaterialCtrl {
|
|
platformMaterial.setVideoStatus(2);
|
|
platformMaterial.setVideoStatus(2);
|
|
boolean ok = platformMaterialService.updateById(platformMaterial);
|
|
boolean ok = platformMaterialService.updateById(platformMaterial);
|
|
if (ok) {
|
|
if (ok) {
|
|
- operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"REJECT_VIDEO");
|
|
|
|
|
|
+ operateRecordHandler.Approval(platformMaterial.getMaterialCode(), "REJECT_VIDEO");
|
|
result.success("视频已驳回!");
|
|
result.success("视频已驳回!");
|
|
} else {
|
|
} else {
|
|
result.error500("视频驳回失败!请联系管理员");
|
|
result.error500("视频驳回失败!请联系管理员");
|
|
@@ -198,12 +232,12 @@ public class PlatformMaterialCtrl {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 视频修改回显
|
|
|
|
|
|
+ * 视频修改回显
|
|
*/
|
|
*/
|
|
@GetMapping(value = "/videoEcho")
|
|
@GetMapping(value = "/videoEcho")
|
|
- public Result<Map<String,Object>> videoEcho(String videoId) {
|
|
|
|
- Result<Map<String,Object>> result = new Result<>();
|
|
|
|
- Map<String,Object> scriptDetail = platformMaterialService.videoEcho(videoId);
|
|
|
|
|
|
+ public Result<Map<String, Object>> videoEcho(String videoId) {
|
|
|
|
+ Result<Map<String, Object>> result = new Result<>();
|
|
|
|
+ Map<String, Object> scriptDetail = platformMaterialService.videoEcho(videoId);
|
|
result.setResult(scriptDetail);
|
|
result.setResult(scriptDetail);
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
return result;
|
|
return result;
|