物业项目详情V2版

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/v2/ApiPrepertyV2Controller.java

@@ -0,0 +1,35 @@
+package com.elink.esua.epdc.controller.v2;
+
+import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.api.version.ApiVersion;
+import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.service.PropertyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@ApiVersion(2)
+@RestController("ApiPrepertyV2Controller")
+@RequestMapping("property" + Constant.VERSION_CONTROL)
+public class ApiPrepertyV2Controller {
+
+    @Autowired
+    private PropertyService propertyService;
+
+    /**
+     * 物业项目详情
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @params [formDto]
+     * @author zhangyuan
+     * @since 2020/5/13 16:10
+     */
+    @GetMapping("projectDetail/{propertyProjectId}")
+    public Result projectDetail(@LoginUser TokenDto userDetail, @PathVariable("propertyProjectId") String propertyProjectId) {
+        return propertyService.projectDetailV2(userDetail, propertyProjectId);
+    }
+}

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java

@@ -226,6 +226,7 @@ public interface PropertyFeignClient {
 
     /**
      * 物业项目详情
+     *
      * @return ProjectDetailResultDTO
      * @params [formDto]
      * @author ZHANGYUAN
@@ -234,6 +235,17 @@ public interface PropertyFeignClient {
     @GetMapping(value = "property/epdc-app/project/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<ProjectDetailResultDTO> projectDetail(ProjectDetailFormDTO formDto);
 
+    /**
+     * 物业项目详情V2
+     *
+     * @return ProjectDetailResultDTO
+     * @params [formDto]
+     * @author ZHANGYUAN
+     * @since 2020/5/13 15:06
+     */
+    @GetMapping(value = "property/epdc-app/project/detailV2", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<ProjectDetailResultDTO> projectDetailV2(ProjectDetailFormDTO formDto);
+
     @PostMapping(value = "property/epdc-app/comment/submit", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result submit(TopicCommentFormDTO commentFormDTO);
 

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java

@@ -127,6 +127,12 @@ public class PropertyFeignClientFallback implements PropertyFeignClient {
     public Result<ProjectDetailResultDTO> projectDetail(ProjectDetailFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "projectDetail", formDto);
     }
+
+    @Override
+    public Result<ProjectDetailResultDTO> projectDetailV2(ProjectDetailFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "projectDetailV2", formDto);
+    }
+
     public Result submit(TopicCommentFormDTO commentFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "submit", commentFormDTO);
     }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java

@@ -94,7 +94,7 @@ public interface PropertyService {
     /**
      * 添加成员列表
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List                               <                               com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>>
      * @params [formDto]
      * @author liuchuang
      * @since 2019/10/23 16:40
@@ -166,7 +166,7 @@ public interface PropertyService {
     /**
      * 话题列表
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List                               <                               com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
      * @params [userDetail, formDto]
      * @author liuchuang
      * @since 2019/11/11 15:05
@@ -176,7 +176,7 @@ public interface PropertyService {
     /**
      * 物业项目列表
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List               <               com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
      * @params [userDetail, formDto]
      * @author liuchuang
      * @since 2019/11/11 15:05
@@ -186,13 +186,23 @@ public interface PropertyService {
     /**
      * 物业项目详情
      *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List               <               com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
      * @params [userDetail, formDto]
      * @author liuchuang
      * @since 2019/11/11 15:05
      */
     Result<ProjectDetailResultDTO> projectDetail(TokenDto userDetail, String id);
 
+    /**
+     * 物业项目详情V2
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
+     * @params [userDetail, formDto]
+     * @author liuchuang
+     * @since 2019/11/11 15:05
+     */
+    Result<ProjectDetailResultDTO> projectDetailV2(TokenDto userDetail, String id);
+
     /**
      * 提交评论或回复接口
      */
@@ -210,11 +220,10 @@ public interface PropertyService {
     Result<EventCommentsResultDTO> listOfComments(TokenDto userDetail, TopicCommentsFormDTO topicCommentsFormDTO);
 
     /**
-     *
      * 我的话题列表
      *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
      * @params [userDetail, formDto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
      * @author liuchuang
      * @since 2019/11/11 15:50
      */

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java

@@ -224,6 +224,18 @@ public class PropertyServiceImpl implements PropertyService {
         return propertyFeignClient.projectDetail(formDto);
     }
 
+    @Override
+    public Result<ProjectDetailResultDTO> projectDetailV2(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.projectDetailV2(formDto);
+    }
+
     @Override
     public Result submit(TokenDto userDetail, TopicCommentFormDTO topicCommentFormDTO) {
         if (null == userDetail) {