diff --git a/epdc-cloud-api/pom.xml b/epdc-cloud-api/pom.xml
index 5c2b571..080a880 100644
--- a/epdc-cloud-api/pom.xml
+++ b/epdc-cloud-api/pom.xml
@@ -228,7 +228,7 @@
true
47.104.224.45:8848
47.104.85.99
- 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+ de000340-5fc4-45aa-bdbc-dd96852012ad
wx3ef8f2cd12a19fcb
@@ -236,14 +236,11 @@
111
111
-
-
-
- wx5d3e97461d248397
- bfed51b731e53db9affb9e6131e7ae12
+ wx50ebeb95943868cd
+ c2719c261fe87b3e2d572552d2c8275d
- wx9f20a46906ab2c3e
- dc13065f79429979d9f687d249eb5c4e
+ wx6d45fd2f4dfe7ce4
+ 54a30a48b100bbad20d7823cd9e1fb17
wxfa4afaa2b5f9c876
7db9f049c78c9a6cafa673deebe8330d
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
index d94a17a..3fb2f7f 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
@@ -232,7 +232,7 @@ public class ApiPropertyController {
* @since 2020/5/13 16:10
*/
@GetMapping("projectList")
- public Result projectList(@LoginUser TokenDto userDetail, @RequestBody ProjectListFormDTO formDto) {
+ public Result projectList(@LoginUser TokenDto userDetail, ProjectListFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return propertyService.projectList(userDetail, formDto);
}
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
index b61f8e3..6aed97e 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
@@ -8,6 +8,10 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
import com.elink.esua.epdc.dto.group.form.*;
import com.elink.esua.epdc.dto.group.result.*;
+import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO;
+import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
+import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO;
+import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
import com.elink.esua.epdc.dto.topic.form.*;
import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
@@ -110,4 +114,13 @@ public class PropertyFeignClientFallback implements PropertyFeignClient {
return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listOfTopic", formDto);
}
+ @Override
+ public Result> projectList(ProjectListFormDTO formDto) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "projectList", formDto);
+ }
+
+ @Override
+ public Result> projectDetail(ProjectDetailFormDTO formDto) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "projectDetail", formDto);
+ }
}