2.0.0

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

@@ -14,21 +14,21 @@ import java.io.File;
 import java.util.List;
 import java.util.Map;
 
-@Address(source = FdkkAddressSource.class)
+//@Address(source = FdkkAddressSource.class)
 public interface ManageHttpClient {
 
-    @Post("/service/manage/inner/traceEvidenceList")
-    ResultData<List<JSONObject>> traceEvidenceList(@JSONBody TraceEvidenceListParamVO param);
+    @Post("${host}/service/manage/inner/traceEvidenceList")
+    ResultData<List<JSONObject>> traceEvidenceList(@Var("host") String host, @JSONBody TraceEvidenceListParamVO param);
 
-    @Post("/service/manage/inner/traceEvidenceInfoList")
-    ResultData traceEvidenceInfoList(@JSONBody TraceEvidenceInfoListParamVo param);
+    @Post("${host}/service/manage/inner/traceEvidenceInfoList")
+    ResultData traceEvidenceInfoList(@Var("host") String host, @JSONBody TraceEvidenceInfoListParamVo param);
 
-    @Post("/service/manage/inner/refreshTraceEvidenceInfoList/{kno}")
-    ResultData refreshTraceEvidenceInfoList(@Var("kno") String kno);
+    @Post("${host}/service/manage/inner/refreshTraceEvidenceInfoList/{kno}")
+    ResultData refreshTraceEvidenceInfoList(@Var("host") String host, @Var("kno") String kno);
 
-    @Post("/service/manage/inner/addMediaLibrary")
-    ResultData addMediaLibrary(@JSONBody JSONObject param);
+    @Post("${host}/service/manage/inner/addMediaLibrary")
+    ResultData addMediaLibrary(@Var("host") String host, @JSONBody JSONObject param);
 
-    @Post("/service/manage/inner/addMediaLibrarys")
-    ResultData addMediaLibrarys(@JSONBody List<JSONObject> param);
+    @Post("${host}/service/manage/inner/addMediaLibrarys")
+    ResultData addMediaLibrarys(@Var("host") String host, @JSONBody List<JSONObject> param);
 }

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

@@ -36,6 +36,7 @@ import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -67,6 +68,8 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
     private ManageHttpClient manageHttpClient;
     @Autowired
     private FYunFileServiceInterface fYunFileServiceInterface;
+    @Value("${4dkk.fdService.basePath}")
+    private String basePath;
 
     @Override
     public void saveEvidence(SaveEvidenceParamVO param, SSOUser ssoUser) throws Exception {
@@ -147,7 +150,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         if(CollUtil.isEmpty(params)){
             return;
         }
-        manageHttpClient.addMediaLibrarys(params);
+        manageHttpClient.addMediaLibrarys(basePath, params);
     }
 
     private void addOrUpdateData(String num, List<EvidenceParamVO> dataList) throws Exception{
@@ -272,7 +275,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
 
     @Override
     public ResultData<List<JSONObject>> traceEvidenceList(TraceEvidenceListParamVO param) {
-        ResultData<List<JSONObject>> resultData = manageHttpClient.traceEvidenceList(param);
+        ResultData<List<JSONObject>> resultData = manageHttpClient.traceEvidenceList(basePath, param);
         return resultData;
     }
 
@@ -283,7 +286,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         }
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(param.getNum());
         param.setKno(scenePlus.getKNo());
-        return manageHttpClient.traceEvidenceInfoList(param);
+        return manageHttpClient.traceEvidenceInfoList(basePath, param);
     }
 
     @Override
@@ -292,7 +295,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         if(StrUtil.isEmpty(scenePlus.getKNo())){
             return ResultData.ok();
         }
-        return manageHttpClient.refreshTraceEvidenceInfoList(scenePlus.getKNo());
+        return manageHttpClient.refreshTraceEvidenceInfoList(basePath, scenePlus.getKNo());
     }
 
     @Override
@@ -336,7 +339,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             datum.put("fileSize", fYunFileServiceInterface.getSpace("4dkankan", filePath));
             datum.put("delSource", 0);
             datum.put("toHaixin", 1);
-            manageHttpClient.addMediaLibrary(datum);
+            manageHttpClient.addMediaLibrary(basePath, datum);
         }
     }
 
@@ -373,6 +376,6 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         }
 
         //调用案件系统接口,进行推送
-        manageHttpClient.addMediaLibrarys(params);
+        manageHttpClient.addMediaLibrarys(basePath, params);
     }
 }