Browse Source

物业打分功能API

feature/yujt_analysisHomeChange
zhangyuan 5 years ago
parent
commit
88eb991c8b
  1. 30
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
  2. 12
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/PropertyFeignClient.java
  3. 6
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
  4. 12
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
  5. 10
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java

30
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.form.*;
import com.elink.esua.epdc.dto.group.result.*; 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.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.TopicCloseFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
@ -32,10 +33,10 @@ import java.util.List;
@RestController @RestController
@RequestMapping("property") @RequestMapping("property")
public class ApiPropertyController { public class ApiPropertyController {
@Autowired @Autowired
private PropertyService propertyService; private PropertyService propertyService;
/** /**
* 社群详情 * 社群详情
* *
@ -251,11 +252,11 @@ public class ApiPropertyController {
return propertyService.projectDetail(userDetail, propertyProjectId); return propertyService.projectDetail(userDetail, propertyProjectId);
} }
/** /**
* @author: qushutong * @author: qushutong
* @Date: 2020/5/14 16:48 * @Date: 2020/5/14 16:48
* @Description:提交评论或回复接口 * @Description:提交评论或回复接口
*/ */
@PostMapping("comment/submit") @PostMapping("comment/submit")
public Result submit(@LoginUser TokenDto userDetail, @RequestBody TopicCommentFormDTO topicCommentFormDTO) { public Result submit(@LoginUser TokenDto userDetail, @RequestBody TopicCommentFormDTO topicCommentFormDTO) {
return propertyService.submit(userDetail, topicCommentFormDTO); return propertyService.submit(userDetail, topicCommentFormDTO);
@ -278,11 +279,10 @@ public class ApiPropertyController {
} }
/** /**
*
* 我的话题列表 * 我的话题列表
* *
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
* @params [userDetail, formDto] * @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 * @author liuchuang
* @since 2019/11/11 15:04 * @since 2019/11/11 15:04
*/ */
@ -291,4 +291,18 @@ public class ApiPropertyController {
ValidatorUtils.validateEntity(formDto); ValidatorUtils.validateEntity(formDto);
return propertyService.listTopicOfMine(userDetail, 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);
}
} }

12
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.group.result.*;
import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; 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.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.ProjectDetailResultDTO;
import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
import com.elink.esua.epdc.dto.topic.form.*; 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) @GetMapping(value = "property/epdc-app/project/detailV2", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<ProjectDetailResultDTO> projectDetailV2(ProjectDetailFormDTO formDto); Result<ProjectDetailResultDTO> 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) @PostMapping(value = "property/epdc-app/comment/submit", consumes = MediaType.APPLICATION_JSON_VALUE)
Result submit(TopicCommentFormDTO commentFormDTO); Result submit(TopicCommentFormDTO commentFormDTO);

6
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.group.result.*;
import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; 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.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.ProjectDetailResultDTO;
import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
import com.elink.esua.epdc.dto.topic.form.*; 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); 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) { public Result submit(TopicCommentFormDTO commentFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "submit", commentFormDTO); return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "submit", commentFormDTO);
} }

12
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.form.*;
import com.elink.esua.epdc.dto.group.result.*; 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.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.ProjectDetailResultDTO;
import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO; import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
@ -30,7 +31,6 @@ import java.util.List;
*/ */
public interface PropertyService { public interface PropertyService {
/** /**
* 社群详情 * 社群详情
* *
@ -228,4 +228,14 @@ public interface PropertyService {
* @since 2019/11/11 15:50 * @since 2019/11/11 15:50
*/ */
Result<List<TopicListResultDTO>> listTopicOfMine(TokenDto userDetail, TopicListFormDTO formDto); Result<List<TopicListResultDTO>> listTopicOfMine(TokenDto userDetail, TopicListFormDTO formDto);
/**
* 物业打分
*
* @params [userDetail, formDto]
* @author zhangyuan
* @since 2020/5/21 15:50
*/
Result score(TokenDto userDetail, ProjectScoreFormDTO formDto);
} }

10
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.group.result.*;
import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO; 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.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.ProjectDetailResultDTO;
import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO; import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
import com.elink.esua.epdc.dto.topic.form.*; import com.elink.esua.epdc.dto.topic.form.*;
@ -281,4 +282,13 @@ public class PropertyServiceImpl implements PropertyService {
formDto.setUserId(userDetail.getUserId()); formDto.setUserId(userDetail.getUserId());
return propertyFeignClient.listOfTopic(formDto); 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);
}
} }

Loading…
Cancel
Save