|
@@ -22,6 +22,7 @@ import it.sauronsoftware.jave.EncoderException;
|
|
|
import it.sauronsoftware.jave.MultimediaInfo;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
+import org.jeecg.common.system.entity.SysUser;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.common.util.encryption.AesEncryptUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -531,13 +532,11 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
info.setCreateTime(new Date());
|
|
|
info.setUpdateTime(new Date());
|
|
|
info.setType(type);
|
|
|
- //TODO 此处逻辑待调整
|
|
|
- // Project project = projectService.getById(projectId);
|
|
|
- if (!Check.isNull(project)) {
|
|
|
- if (!Check.isNull(project.getSupplierCode())) {
|
|
|
- info.setSupplierCode(project.getSupplierCode());
|
|
|
- }
|
|
|
+
|
|
|
+ if (!Check.isNull(project.getSupplierCode())) {
|
|
|
+ info.setSupplierCode(project.getSupplierCode());
|
|
|
}
|
|
|
+
|
|
|
MaterialCutFrame cutFrame = materialCutFrameService.getCutFrameByCode(code);
|
|
|
if (Check.isNull(cutFrame)) {
|
|
|
String videoUrl = URLDecoder.decode(info.getUrl()).replace("https://media-1301855440.cos.ap-chongqing.myqcloud.com/", "");
|
|
@@ -583,6 +582,16 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
materialAscription.setPlaneId(ascription.getString("planeId"));
|
|
|
materialAscription.setCode(info.getCode());
|
|
|
materialAscriptionMapper.deleteByMap(deleteMap);
|
|
|
+ //TODO 需要添加获取设计负责人代码
|
|
|
+ SysUser clip = userService.getById(clipId);
|
|
|
+ String roleCode = userService.getRoleCodeByUserId(clipId);
|
|
|
+ if("designTeamLeader".equals(roleCode)){
|
|
|
+ materialAscription.setLeaderId(clipId);
|
|
|
+ materialAscription.setLeaderName(clip.getRealname());
|
|
|
+ }else{
|
|
|
+ materialAscription.setLeaderId(clip.getLeaderId());
|
|
|
+ materialAscription.setLeaderName(clip.getLeaderName());
|
|
|
+ }
|
|
|
int result = materialAscriptionMapper.insert(materialAscription);
|
|
|
if (result > 0) {
|
|
|
log.info("素材归属信息入库完成,MaterialId:{}", info.getId());
|
|
@@ -605,6 +614,8 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
}
|
|
|
return resultMap;
|
|
|
}
|
|
|
+ @Autowired
|
|
|
+ private ISysUserService userService;
|
|
|
|
|
|
@Override
|
|
|
public String platformUploadVideo(JSONObject json) {
|