dengsixing пре 1 дан
родитељ
комит
84a66f0202

+ 4 - 0
src/main/java/com/fdkankan/scene/entity/ScenePlus.java

@@ -150,5 +150,9 @@ public class ScenePlus implements Serializable {
     @TableField("upload_type")
     private String uploadType;
 
+    @TableField("push_address")
+    private String pushAddress;
+
+
 
 }

+ 2 - 2
src/main/java/com/fdkankan/scene/httpclient/HaixinClient.java

@@ -16,7 +16,7 @@ public interface HaixinClient {
     JSONObject uploadToFdfs(@Var("url")String url, @DataFile("file") String filePath);
 
     //推送痕迹物证接口
-    @Post(url = "${host}/ecs/api/openapi/saveSceneInfo",  readTimeout = 60*1000, connectTimeout = 60*1000, timeout = 60*1000, maxRetryInterval = 5)
-    JSONObject saveSceneInfo(@Var("host") String host, @Header("appkey") String appkey,  @JSONBody JSONObject param);
+    @Post(url = "{url}",  readTimeout = 60*1000, connectTimeout = 60*1000, timeout = 60*1000, maxRetryInterval = 5)
+    JSONObject saveSceneInfo(@Var("url") String host, @Header("appkey") String appkey,  @JSONBody JSONObject param);
 
 }

+ 2 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneEvidenceServiceImpl.java

@@ -141,7 +141,8 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             Map<String, JSONObject> map = this.genSceneMaterialEvidence(num, evidenceParamVO);
             sceneMaterialEvidenceList.add(map);
         }
-        haixinClient.saveSceneInfo(haixinProperties.getHost().concat(haixinProperties.getApi().getSaveSceneInfo()), haixinProperties.getAppKey(),  jsonObject);
+        String host = StrUtil.isNotEmpty(scenePlus.getPushAddress()) ? scenePlus.getPushAddress() : haixinProperties.getHost();
+        haixinClient.saveSceneInfo(host.concat(haixinProperties.getApi().getSaveSceneInfo()), haixinProperties.getAppKey(),  jsonObject);
 
 
     }