Browse Source

全部编组改成查管理范围

menglu 3 years ago
parent
commit
333639e7fb

+ 1 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/Application_ibms_data_sdk.java

@@ -8,6 +8,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
 @EnableScheduling
 @ServletComponentScan
+// @EnableControllerLog
 public class Application_ibms_data_sdk {
 
 	public static void main(String[] args) throws Exception {

+ 46 - 14
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java

@@ -793,21 +793,53 @@ public class RWDDownloadUtil {
 				log.debug("Download object " + ibmsSceneCode + "-" + ibmsClassCode);
 				JSONArray infoArray = new JSONArray();
 				for (String logicalGroupingId : idList) {
-					JSONObject criteria = new JSONObject();
-					criteria.put("userId", "systemId");
-					criteria.put("projectId", RepositoryContainer.RepositoryProject.projectId);
-					criteria.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
-					criteria.put("logicalGroupingId", logicalGroupingId);
-					try {
-						JSONArray Content = post_by_page("zkt_monitor", Constant.zkt_monitor_url + "/logicalObject/listPage", criteria, page_size);
-						for (int i = 0; i < Content.size(); i++) {
-							JSONObject ContentItem = (JSONObject) Content.get(i);
-							ContentItem.put("logicalGroupingId", logicalGroupingId);
+					if (logicalGroupingId.equals(RepositoryContainer.RepositoryProject.groupCode + RepositoryContainer.RepositoryProject.projectId
+							+ ibmsSceneCode + ibmsClassCode)) {
+						JSONObject param = new JSONObject();
+						JSONObject criteria = new JSONObject();
+						criteria.put("ibmsSceneCode", ibmsSceneCode);
+						criteria.put("ibmsClassCode", ibmsClassCode);
+						param.put("criteria", criteria);
+						String postUrl = Constant.zkt_dmp_url + "/rwd/instance/object/query?projectId="
+								+ RepositoryContainer.RepositoryProject.projectId + "&groupCode=" + RepositoryContainer.RepositoryProject.groupCode;
+						try {
+							String post_result = HttpClientUtil.instance("zkt_dmp").post_compress(postUrl, param.toJSONString());
+							JSONObject resultJSON = JSON.parseObject(post_result);
+							if (!resultJSON.getString("result").equals("success")) {
+								throw new Exception(postUrl + "\n" + param.toJSONString() + "\n" + post_result);
+							}
+							JSONArray dataArray = resultJSON.getJSONArray("data");
+							dataArray = dataArray == null ? new JSONArray() : dataArray;
+							for (int i = 0; i < dataArray.size(); i++) {
+								JSONObject itemInner = dataArray.getJSONObject(i);
+								String objId = itemInner.getString("id");
+								JSONObject logicalObject = new JSONObject();
+								logicalObject.put("logicalGroupingId", logicalGroupingId);
+								logicalObject.put("objId", objId);
+								infoArray.add(logicalObject);
+							}
+						} catch (Exception e) {
+							log.error(postUrl + "\n" + FastJsonUtil.toFormatString(param), e);
+							throw e;
+						}
+					} else {
+						JSONObject criteria = new JSONObject();
+						criteria.put("userId", "systemId");
+						criteria.put("projectId", RepositoryContainer.RepositoryProject.projectId);
+						criteria.put("groupCode", RepositoryContainer.RepositoryProject.groupCode);
+						criteria.put("logicalGroupingId", logicalGroupingId);
+						String postUrl = Constant.zkt_monitor_url + "/logicalObject/listPage";
+						try {
+							JSONArray Content = post_by_page("zkt_monitor", postUrl, criteria, page_size);
+							for (int i = 0; i < Content.size(); i++) {
+								JSONObject ContentItem = (JSONObject) Content.get(i);
+								ContentItem.put("logicalGroupingId", logicalGroupingId);
+							}
+							infoArray.addAll(Content);
+						} catch (Exception e) {
+							log.error(postUrl + "\n" + FastJsonUtil.toFormatString(criteria), e);
+							throw e;
 						}
-						infoArray.addAll(Content);
-					} catch (Exception e) {
-						log.error("/logicalObject/listPage" + "\n" + FastJsonUtil.toFormatString(criteria), e);
-						throw e;
 					}
 				}
 				FileUtil.Save(path + Constant.getSeperator() + ibmsSceneCode + Constant.getSeperator() + ibmsClassCode + ".json",