|
@@ -1,5 +1,6 @@
|
|
|
package com.fdkankan.scene.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.date.TimeInterval;
|
|
@@ -198,7 +199,15 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
|
|
|
sceneEvidence.setSid(v.getSid());
|
|
|
}
|
|
|
sceneEvidence.setUpdateTime(null);
|
|
|
- sceneEvidence.setEvidenceContent(v.getData());
|
|
|
+ JSONObject evidenceContent = BeanUtil.copyProperties(v.getData(), JSONObject.class);
|
|
|
+ JSONArray medias = evidenceContent.getJSONArray("media");
|
|
|
+ if(CollUtil.isNotEmpty(medias)){
|
|
|
+ for (Object o : medias) {
|
|
|
+ LinkedHashMap media = (LinkedHashMap) o;
|
|
|
+ media.remove("isAddMedia");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ sceneEvidence.setEvidenceContent(evidenceContent);
|
|
|
return sceneEvidence;
|
|
|
}).collect(Collectors.toList());
|
|
|
this.saveOrUpdateBatch(collect);
|
|
@@ -341,9 +350,9 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
|
|
|
JSONArray medias = data.getJSONArray("media");
|
|
|
if (CollUtil.isNotEmpty(medias)) {
|
|
|
medias.stream().forEach(m -> {
|
|
|
- JSONObject media = (JSONObject) m;
|
|
|
- String sid = media.getString("sid");
|
|
|
- String path = media.getString("src");
|
|
|
+ LinkedHashMap media = (LinkedHashMap) m;
|
|
|
+ String sid = (String) media.get("sid");
|
|
|
+ String path = (String)media.get("src");
|
|
|
String fileName = FileUtil.getName(path);
|
|
|
String newFileName = sid + "." + FileUtil.extName(fileName);
|
|
|
String meshKey = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + newFileName;
|