|
@@ -2,18 +2,16 @@ package org.jeecg.modules.orderplatform.controller;
|
|
|
|
|
|
import cn.com.ctop.common.module.utils.CosUtils;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.xxl.job.core.biz.model.ReturnT;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.shiro.SecurityUtils;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
-import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.common.util.DateUtils;
|
|
|
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.IPlatformScriptService;
|
|
|
import org.jeecg.modules.orderplatform.service.IPlatformVideoService;
|
|
|
+import org.jeecg.modules.orderplatform.util.ApprovalNodeNoticeHandler;
|
|
|
import org.jeecg.modules.orderplatform.util.OperateRecordHandler;
|
|
|
-import org.jeecg.modules.wps.entity.WpsFile;
|
|
|
-import org.jeecg.modules.wps.service.IWpsFileService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
@@ -35,7 +33,7 @@ public class PlatformFileCtrl {
|
|
|
private IPlatformVideoService platformVideoService;
|
|
|
|
|
|
@Autowired
|
|
|
- private IWpsFileService wpsFileService;
|
|
|
+ private IPlatformScriptService platformScriptService;
|
|
|
|
|
|
@Autowired
|
|
|
private IPlatformMaterialService platformMaterialService;
|
|
@@ -43,6 +41,9 @@ public class PlatformFileCtrl {
|
|
|
@Autowired
|
|
|
private OperateRecordHandler operateRecordHandler;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ApprovalNodeNoticeHandler approvalNodeNoticeHandler;
|
|
|
+
|
|
|
/**
|
|
|
* 新建订单上传附件
|
|
|
*/
|
|
@@ -53,7 +54,7 @@ public class PlatformFileCtrl {
|
|
|
if (file.isEmpty() || !((file.getOriginalFilename().endsWith(".zip") || file.getOriginalFilename().endsWith(".rar") || file.getOriginalFilename().endsWith(".7z")))) {
|
|
|
result.error500("请上传正确的压缩文件");
|
|
|
} else {
|
|
|
- String fileName = projectId + "_" + System.currentTimeMillis()+"_"+file.getOriginalFilename();
|
|
|
+ String fileName = projectId + "_" + System.currentTimeMillis() + "_" + file.getOriginalFilename();
|
|
|
InputStream inputStream = null;
|
|
|
try {
|
|
|
inputStream = file.getInputStream();
|
|
@@ -79,27 +80,26 @@ public class PlatformFileCtrl {
|
|
|
@RequestParam("projectId") Long projectId) {
|
|
|
Result<Object> result = new Result<>();
|
|
|
try {
|
|
|
- LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
// 脚本上传成功需要返回脚本id,更新物料表,更新完成后去更新脚本库的绑定项目
|
|
|
- WpsFile wpsFile = wpsFileService.uploadFile(file, user.getId());
|
|
|
- if (null == wpsFile) {
|
|
|
+ PlatformScript script = platformScriptService.saveScript(file,projectId);
|
|
|
+ if (null == script) {
|
|
|
result.error500("脚本上传失败");
|
|
|
return result;
|
|
|
}
|
|
|
//物料状态->脚本已上传,待审核
|
|
|
- PlatformMaterial platformMaterial = new PlatformMaterial();
|
|
|
+ PlatformMaterial platformMaterial = platformMaterialService.getById(materialId);
|
|
|
+ if (platformMaterial.getScriptStatus() ==3) {
|
|
|
+ result.error500("数据已更新,请刷新页面");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
platformMaterial.setId(materialId);
|
|
|
platformMaterial.setMaterialStatus(2);
|
|
|
platformMaterial.setScriptStatus(1);
|
|
|
- platformMaterial.setScriptId(wpsFile.getId());
|
|
|
+ platformMaterial.setScriptId(script.getId());
|
|
|
boolean save = platformMaterialService.updateById(platformMaterial);
|
|
|
if (save) {
|
|
|
- // 更新脚本库的绑定项目
|
|
|
- wpsFile.setProjectId(projectId);
|
|
|
- // Todo 暂时兼容题库
|
|
|
- wpsFile.setIsScript(0);
|
|
|
- wpsFileService.updateById(wpsFile);
|
|
|
- operateRecordHandler.Submit(platformMaterialService.getById(materialId).getMaterialCode(), "SCRIPT");
|
|
|
+ operateRecordHandler.Submit(platformMaterial.getMaterialCode(), "SCRIPT");
|
|
|
+ approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("SCRIPT", platformMaterial.getMaterialCode());
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
@@ -107,60 +107,33 @@ public class PlatformFileCtrl {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 剪辑上传视频
|
|
|
- * Todo 在下单制正式上线后,这个接口会改造
|
|
|
- */
|
|
|
-/* @PostMapping("/uploadVideo")
|
|
|
- public Result<Object> uploadVideoOld(@RequestBody JSONObject requestBody) {
|
|
|
- Result<Object> result = new Result<>();
|
|
|
- String videoId = materialInfoService.platformUploadVideo(requestBody);
|
|
|
- if (videoId.isEmpty()) {
|
|
|
- result.error500("同步素材库失败,请联系管理员");
|
|
|
- } else {
|
|
|
- //物料状态->视频已上传,待审核
|
|
|
- PlatformMaterial platformMaterial = new PlatformMaterial();
|
|
|
- platformMaterial.setId(requestBody.getLong("materialId"));
|
|
|
- platformMaterial.setMaterialStatus(5);
|
|
|
- platformMaterial.setVideoStatus(1);
|
|
|
- platformMaterial.setVideoId(videoId);
|
|
|
- boolean save = platformMaterialService.updateById(platformMaterial);
|
|
|
- if (save) {
|
|
|
- operateRecordHandler.Submit(platformMaterialService.getById(requestBody.getString("materialId")).getMaterialCode(), "VIDEO");
|
|
|
- result.success("同步素材库成功");
|
|
|
- }
|
|
|
- }
|
|
|
- return result;
|
|
|
- }*/
|
|
|
-
|
|
|
- /*
|
|
|
- * 改造上传视频接口,视频上传后会存在下单制视频列表,审核通过后会被写入汇创思拓素材库ctop_material_video_info
|
|
|
- * 下单制视频列表不会有删除操作,被驳回后标记逻辑删除
|
|
|
- * 审批通过后视频关联信息被写入ctop_material_video_project、ctop_material_video_author、ctop_material_video_frame
|
|
|
- * ctop_material_video_cover、ctop_material_video_tag、ctop_material_video_watermark
|
|
|
- */
|
|
|
@PostMapping("/uploadVideo")
|
|
|
- public Result<Object> uploadVideo(@RequestBody JSONObject requestBody){
|
|
|
+ public Result<Object> uploadVideo(@RequestBody JSONObject requestBody) {
|
|
|
Result<Object> result = new Result<>();
|
|
|
//同一个视频不能出现在不同的物料下
|
|
|
- int repeat=platformMaterialService.queryCountByMaterialAndVideo(requestBody.getString("materialCode"),requestBody.getString("md5"));
|
|
|
- if(repeat>0){
|
|
|
+ int repeat = platformMaterialService.queryCountByMaterialAndVideo(requestBody.getString("materialCode"), requestBody.getString("md5"));
|
|
|
+ if (repeat > 0) {
|
|
|
result.error500("视频已被其他物料上传,请重新选择视频");
|
|
|
return result;
|
|
|
}
|
|
|
String videoMd5 = platformVideoService.uploadVideo(requestBody);
|
|
|
- if(videoMd5.isEmpty()){
|
|
|
+ if (videoMd5.isEmpty()) {
|
|
|
result.error500("素材视频上传失败,参数为空");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
//物料状态->视频已上传,待审核
|
|
|
- PlatformMaterial platformMaterial = new PlatformMaterial();
|
|
|
+ PlatformMaterial platformMaterial = platformMaterialService.getById(requestBody.getString("materialId"));
|
|
|
+ if (platformMaterial.getVideoStatus() ==3) {
|
|
|
+ result.error500("数据已更新,请刷新页面");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
platformMaterial.setId(requestBody.getLong("materialId"));
|
|
|
platformMaterial.setMaterialStatus(5);
|
|
|
platformMaterial.setVideoStatus(1);
|
|
|
platformMaterial.setVideoId(videoMd5);
|
|
|
boolean save = platformMaterialService.updateById(platformMaterial);
|
|
|
if (save) {
|
|
|
- operateRecordHandler.Submit(platformMaterialService.getById(requestBody.getString("materialId")).getMaterialCode(), "VIDEO");
|
|
|
+ operateRecordHandler.Submit(platformMaterial.getMaterialCode(), "VIDEO");
|
|
|
+ approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("VIDEO", platformMaterial.getMaterialCode());
|
|
|
result.success("素材视频上传成功");
|
|
|
}
|
|
|
}
|