|
@@ -54,7 +54,7 @@ public class PlatformFileCtrl {
|
|
if (file.isEmpty() || !((file.getOriginalFilename().endsWith(".zip") || file.getOriginalFilename().endsWith(".rar") || file.getOriginalFilename().endsWith(".7z")))) {
|
|
if (file.isEmpty() || !((file.getOriginalFilename().endsWith(".zip") || file.getOriginalFilename().endsWith(".rar") || file.getOriginalFilename().endsWith(".7z")))) {
|
|
result.error500("请上传正确的压缩文件");
|
|
result.error500("请上传正确的压缩文件");
|
|
} else {
|
|
} else {
|
|
- String fileName = projectId + "_" + System.currentTimeMillis()+"_"+file.getOriginalFilename();
|
|
|
|
|
|
+ String fileName = projectId + "_" + System.currentTimeMillis() + "_" + file.getOriginalFilename();
|
|
InputStream inputStream = null;
|
|
InputStream inputStream = null;
|
|
try {
|
|
try {
|
|
inputStream = file.getInputStream();
|
|
inputStream = file.getInputStream();
|
|
@@ -81,14 +81,14 @@ public class PlatformFileCtrl {
|
|
Result<Object> result = new Result<>();
|
|
Result<Object> result = new Result<>();
|
|
try {
|
|
try {
|
|
// 脚本上传成功需要返回脚本id,更新物料表,更新完成后去更新脚本库的绑定项目
|
|
// 脚本上传成功需要返回脚本id,更新物料表,更新完成后去更新脚本库的绑定项目
|
|
- PlatformScript script = platformScriptService.saveScript(file);
|
|
|
|
|
|
+ PlatformScript script = platformScriptService.saveScript(file,projectId);
|
|
if (null == script) {
|
|
if (null == script) {
|
|
result.error500("脚本上传失败");
|
|
result.error500("脚本上传失败");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
//物料状态->脚本已上传,待审核
|
|
//物料状态->脚本已上传,待审核
|
|
PlatformMaterial platformMaterial = platformMaterialService.getById(materialId);
|
|
PlatformMaterial platformMaterial = platformMaterialService.getById(materialId);
|
|
- if(platformMaterial.getScriptStatus()!=0||platformMaterial.getScriptStatus()!=2){
|
|
|
|
|
|
+ if (platformMaterial.getScriptStatus() ==3) {
|
|
result.error500("数据已更新,请刷新页面");
|
|
result.error500("数据已更新,请刷新页面");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
@@ -98,11 +98,8 @@ public class PlatformFileCtrl {
|
|
platformMaterial.setScriptId(script.getId());
|
|
platformMaterial.setScriptId(script.getId());
|
|
boolean save = platformMaterialService.updateById(platformMaterial);
|
|
boolean save = platformMaterialService.updateById(platformMaterial);
|
|
if (save) {
|
|
if (save) {
|
|
- // 更新脚本库的绑定项目
|
|
|
|
- script.setProjectId(projectId);
|
|
|
|
- platformScriptService.updateById(script);
|
|
|
|
operateRecordHandler.Submit(platformMaterial.getMaterialCode(), "SCRIPT");
|
|
operateRecordHandler.Submit(platformMaterial.getMaterialCode(), "SCRIPT");
|
|
- approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("SCRIPT",platformMaterial.getMaterialCode());
|
|
|
|
|
|
+ approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("SCRIPT", platformMaterial.getMaterialCode());
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
@@ -111,31 +108,32 @@ public class PlatformFileCtrl {
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping("/uploadVideo")
|
|
@PostMapping("/uploadVideo")
|
|
- public Result<Object> uploadVideo(@RequestBody JSONObject requestBody){
|
|
|
|
|
|
+ public Result<Object> uploadVideo(@RequestBody JSONObject requestBody) {
|
|
Result<Object> result = new Result<>();
|
|
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("视频已被其他物料上传,请重新选择视频");
|
|
result.error500("视频已被其他物料上传,请重新选择视频");
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
String videoMd5 = platformVideoService.uploadVideo(requestBody);
|
|
String videoMd5 = platformVideoService.uploadVideo(requestBody);
|
|
- if(videoMd5.isEmpty()){
|
|
|
|
|
|
+ if (videoMd5.isEmpty()) {
|
|
result.error500("素材视频上传失败,参数为空");
|
|
result.error500("素材视频上传失败,参数为空");
|
|
- }else {
|
|
|
|
|
|
+ } else {
|
|
//物料状态->视频已上传,待审核
|
|
//物料状态->视频已上传,待审核
|
|
PlatformMaterial platformMaterial = platformMaterialService.getById(requestBody.getString("materialId"));
|
|
PlatformMaterial platformMaterial = platformMaterialService.getById(requestBody.getString("materialId"));
|
|
- if(platformMaterial.getVideoStatus()!=0||platformMaterial.getVideoStatus()!=2){
|
|
|
|
|
|
+ if (platformMaterial.getVideoStatus() ==3) {
|
|
result.error500("数据已更新,请刷新页面");
|
|
result.error500("数据已更新,请刷新页面");
|
|
return result;
|
|
return result;
|
|
- } platformMaterial.setId(requestBody.getLong("materialId"));
|
|
|
|
|
|
+ }
|
|
|
|
+ platformMaterial.setId(requestBody.getLong("materialId"));
|
|
platformMaterial.setMaterialStatus(5);
|
|
platformMaterial.setMaterialStatus(5);
|
|
platformMaterial.setVideoStatus(1);
|
|
platformMaterial.setVideoStatus(1);
|
|
platformMaterial.setVideoId(videoMd5);
|
|
platformMaterial.setVideoId(videoMd5);
|
|
boolean save = platformMaterialService.updateById(platformMaterial);
|
|
boolean save = platformMaterialService.updateById(platformMaterial);
|
|
if (save) {
|
|
if (save) {
|
|
operateRecordHandler.Submit(platformMaterial.getMaterialCode(), "VIDEO");
|
|
operateRecordHandler.Submit(platformMaterial.getMaterialCode(), "VIDEO");
|
|
- approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("VIDEO",platformMaterial.getMaterialCode());
|
|
|
|
|
|
+ approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("VIDEO", platformMaterial.getMaterialCode());
|
|
result.success("素材视频上传成功");
|
|
result.success("素材视频上传成功");
|
|
}
|
|
}
|
|
}
|
|
}
|