瀏覽代碼

增加通过ID和项目ID获取图片URL地址

lirong 3 年之前
父節點
當前提交
98ea78d729
共有 1 個文件被更改,包括 6 次插入7 次删除
  1. 6 7
      ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestUtil.java

+ 6 - 7
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/RestUtil.java

@@ -714,7 +714,7 @@ public class RestUtil {
 			//2.组装ADM请求对像
 			JSONObject postJSON = new JSONObject();
 			//"label contain 'Sy440307000395af770eea9646b0b68e80748d596f19'"
-			postJSON.put("filters", "label contain "+paramObject.get("filters"));
+			postJSON.put("filters", paramObject.get("filters"));
 			Map<String,String> head = new HashMap<>();
 			head.put("projectId", RepositoryContainer.RepositoryBase.projectId);
 			//3.发送请求
@@ -725,6 +725,7 @@ public class RestUtil {
 			JSONObject resultJSON = JSON.parseObject(post_result);
 			Map<String,String> map = new HashMap<>();
 			JSONArray content = (JSONArray)resultJSON.get("content");
+			JSONObject rd = new JSONObject();
 			if(content == null || content.isEmpty()){
 				//TODO 如果失败返回失败信息
 				result.put("Result", "failure");
@@ -747,9 +748,8 @@ public class RestUtil {
 				map.put("serviceUrl","http://192.168.0.53:8811");
 				map.put("img_baseurl","http://39.102.40.239");
 				map.put("topo_baseurl","http://39.102.40.239:28888");
-
-				//map.put("isPub","0");
-				//map.put("groupCode","");
+				rd.put("projectId",obj.get("projectId").toString());
+				rd.put("graphId",obj.get("graphId").toString());
 			}
 
 			//http://192.168.0.34:8081/#/?graphId=740364c0a1c849da948fd07d7ab3c0a8&id=72835645a33c4f70b9a2d6a851e7070c
@@ -757,10 +757,9 @@ public class RestUtil {
 			// &isPub=0&groupCode=&projectId=Pj5001120003
 			String path = "http://192.168.0.34:8081/#/";
 			//5.组装URL返回对像
-			JSONObject rd = new JSONObject();
+
 			rd.put("url",toUrl(path,map));
-			rd.put("projectId","");
-			rd.put("graphId","");
+
 			result.put("Content",rd);
 		}catch (Exception e){
 			log.error("获取图形数据失败",e);