|
@@ -138,6 +138,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
|
|
|
|
|
|
//判断本地资源是否已本删除,如果已删除,前端根据字段值为true提示用户不能使用某些功能,需要重算
|
|
//判断本地资源是否已本删除,如果已删除,前端根据字段值为true提示用户不能使用某些功能,需要重算
|
|
Date algorithmTime = sceneProEntity.getCreateTime();
|
|
Date algorithmTime = sceneProEntity.getCreateTime();
|
|
|
|
+ jsonObject.put("sourceExpired", false);
|
|
if (!ObjectUtils.isEmpty(expiredMonth) && com.fdkankan.common.util.DateUtil.delay(algorithmTime, expiredMonth, Calendar.MONTH).before(new Date())) {
|
|
if (!ObjectUtils.isEmpty(expiredMonth) && com.fdkankan.common.util.DateUtil.delay(algorithmTime, expiredMonth, Calendar.MONTH).before(new Date())) {
|
|
jsonObject.put("sourceExpired", true);
|
|
jsonObject.put("sourceExpired", true);
|
|
}
|
|
}
|
|
@@ -382,8 +383,8 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
|
|
}
|
|
}
|
|
|
|
|
|
//先从备份文件下拉取
|
|
//先从备份文件下拉取
|
|
- CreateObjUtil.ossUtilCp("video/video" +sceneProEntity.getNum() + File.separator + "back" + File.separator,
|
|
|
|
- sceneProEntity.getDataSource() + "_rv" + File.separator + "videoback_temp");
|
|
|
|
|
|
+ fYunFileService.downloadFileByCommand(sceneProEntity.getDataSource() + "_rv" + File.separator + "videoback_temp",
|
|
|
|
+ "video/video" +sceneProEntity.getNum() + File.separator + "back" + File.separator);
|
|
|
|
|
|
String backpathtemp = sceneProEntity.getDataSource() + "_rv" + File.separator + "videoback_temp";
|
|
String backpathtemp = sceneProEntity.getDataSource() + "_rv" + File.separator + "videoback_temp";
|
|
File fileback = new File(backpathtemp);
|
|
File fileback = new File(backpathtemp);
|