diff --git a/epdc-cloud-api/pom.xml b/epdc-cloud-api/pom.xml
index 0e29977..5c2b571 100644
--- a/epdc-cloud-api/pom.xml
+++ b/epdc-cloud-api/pom.xml
@@ -100,6 +100,12 @@
epdc-commons-api-version-control
${epdc-cloud-commons.version}
+
+ com.esua.epdc.yushan
+ epdc-cloud-property-client
+ 1.0.0
+ compile
+
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 982cf68..5a59c5b 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
@@ -9,6 +9,7 @@ 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.ProjectListFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicChangeToIssueFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
@@ -37,7 +38,7 @@ public class ApiPropertyController {
/**
* 社群详情
*
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @params [userDetail, id]
* @author liuchuang
* @since 2019/10/22 15:14
@@ -115,7 +116,7 @@ public class ApiPropertyController {
/**
* 添加成员列表
*
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @params [formDto]
* @author liuchuang
* @since 2019/10/23 16:39
@@ -183,7 +184,7 @@ public class ApiPropertyController {
/**
* 话题列表
*
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @params [userDetail, formDto]
* @author liuchuang
* @since 2019/11/11 15:04
@@ -222,5 +223,30 @@ public class ApiPropertyController {
return propertyService.closeTopic(userDetail, formDto);
}
+ /**
+ * 物业项目列表
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @params [formDto]
+ * @author zhangyuan
+ * @since 2020/5/13 16:10
+ */
+ @PostMapping("projectList")
+ public Result projectList(@LoginUser TokenDto userDetail, @RequestBody ProjectListFormDTO formDto) {
+ ValidatorUtils.validateEntity(formDto);
+ return propertyService.projectList(userDetail, formDto);
+ }
+ /**
+ * 物业项目详情
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @params [formDto]
+ * @author zhangyuan
+ * @since 2020/5/13 16:10
+ */
+ @PostMapping("projectDetail/{propertyProjectId}")
+ public Result projectDetail(@LoginUser TokenDto userDetail, @PathVariable("propertyProjectId") String propertyProjectId) {
+ return propertyService.projectDetail(userDetail, propertyProjectId);
+ }
}
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
index cba53c6..04cd9b0 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
@@ -7,6 +7,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;
@@ -100,7 +104,7 @@ public interface PropertyFeignClient {
/**
* 添加成员列表
*
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @params [formDto]
* @author liuchuang
* @since 2019/10/23 16:38
@@ -189,7 +193,7 @@ public interface PropertyFeignClient {
/**
* 话题列表
*
- * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
* @params [formDto]
* @author liuchuang
* @since 2019/11/11 15:06
@@ -208,5 +212,25 @@ public interface PropertyFeignClient {
@PostMapping(value = "property/epdc-app/topic/close", consumes = MediaType.APPLICATION_JSON_VALUE)
Result close(TopicCloseFormDTO formDto);
+ /**
+ * 物业项目列表
+ *
+ * @return ProjectListResultDTO
+ * @params [formDto]
+ * @author ZHANGYUAN
+ * @since 2020/5/13 15:06
+ */
+ @GetMapping(value = "property/epdc-app/project/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+ Result> projectList(ProjectListFormDTO formDto);
+ /**
+ * 物业项目详情
+ *
+ * @return ProjectDetailResultDTO
+ * @params [formDto]
+ * @author ZHANGYUAN
+ * @since 2020/5/13 15:06
+ */
+ @GetMapping(value = "property/epdc-app/project/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
+ Result> projectDetail(ProjectDetailFormDTO formDto);
}
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
index 82aece0..cdccdf1 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
@@ -7,6 +7,9 @@ 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.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.TopicChangeToIssueFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
@@ -168,5 +171,23 @@ public interface PropertyService {
*/
Result> listOfTopic(TokenDto userDetail, TopicListFormDTO formDto);
+ /**
+ * 物业项目列表
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @params [userDetail, formDto]
+ * @author liuchuang
+ * @since 2019/11/11 15:05
+ */
+ Result> projectList(TokenDto userDetail, ProjectListFormDTO formDto);
+ /**
+ * 物业项目详情
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @params [userDetail, formDto]
+ * @author liuchuang
+ * @since 2019/11/11 15:05
+ */
+ Result> projectDetail(TokenDto userDetail, String id);
}
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
index bf35012..8962d3a 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
@@ -15,6 +15,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;
@@ -197,5 +201,25 @@ public class PropertyServiceImpl implements PropertyService {
return propertyFeignClient.listOfTopic(formDto);
}
+ @Override
+ public Result> projectList(TokenDto userDetail, ProjectListFormDTO formDto) {
+ if (null == userDetail) {
+ return new Result().error("获取用户信息失败");
+ }
+ formDto.setUserId(userDetail.getUserId());
+ formDto.setGridId(userDetail.getGridId());
+ return propertyFeignClient.projectList(formDto);
+ }
+ @Override
+ public Result> projectDetail(TokenDto userDetail, String id) {
+ if (null == userDetail) {
+ return new Result().error("获取用户信息失败");
+ }
+ ProjectDetailFormDTO formDto = new ProjectDetailFormDTO();
+ formDto.setId(id);
+ formDto.setUserId(userDetail.getUserId());
+ formDto.setGridId(userDetail.getGridId());
+ return propertyFeignClient.projectDetail(formDto);
+ }
}