2.0.0

src/main/java/com/fdkankan/scene/controller/EvidenceController.java

@@ -3,6 +3,7 @@ package com.fdkankan.scene.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.dtflys.forest.annotation.JSONBody;
 import com.fdkankan.scene.annotation.CheckPermit;
 import com.fdkankan.scene.annotation.SaveLog;
 import com.fdkankan.scene.service.ISceneEvidenceService;
@@ -152,8 +153,8 @@ public class EvidenceController  extends BaseController {
      **/
     @CheckPermit
     @PostMapping("/addMediaLibrarys")
-    public ResultData uploadScreenshot(@RequestParam("files") MultipartFile[] files, @RequestParam("num") String num) throws Exception {
-        sceneEvidenceService.uploadScreenshot(files, num);
+    public ResultData uploadScreenshot(@RequestPart("files") MultipartFile[] files, @RequestPart("data") BaseJsonArrayParamVO data) throws Exception {
+        sceneEvidenceService.uploadScreenshot(files, data);
         return ResultData.ok();
     }
 

src/main/java/com/fdkankan/scene/service/ISceneEvidenceService.java

@@ -47,5 +47,5 @@ public interface ISceneEvidenceService extends IService<SceneEvidence> {
 
     void pushEvidence(BaseJsonArrayParamVO param);
 
-    void uploadScreenshot(MultipartFile[] files, String num) throws IOException;
+    void uploadScreenshot(MultipartFile[] files, BaseJsonArrayParamVO data) throws IOException;
 }

src/main/java/com/fdkankan/scene/service/impl/SceneEvidenceServiceImpl.java

@@ -368,7 +368,9 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
     }
 
     @Override
-    public void uploadScreenshot(MultipartFile[] files, String num) throws IOException {
+    public void uploadScreenshot(MultipartFile[] files, BaseJsonArrayParamVO data) throws IOException {
+        String num = data.getNum();
+        Map<String, JSONObject> fileDataMap = data.getData().stream().collect(Collectors.toMap(v -> v.getString("fileName"), v -> v));
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         if(scenePlus == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
@@ -397,6 +399,8 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             param.put("fileSize", fYunFileServiceInterface.getSpace("4dkankan", ossPath));
             param.put("delSource", 1);
             param.put("toHaixin", 1);
+            param.put("num", num);
+            param.put("category", fileDataMap.get(file.getOriginalFilename()).getString("category"));
         }
 
         //调用案件系统接口,进行推送