From 88eb991c8b1546db876f839a8b62b4d3a081e601 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 21 May 2020 10:05:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E6=89=93=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BDAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiPropertyController.java | 30 ++++++++++++++----- .../esua/epdc/feign/PropertyFeignClient.java | 12 ++++++++ .../fallback/PropertyFeignClientFallback.java | 6 ++++ .../esua/epdc/service/PropertyService.java | 12 +++++++- .../service/impl/PropertyServiceImpl.java | 10 +++++++ 5 files changed, 61 insertions(+), 9 deletions(-) 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 6519e9e..3f0b7c9 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 @@ -13,6 +13,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; 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.form.ProjectScoreFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; @@ -32,10 +33,10 @@ import java.util.List; @RestController @RequestMapping("property") public class ApiPropertyController { + @Autowired private PropertyService propertyService; - /** * 社群详情 * @@ -251,11 +252,11 @@ public class ApiPropertyController { return propertyService.projectDetail(userDetail, propertyProjectId); } - /** - * @author: qushutong - * @Date: 2020/5/14 16:48 - * @Description:提交评论或回复接口 - */ + /** + * @author: qushutong + * @Date: 2020/5/14 16:48 + * @Description:提交评论或回复接口 + */ @PostMapping("comment/submit") public Result submit(@LoginUser TokenDto userDetail, @RequestBody TopicCommentFormDTO topicCommentFormDTO) { return propertyService.submit(userDetail, topicCommentFormDTO); @@ -278,11 +279,10 @@ public class ApiPropertyController { } /** - * * 我的话题列表 * + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @params [userDetail, formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author liuchuang * @since 2019/11/11 15:04 */ @@ -291,4 +291,18 @@ public class ApiPropertyController { ValidatorUtils.validateEntity(formDto); return propertyService.listTopicOfMine(userDetail, formDto); } + + /** + * 物业打分 + * + * @return + * @params [userDetail, formDto] + * @author zhangyuan + * @since 2020/5/21 15:04 + */ + @GetMapping("property/projectScore") + public Result score(@LoginUser TokenDto userDetail, ProjectScoreFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return propertyService.score(userDetail, formDto); + } } 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 a427ed0..5ee3324 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 @@ -12,6 +12,7 @@ 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.form.ProjectScoreFormDTO; 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.*; @@ -246,6 +247,17 @@ public interface PropertyFeignClient { @GetMapping(value = "property/epdc-app/project/detailV2", consumes = MediaType.APPLICATION_JSON_VALUE) Result projectDetailV2(ProjectDetailFormDTO formDto); + /** + * 物业打分 + * + * @return ProjectDetailResultDTO + * @params [formDto] + * @author ZHANGYUAN + * @since 2020/5/13 15:06 + */ + @GetMapping(value = "property/epdc-app/project/projectScore", consumes = MediaType.APPLICATION_JSON_VALUE) + Result projectScore(ProjectScoreFormDTO formDto); + @PostMapping(value = "property/epdc-app/comment/submit", consumes = MediaType.APPLICATION_JSON_VALUE) Result submit(TopicCommentFormDTO commentFormDTO); 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 1469fe6..d086c18 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 @@ -14,6 +14,7 @@ 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.form.ProjectScoreFormDTO; 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.*; @@ -133,6 +134,11 @@ public class PropertyFeignClientFallback implements PropertyFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "projectDetailV2", formDto); } + @Override + public Result projectScore(ProjectScoreFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "projectScore", formDto); + } + public Result submit(TopicCommentFormDTO commentFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "submit", commentFormDTO); } 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 99242ee..a24bb96 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 @@ -12,6 +12,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; 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.form.ProjectScoreFormDTO; 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.TopicCloseFormDTO; @@ -30,7 +31,6 @@ import java.util.List; */ public interface PropertyService { - /** * 社群详情 * @@ -228,4 +228,14 @@ public interface PropertyService { * @since 2019/11/11 15:50 */ Result> listTopicOfMine(TokenDto userDetail, TopicListFormDTO formDto); + + + /** + * 物业打分 + * + * @params [userDetail, formDto] + * @author zhangyuan + * @since 2020/5/21 15:50 + */ + Result score(TokenDto userDetail, ProjectScoreFormDTO formDto); } 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 382bbe0..a372662 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 @@ -17,6 +17,7 @@ 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.form.ProjectScoreFormDTO; 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.*; @@ -281,4 +282,13 @@ public class PropertyServiceImpl implements PropertyService { formDto.setUserId(userDetail.getUserId()); return propertyFeignClient.listOfTopic(formDto); } + + @Override + public Result score(TokenDto userDetail, ProjectScoreFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setUserId(userDetail.getUserId()); + return propertyFeignClient.projectScore(formDto); + } }