2.0.0

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

@@ -25,8 +25,6 @@ public class EvidenceController  extends BaseController {
 
     @Autowired
     private ISceneEvidenceService sceneEvidenceService;
-    @Autowired
-    private JmgaSSOLoginHelper jmgaSSOLoginHelper;
 
 
     /**
@@ -42,8 +40,7 @@ public class EvidenceController  extends BaseController {
     @CheckPermit
     @PostMapping(value = "/save")
     public ResultData<Void> save(@RequestBody @Validated SaveEvidenceParamVO param) throws Exception {
-        SSOUser user = jmgaSSOLoginHelper.getSsoUser(request.getHeader("token"));
-        sceneEvidenceService.saveEvidence(param, user);
+        sceneEvidenceService.saveEvidence(param, request.getHeader("token"));
         return ResultData.ok();
     }
 
@@ -107,7 +104,7 @@ public class EvidenceController  extends BaseController {
     @CheckPermit
     @PostMapping(value = "/traceEvidenceList")
     public ResultData<List<JSONObject>> traceEvidenceList(@RequestBody TraceEvidenceListParamVO param) throws Exception {
-        return sceneEvidenceService.traceEvidenceList(param);
+        return sceneEvidenceService.traceEvidenceList(request.getHeader("token"), param);
     }
 
     /**
@@ -117,7 +114,7 @@ public class EvidenceController  extends BaseController {
     @CheckPermit
     @PostMapping(value = "/traceEvidenceInfoList")
     public ResultData traceEvidenceInfoList(@RequestBody TraceEvidenceInfoListParamVo param) throws Exception {
-        return sceneEvidenceService.traceEvidenceInfoList(param);
+        return sceneEvidenceService.traceEvidenceInfoList(request.getHeader("token"), param);
     }
 
     /**
@@ -127,7 +124,7 @@ public class EvidenceController  extends BaseController {
     @CheckPermit
     @PostMapping("/refreshTraceEvidenceInfoList")
     public ResultData refreshTraceEvidenceInfoList(@RequestBody BaseSceneParamVO param) throws Exception {
-        return sceneEvidenceService.refreshTraceEvidenceInfoList(param);
+        return sceneEvidenceService.refreshTraceEvidenceInfoList(request.getHeader("token"), param);
     }
 
     /**
@@ -158,7 +155,7 @@ public class EvidenceController  extends BaseController {
     @CheckPermit
     @PostMapping("/addMediaLibrarys")
     public ResultData uploadScreenshot(@RequestPart("files") MultipartFile[] files, @RequestPart("data") BaseJsonArrayParamVO data) throws Exception {
-        sceneEvidenceService.uploadScreenshot(files, data);
+        sceneEvidenceService.uploadScreenshot(request.getHeader("token"), files, data);
         return ResultData.ok();
     }
 

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

@@ -18,17 +18,17 @@ import java.util.Map;
 public interface ManageHttpClient {
 
     @Post("${host}/service/manage/inner/traceEvidenceList")
-    ResultData<List<JSONObject>> traceEvidenceList(@Var("host") String host, @JSONBody TraceEvidenceListParamVO param);
+    ResultData<List<JSONObject>> traceEvidenceList(@Var("host") String host, @Header("token") String token, @JSONBody TraceEvidenceListParamVO param);
 
     @Post("${host}/service/manage/inner/traceEvidenceInfoList")
-    ResultData traceEvidenceInfoList(@Var("host") String host, @JSONBody TraceEvidenceInfoListParamVo param);
+    ResultData traceEvidenceInfoList(@Var("host") String host, @Header("token") String token, @JSONBody TraceEvidenceInfoListParamVo param);
 
     @Post("${host}/service/manage/inner/refreshTraceEvidenceInfoList/{kno}")
-    ResultData refreshTraceEvidenceInfoList(@Var("host") String host, @Var("kno") String kno);
+    ResultData refreshTraceEvidenceInfoList(@Var("host") String host, @Header("token") String token, @Var("kno") String kno);
 
     @Post("${host}/service/manage/inner/addMediaLibrary")
-    ResultData addMediaLibrary(@Var("host") String host, @JSONBody JSONObject param);
+    ResultData addMediaLibrary(@Var("host") String host, @Header("token") String token, @JSONBody JSONObject param);
 
     @Post("${host}/service/manage/inner/addMediaLibrarys")
-    ResultData addMediaLibrarys(@Var("host") String host, @JSONBody JSONObject param);
+    ResultData addMediaLibrarys(@Var("host") String host, @Header("token") String token, @JSONBody JSONObject param);
 }

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

@@ -23,7 +23,7 @@ import java.util.Set;
  */
 public interface ISceneEvidenceService extends IService<SceneEvidence> {
 
-    void saveEvidence(SaveEvidenceParamVO param, SSOUser ssoUser) throws Exception;
+    void saveEvidence(SaveEvidenceParamVO param, String token) throws Exception;
 
     void saveEvidenceToSceneEditInfo(String num, SceneEditInfo sceneEditInfo);
 
@@ -37,15 +37,15 @@ public interface ISceneEvidenceService extends IService<SceneEvidence> {
 
     void deleteIcons(DeleteHotIconParamVO param);
 
-    ResultData<List<JSONObject>> traceEvidenceList(TraceEvidenceListParamVO param);
+    ResultData<List<JSONObject>> traceEvidenceList(String token, TraceEvidenceListParamVO param);
 
-    ResultData traceEvidenceInfoList(TraceEvidenceInfoListParamVo param);
+    ResultData traceEvidenceInfoList(String token, TraceEvidenceInfoListParamVo param);
 
-    ResultData refreshTraceEvidenceInfoList(BaseSceneParamVO param);
+    ResultData refreshTraceEvidenceInfoList(String token, BaseSceneParamVO param);
 
     ResultData syncTraceEvidence(SaveEvidenceParamVO param) throws Exception;
 
-    void pushEvidence(BaseJsonArrayParamVO param);
+//    void pushEvidence(BaseJsonArrayParamVO param);
 
-    void uploadScreenshot(MultipartFile[] files, BaseJsonArrayParamVO data) throws IOException;
+    void uploadScreenshot(String token, MultipartFile[] files, BaseJsonArrayParamVO data) throws IOException;
 }

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

@@ -30,6 +30,7 @@ import com.fdkankan.scene.service.ISceneEvidenceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.service.ISceneIconService;
 import com.fdkankan.scene.service.IScenePlusService;
+import com.fdkankan.scene.util.JmgaSSOLoginHelper;
 import com.fdkankan.scene.vo.*;
 import com.fdkankan.web.response.ResultData;
 import com.fdkankan.web.user.SSOUser;
@@ -71,9 +72,11 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
     private FYunFileServiceInterface fYunFileServiceInterface;
     @Value("${4dkk.fdService.basePath}")
     private String basePath;
+    @Autowired
+    private JmgaSSOLoginHelper jmgaSSOLoginHelper;
 
     @Override
-    public void saveEvidence(SaveEvidenceParamVO param, SSOUser ssoUser) throws Exception {
+    public void saveEvidence(SaveEvidenceParamVO param, String token) throws Exception {
 
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         if (scenePlus == null)
@@ -92,7 +95,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         sceneEditInfoService.updateById(sceneEditInfo);
 
         //推送媒体库
-        this.batchPushMedia(param, ssoUser, scenePlus);
+        this.batchPushMedia(param, token, scenePlus);
 
     }
 
@@ -113,7 +116,8 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         this.updateBatchById(sceneEvidences);
     }
 
-    private void batchPushMedia(SaveEvidenceParamVO param, SSOUser ssoUser, ScenePlus scenePlus){
+    private void batchPushMedia(SaveEvidenceParamVO param, String token, ScenePlus scenePlus){
+        SSOUser ssoUser = jmgaSSOLoginHelper.getSsoUser(token);
         List<JSONObject> params = new ArrayList<>();
         for (EvidenceParamVO evidenceParamVO : param.getDataList()) {
             //media
@@ -175,7 +179,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         }
         JSONObject playLoad = new JSONObject();
         playLoad.put("params", params);
-        manageHttpClient.addMediaLibrarys(basePath, playLoad);
+        manageHttpClient.addMediaLibrarys(basePath, token, playLoad);
     }
 
     private void addOrUpdateData(String num, List<EvidenceParamVO> dataList) throws Exception{
@@ -303,28 +307,28 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
     }
 
     @Override
-    public ResultData<List<JSONObject>> traceEvidenceList(TraceEvidenceListParamVO param) {
-        ResultData<List<JSONObject>> resultData = manageHttpClient.traceEvidenceList(basePath, param);
+    public ResultData<List<JSONObject>> traceEvidenceList(String token, TraceEvidenceListParamVO param) {
+        ResultData<List<JSONObject>> resultData = manageHttpClient.traceEvidenceList(basePath, token, param);
         return resultData;
     }
 
     @Override
-    public ResultData traceEvidenceInfoList(TraceEvidenceInfoListParamVo param) {
+    public ResultData traceEvidenceInfoList(String token, TraceEvidenceInfoListParamVo param) {
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         if(StrUtil.isEmpty(scenePlus.getKNo())){
             return ResultData.ok(new PageInfo<>());
         }
         param.setKno(scenePlus.getKNo());
-        return manageHttpClient.traceEvidenceInfoList(basePath, param);
+        return manageHttpClient.traceEvidenceInfoList(basePath, token, param);
     }
 
     @Override
-    public ResultData refreshTraceEvidenceInfoList(BaseSceneParamVO param) {
+    public ResultData refreshTraceEvidenceInfoList(String token, BaseSceneParamVO param) {
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         if(StrUtil.isEmpty(scenePlus.getKNo())){
             return ResultData.ok();
         }
-        return manageHttpClient.refreshTraceEvidenceInfoList(basePath, scenePlus.getKNo());
+        return manageHttpClient.refreshTraceEvidenceInfoList(basePath, token, scenePlus.getKNo());
     }
 
     @Override
@@ -356,24 +360,24 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         return ResultData.ok(collect);
     }
 
-    @Override
-    public void pushEvidence(BaseJsonArrayParamVO param) {
-        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
-        String kNo = scenePlus.getKNo();
-        for (JSONObject datum : param.getData()) {
-            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(basePath, datum);
-        }
-    }
+//    @Override
+//    public void pushEvidence(BaseJsonArrayParamVO param) {
+//        ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
+//        String kNo = scenePlus.getKNo();
+//        for (JSONObject datum : param.getData()) {
+//            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(basePath, datum);
+//        }
+//    }
 
     @Override
-    public void uploadScreenshot(MultipartFile[] files, BaseJsonArrayParamVO data) throws IOException {
+    public void uploadScreenshot(String token, 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);
@@ -411,7 +415,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         //调用案件系统接口,进行推送
         JSONObject playLoad = new JSONObject();
         playLoad.put("params", params);
-        manageHttpClient.addMediaLibrarys(basePath, playLoad);
+        manageHttpClient.addMediaLibrarys(basePath, token, playLoad);
     }
 
     public static void main(String[] args) {