Browse Source

打分接口变更

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

3
epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java

@ -20,6 +20,7 @@ import com.elink.esua.epdc.dto.police.form.PoliceFormDTO;
import com.elink.esua.epdc.dto.police.result.PoliceResultDTO; import com.elink.esua.epdc.dto.police.result.PoliceResultDTO;
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.form.ProjectScoreFormDTO;
import com.elink.esua.epdc.dto.project.result.ProjectScoreResultDTO;
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;
@ -307,7 +308,7 @@ public class ApiPropertyController {
* @since 2020/5/21 15:04 * @since 2020/5/21 15:04
*/ */
@GetMapping("projectScore") @GetMapping("projectScore")
public Result score(@LoginUser TokenDto userDetail, ProjectScoreFormDTO formDto) { public Result<String> score(@LoginUser TokenDto userDetail, ProjectScoreFormDTO formDto) {
ValidatorUtils.validateEntity(formDto); ValidatorUtils.validateEntity(formDto);
return propertyService.score(userDetail, formDto); return propertyService.score(userDetail, formDto);
} }

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

@ -17,6 +17,7 @@ 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.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.project.result.ProjectScoreResultDTO;
import com.elink.esua.epdc.dto.topic.form.*; 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.TopicDetailResultDTO;
import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
@ -258,7 +259,7 @@ public interface PropertyFeignClient {
* @since 2020/5/13 15:06 * @since 2020/5/13 15:06
*/ */
@GetMapping(value = "property/epdc-app/project/projectScore", consumes = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "property/epdc-app/project/projectScore", consumes = MediaType.APPLICATION_JSON_VALUE)
Result projectScore(ProjectScoreFormDTO formDto); Result<String> projectScore(ProjectScoreFormDTO formDto);
/** /**
* 获取社区内民警及警民群数据 * 获取社区内民警及警民群数据

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

@ -137,7 +137,7 @@ public class PropertyFeignClientFallback implements PropertyFeignClient {
} }
@Override @Override
public Result projectScore(ProjectScoreFormDTO formDto) { public Result<String> projectScore(ProjectScoreFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "projectScore", formDto); return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "projectScore", formDto);
} }

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

@ -21,6 +21,7 @@ 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.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.project.result.ProjectScoreResultDTO;
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;
@ -242,7 +243,7 @@ public interface PropertyService {
* @author zhangyuan * @author zhangyuan
* @since 2020/5/21 15:50 * @since 2020/5/21 15:50
*/ */
Result score(TokenDto userDetail, ProjectScoreFormDTO formDto); Result<String> score(TokenDto userDetail, ProjectScoreFormDTO formDto);
/** /**
* 获取社区内民警及警民群数据 * 获取社区内民警及警民群数据

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

@ -26,6 +26,7 @@ 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.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.project.result.ProjectScoreResultDTO;
import com.elink.esua.epdc.dto.topic.form.*; 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.TopicDetailResultDTO;
import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
@ -294,7 +295,7 @@ public class PropertyServiceImpl implements PropertyService {
} }
@Override @Override
public Result score(TokenDto userDetail, ProjectScoreFormDTO formDto) { public Result<String> score(TokenDto userDetail, ProjectScoreFormDTO formDto) {
if (null == userDetail) { if (null == userDetail) {
return new Result().error("获取用户信息失败"); return new Result().error("获取用户信息失败");
} }

Loading…
Cancel
Save