|
@@ -3,7 +3,10 @@ package cn.com.ctop.common.module.service.impl;
|
|
|
import cn.com.ctop.common.module.constant.CosConstant;
|
|
|
import cn.com.ctop.common.module.entity.*;
|
|
|
import cn.com.ctop.common.module.enums.MaterialSupplierEnum;
|
|
|
-import cn.com.ctop.common.module.mapper.*;
|
|
|
+import cn.com.ctop.common.module.mapper.MaterialAscriptionMapper;
|
|
|
+import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
|
|
|
+import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
|
|
|
+import cn.com.ctop.common.module.mapper.MaterialTagMapper;
|
|
|
import cn.com.ctop.common.module.service.*;
|
|
|
import cn.com.ctop.common.module.utils.*;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
@@ -480,8 +483,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
@Autowired
|
|
|
private IMaterialImageInfoService materialImageInfoService;
|
|
|
@Autowired
|
|
@@ -506,7 +507,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
MaterialInfo info = new MaterialInfo();
|
|
|
Long projectId = json.getLong("projectId");
|
|
|
String code = json.getString("code");
|
|
|
- info.setId(code + "_" + projectId);
|
|
|
+ info.setId(UUID.randomUUID().toString().replace("-", ""));
|
|
|
info.setCode(code);
|
|
|
if (!Check.isNull(json.getString("watermarkUrl"))) {
|
|
|
info.setWatermarkUrl(json.getString("watermarkUrl"));
|
|
@@ -566,7 +567,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
MaterialAscription materialAscription = new MaterialAscription();
|
|
|
materialAscription.setMaterialId(info.getCode());
|
|
|
String clipId = ascription.getString("clipId");
|
|
|
- if(null!=clipId&&!"".equals(clipId.trim())){
|
|
|
+ if (null != clipId && !"".equals(clipId.trim())) {
|
|
|
materialAscription.setClipId(clipId);
|
|
|
}
|
|
|
materialAscription.setShotId(ascription.getString("shotId"));
|