修改查询全部项目的接口

src/main/java/com/persagy/calendar/client/RwdObjectClient.java

@@ -1,5 +1,7 @@
 package com.persagy.calendar.client;
 
+import java.util.List;
+
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +24,9 @@ import com.persagy.common.constant.ServiceNameConstants;
 public interface RwdObjectClient {
 	
 	@PostMapping("/rwd/instance/object/query")
-    String queryProjectObjects(@SpringQueryMap BaseModel baseModel, @RequestBody BaseQueryModel object);
+    String queryProjectObject(@SpringQueryMap BaseModel baseModel, @RequestBody BaseQueryModel object);
+	
+	@PostMapping("/rwd/instance/object/batchQueryProjectByIds")
+    String queryAllProjectObject(@SpringQueryMap BaseModel baseModel, @RequestBody List<String> projectIds);
 
 }

src/main/java/com/persagy/calendar/client/fallback/RwdObjectClientFallBack.java

@@ -1,5 +1,7 @@
 package com.persagy.calendar.client.fallback;
 
+import java.util.List;
+
 import org.springframework.stereotype.Component;
 
 import com.persagy.calendar.client.RwdObjectClient;
@@ -21,7 +23,13 @@ import lombok.extern.slf4j.Slf4j;
 public class RwdObjectClientFallBack implements RwdObjectClient {
 
 	@Override
-	public String queryProjectObjects(BaseModel baseModel, BaseQueryModel object) {
+	public String queryProjectObject(BaseModel baseModel, BaseQueryModel object) {
+		log.error("数据中台物理世界，查询对象数据异常");
+		return null;
+	}
+
+	@Override
+	public String queryAllProjectObject(BaseModel baseModel, List<String> projectIds) {
 		log.error("数据中台物理世界，查询对象数据异常");
 		return null;
 	}

src/main/java/com/persagy/calendar/service/impl/RwdObjectServiceImpl.java

@@ -52,6 +52,7 @@ public class RwdObjectServiceImpl implements RwdObjectService {
 	@Override
 	public Set<String> queryAllProjects(String groupCode) {
 		BaseModel baseModel = new BaseModel();
+		baseModel.setUserId("caneldar");
 		baseModel.setGroupCode(groupCode);
 		
 		BaseQueryModel<JSONObject> queryModel = new BaseQueryModel<JSONObject>();
@@ -59,7 +60,7 @@ public class RwdObjectServiceImpl implements RwdObjectService {
 		criteria.put("objType", "project");
 		queryModel.setCriteria(criteria);
 		queryModel.setSize(10000);
-		String projectObjects = this.rwdObjectClient.queryProjectObjects(baseModel, queryModel);
+		String projectObjects = this.rwdObjectClient.queryAllProjectObject(baseModel, Lists.newArrayList());
 		if (StringUtil.isBlank(projectObjects) || projectObjects.indexOf(DMPConstant.DMP_RESULT_KEY) < 0) {
 			return null;
 		}
@@ -85,7 +86,7 @@ public class RwdObjectServiceImpl implements RwdObjectService {
 	public ResponseResult queryRwdObjects(BaseModel baseModel, RwdObjectModel objectModel) {
 		BaseQueryModel<RwdObjectModel> object = new BaseQueryModel<RwdObjectModel>();
 		object.setCriteria(objectModel);
-		String objects = this.rwdObjectClient.queryProjectObjects(baseModel, object);
+		String objects = this.rwdObjectClient.queryProjectObject(baseModel, object);
 		return this.parseDMPResult(objects, baseModel.getGroupCode());
 	}