Browse Source

修改心里问题列表接口

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

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

@ -415,7 +415,7 @@ public class ApiPropertyController {
* @since 2019/10/22 15:33
*/
@GetMapping("psychology/listUserQuestion")
public Result<PsychologyAnswerListUserResultDTO> listUserQuestion(@LoginUser TokenDto userDetail, @RequestBody PsychologyAnswerFormDTO formDto) {
public Result<List<PsychologyAnswerListUserResultDTO>> listUserQuestion(@LoginUser TokenDto userDetail, @RequestBody PsychologyAnswerFormDTO formDto) {
return propertyService.listUserQuestion(userDetail, formDto);
}
@ -428,7 +428,7 @@ public class ApiPropertyController {
* @since 2019/10/22 15:33
*/
@GetMapping("psychology/listQuestion")
public Result<PsychologyAnswerListResultDTO> listQuestion(@LoginUser TokenDto userDetail, @RequestBody PsychologyAnswerFormDTO formDto) {
public Result<List<PsychologyAnswerListResultDTO>> listQuestion(@LoginUser TokenDto userDetail, @RequestBody PsychologyAnswerFormDTO formDto) {
return propertyService.listQuestion(userDetail, formDto);
}
}

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

@ -331,7 +331,7 @@ public interface PropertyFeignClient {
* @date 2020/6/8 9:25
*/
@PostMapping(value = "news/epdc-app/psychology/listUserQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<PsychologyAnswerListUserResultDTO> listUserQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO);
Result<List<PsychologyAnswerListUserResultDTO>> listUserQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO);
/***
* 居民端-心理咨询-问题列表
@ -341,5 +341,5 @@ public interface PropertyFeignClient {
* @date 2020/6/8 9:25
*/
@PostMapping(value = "news/epdc-app/psychology/listQuestion", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<PsychologyAnswerListResultDTO> listQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO);
Result<List<PsychologyAnswerListResultDTO>> listQuestion(@RequestBody PsychologyAnswerFormDTO fromDTO);
}

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

@ -184,12 +184,12 @@ public class PropertyFeignClientFallback implements PropertyFeignClient {
}
@Override
public Result<PsychologyAnswerListUserResultDTO> listUserQuestion(PsychologyAnswerFormDTO formDto) {
public Result<List<PsychologyAnswerListUserResultDTO>> listUserQuestion(PsychologyAnswerFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listUserQuestion", formDto);
}
@Override
public Result<PsychologyAnswerListResultDTO> listQuestion(PsychologyAnswerFormDTO formDto) {
public Result<List<PsychologyAnswerListResultDTO>> listQuestion(PsychologyAnswerFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listQuestion", formDto);
}
}

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

@ -326,7 +326,7 @@ public interface PropertyService {
* @author zhangyuan
* @date 2020/6/8 09:15
*/
Result<PsychologyAnswerListUserResultDTO> listUserQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto);
Result<List<PsychologyAnswerListUserResultDTO>> listUserQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto);
/**
* 居民端-心理咨询-问题列表
@ -337,5 +337,5 @@ public interface PropertyService {
* @author zhangyuan
* @date 2020/6/8 09:15
*/
Result<PsychologyAnswerListResultDTO> listQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto);
Result<List<PsychologyAnswerListResultDTO>> listQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto);
}

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

@ -360,14 +360,14 @@ public class PropertyServiceImpl implements PropertyService {
}
@Override
public Result<PsychologyAnswerListUserResultDTO> listUserQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto) {
public Result<List<PsychologyAnswerListUserResultDTO>> listUserQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto) {
formDto.setUserId(userDetail.getUserId());
formDto.setGridId(userDetail.getGridId());
return propertyFeignClient.listUserQuestion(formDto);
}
@Override
public Result<PsychologyAnswerListResultDTO> listQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto) {
public Result<List<PsychologyAnswerListResultDTO>> listQuestion(TokenDto userDetail, PsychologyAnswerFormDTO formDto) {
formDto.setUserId(userDetail.getUserId());
formDto.setGridId(userDetail.getGridId());
return propertyFeignClient.listQuestion(formDto);

Loading…
Cancel
Save