2.0.0

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

@@ -101,7 +101,7 @@ public class EvidenceController  extends BaseController {
      **/
     @CheckPermit
     @GetMapping(value = "/traceEvidenceList")
-    public ResultData<List<JSONObject>> traceEvidenceList(@RequestBody JSONObject param) throws Exception {
+    public ResultData<List<JSONObject>> traceEvidenceList(@RequestBody TraceEvidenceListParamVO param) throws Exception {
         return sceneEvidenceService.traceEvidenceList(param);
     }
 
@@ -121,11 +121,7 @@ public class EvidenceController  extends BaseController {
      **/
     @CheckPermit
     @PostMapping("/refreshTraceEvidenceInfoList")
-    public ResultData refreshTraceEvidenceInfoList(@RequestBody JSONObject param) throws Exception {
-        String kno = param.getString("kno");
-        if(StrUtil.isNotEmpty(kno)){
-            return ResultData.ok();
-        }
+    public ResultData refreshTraceEvidenceInfoList(@RequestBody BaseSceneParamVO param) throws Exception {
         return sceneEvidenceService.refreshTraceEvidenceInfoList(kno);
     }
 
@@ -144,8 +140,8 @@ public class EvidenceController  extends BaseController {
      推送痕迹物证
      **/
     @CheckPermit
-    @PostMapping("/pushEvidence")
-    public ResultData pushEvidence(@RequestBody BaseJsonArrayParamVO param) throws Exception {
+    @PostMapping("/addMediaLibrary")
+    public ResultData addMediaLibrary(@RequestBody BaseJsonArrayParamVO param) throws Exception {
         sceneEvidenceService.pushEvidence(param);
         return ResultData.ok();
     }
@@ -155,7 +151,7 @@ public class EvidenceController  extends BaseController {
      推送痕迹物证
      **/
     @CheckPermit
-    @PostMapping("/screenshot/upload")
+    @PostMapping("/addMediaLibrarys")
     public ResultData uploadScreenshot(@RequestParam("files") MultipartFile[] files, @RequestParam("num") String num) throws Exception {
         sceneEvidenceService.uploadScreenshot(files, num);
         return ResultData.ok();

src/main/java/com/fdkankan/scene/entity/Surveillance.java

@@ -100,5 +100,11 @@ public class Surveillance implements Serializable {
     @TableLogic(value = "A", delval = "I")
     private String recStatus;
 
+    /**
+     * 类型
+     */
+    @TableField("file_size")
+    private Integer fileSize;
+
 
 }

src/main/java/com/fdkankan/scene/httpclient/ManageHttpClient.java

@@ -7,6 +7,7 @@ import com.dtflys.forest.extensions.DownloadFile;
 import com.fdkankan.scene.httpclient.address.FdkkAddressSource;
 import com.fdkankan.scene.vo.CheckNumAuthVo;
 import com.fdkankan.scene.vo.TraceEvidenceInfoListParamVo;
+import com.fdkankan.scene.vo.TraceEvidenceListParamVO;
 import com.fdkankan.web.response.ResultData;
 
 import java.io.File;
@@ -17,7 +18,7 @@ import java.util.Map;
 public interface ManageHttpClient {
 
     @Post("/service/manage/inner/traceEvidenceList")
-    ResultData<List<JSONObject>> traceEvidenceList(@JSONBody JSONObject param);
+    ResultData<List<JSONObject>> traceEvidenceList(@JSONBody TraceEvidenceListParamVO param);
 
     @Post("/service/manage/inner/traceEvidenceInfoList")
     ResultData traceEvidenceInfoList(@JSONBody TraceEvidenceInfoListParamVo param);
@@ -25,9 +26,9 @@ public interface ManageHttpClient {
     @Post("/service/manage/inner/refreshTraceEvidenceInfoList/{kno}")
     ResultData refreshTraceEvidenceInfoList(@Var("kno") String kno);
 
-    @Post("/service/manage/inner/push")
-    ResultData push(@JSONBody JSONObject param);
+    @Post("/service/manage/inner/addMediaLibrary")
+    ResultData addMediaLibrary(@JSONBody JSONObject param);
 
-    @Post("/service/manage/inner/push")
-    ResultData pushScreenshot(@JSONBody JSONObject param);
+    @Post("/service/manage/inner/addMediaLibrarys")
+    ResultData addMediaLibrarys(@JSONBody List<JSONObject> param);
 }

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

@@ -36,11 +36,11 @@ public interface ISceneEvidenceService extends IService<SceneEvidence> {
 
     void deleteIcons(DeleteHotIconParamVO param);
 
-    ResultData<List<JSONObject>> traceEvidenceList(JSONObject param);
+    ResultData<List<JSONObject>> traceEvidenceList(TraceEvidenceListParamVO param);
 
     ResultData traceEvidenceInfoList(TraceEvidenceInfoListParamVo param);
 
-    ResultData refreshTraceEvidenceInfoList(String kno);
+    ResultData refreshTraceEvidenceInfoList(BaseSceneParamVO param);
 
     ResultData syncTraceEvidence(SaveEvidenceParamVO param) throws Exception;
 

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

@@ -201,7 +201,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
     }
 
     @Override
-    public ResultData<List<JSONObject>> traceEvidenceList(JSONObject param) {
+    public ResultData<List<JSONObject>> traceEvidenceList(TraceEvidenceListParamVO param) {
         ResultData<List<JSONObject>> resultData = manageHttpClient.traceEvidenceList(param);
         return resultData;
     }
@@ -211,12 +211,18 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         if(StrUtil.isEmpty(param.getKno())){
             return ResultData.ok(new PageInfo<>());
         }
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
+        param.setKno(scenePlus.getKNo());
         return manageHttpClient.traceEvidenceInfoList(param);
     }
 
     @Override
-    public ResultData refreshTraceEvidenceInfoList(String kno) {
-        return manageHttpClient.refreshTraceEvidenceInfoList(kno);
+    public ResultData refreshTraceEvidenceInfoList(BaseSceneParamVO param) {
+        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
+        if(StrUtil.isEmpty(scenePlus.getKNo())){
+            return ResultData.ok();
+        }
+        return manageHttpClient.refreshTraceEvidenceInfoList(scenePlus.getKNo());
     }
 
     @Override
@@ -233,10 +239,11 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
                     JSONObject media = (JSONObject) m;
                     String path = media.getString("path");
                     String fileName = FileUtil.getName(path);
-                    String newFileName = UUID.randomUUID().toString() + "." + FileUtil.extName(fileName);
+                    String newFileName = UUID.randomUUID() + "." + FileUtil.extName(fileName);
                     String meshKey = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + newFileName;
                     fYunFileServiceInterface.copyFileInBucket(path, meshKey);
                     media.put("src", newFileName);
+                    media.remove("path");
                 });
             }
             return data;
@@ -252,7 +259,14 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         String kNo = scenePlus.getKNo();
         for (JSONObject datum : param.getData()) {
-            manageHttpClient.push(datum);
+            String fileName = datum.getString("fileName");
+            String filePath = String.format(UploadFilePath.USER_EDIT_PATH, param.getNum()) + fileName;
+            datum.put("kno", kNo);
+            datum.put("filePath", filePath);
+            datum.put("fileSize", fYunFileServiceInterface.getSpace("4dkankan", filePath));
+            datum.put("delSource", 0);
+            datum.put("toHaixin", 1);
+            manageHttpClient.addMediaLibrary(datum);
         }
     }
 
@@ -266,7 +280,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             return;
         }
 
-        List<String> urlList = new ArrayList<>();
+        List<JSONObject> params = new ArrayList<>();
         for (MultipartFile file : files) {
             String fileName = file.getOriginalFilename();
             // 获取文件后缀
@@ -277,16 +291,18 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             file.transferTo(new File(path));
             String ossPath = String.format(UploadFilePath.SCENE_NUM_PATH, num) + "screenshot/" + fileName;
             fYunFileServiceInterface.uploadFile(path, ossPath);
-            urlList.add(ossPath);
             FileUtils.delFile(path);
+
+            JSONObject param = new JSONObject();
+            params.add(param);
+            param.put("kno", scenePlus.getKNo());
+            param.put("filePath", ossPath);
+            param.put("fileSize", fYunFileServiceInterface.getSpace("4dkankan", ossPath));
+            param.put("delSource", 1);
+            param.put("toHaixin", 1);
         }
 
         //调用案件系统接口,进行推送
-        JSONObject param = new JSONObject();
-        param.put("kno", scenePlus.getKNo());
-        param.put("fileList", urlList);
-        manageHttpClient.pushScreenshot(param);
-
-
+        manageHttpClient.addMediaLibrarys(params);
     }
 }

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

@@ -92,6 +92,7 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
         surveillance.setUrlType(param.getUrlType());
         surveillance.setFileName(param.getFileName());
         surveillance.setPoster(param.getPoster());
+        surveillance.setFileSize(param.getFileSize());
         this.saveOrUpdate(surveillance);
 
         sceneEditInfoExt.setSurveillances(CommonStatus.YES.code().intValue());

src/main/java/com/fdkankan/scene/vo/SurveillanceParamVO.java

@@ -50,4 +50,6 @@ public class SurveillanceParamVO {
 
     private String rtspUrl;
 
+    private Integer fileSize;
+
 }

src/main/java/com/fdkankan/scene/vo/TraceEvidenceInfoListParamVo.java

@@ -3,8 +3,12 @@ package com.fdkankan.scene.vo;
 import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 @Data
 public class TraceEvidenceInfoListParamVo extends RequestBase {
+    @NotBlank(message = "场景码不能为空")
+    private String num;
     private String name;
     private String dictId;
     private String kno;

src/main/java/com/fdkankan/scene/vo/TraceEvidenceListParamVO.java

@@ -0,0 +1,10 @@
+package com.fdkankan.scene.vo;
+
+import lombok.Data;
+
+@Data
+public class TraceEvidenceListParamVO extends BaseSceneParamVO{
+
+    private String name;
+
+}