心理咨询师详细app接口

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

@@ -22,6 +22,8 @@ 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.ProjectScoreFormDTO;
 import com.elink.esua.epdc.dto.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologistInfoFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
@@ -372,4 +374,18 @@ public class ApiPropertyController {
     public Result<List<PsychologistResultDTO>> listPsychiatrist(@LoginUser TokenDto userDetail, PsychologistFormDTO formDto) {
         return propertyService.listPsychiatrist(userDetail, formDto);
     }
+
+    /**
+     * 心理咨询师详细信息
+     *
+     * @param userDetail 用户信息
+     * @param formDto    查询参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.PsychologistInfoResultDTO>>
+     * @author zhangyuan
+     * @date 2020/6/8 09:17
+     */
+    @GetMapping("psychology/listPsychiatrist")
+    public Result<PsychologistInfoResultDTO> psychologistInfo(@LoginUser TokenDto userDetail, PsychologistInfoFormDTO formDto) {
+        return propertyService.psychologistInfo(userDetail, formDto);
+    }
 }

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

@@ -19,6 +19,8 @@ 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.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologistInfoFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicDetailFormDTO;
@@ -286,7 +288,6 @@ public interface PropertyFeignClient {
     @GetMapping(value = "property/epdc-app/comment/list", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<EventCommentsResultDTO> listOfComments(TopicCommentsFormDTO formDto);
 
-
     /***
      * 心理咨询师列表
      * @param fromDTO
@@ -297,4 +298,14 @@ public interface PropertyFeignClient {
     @GetMapping(value = "news/epdc-app/psychology/listPsychiatrist", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<PsychologistResultDTO>> listPsychiatrist(@RequestBody PsychologistFormDTO fromDTO);
 
+    /***
+     * 心理咨询师详细信息
+     * @param fromDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.PsychologistInfoResultDTO>>
+     * @author zhangyuan
+     * @date 2020/6/8 9:25
+     */
+    @GetMapping(value = "news/epdc-app/psychology/psychologistInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<PsychologistInfoResultDTO> psychologistInfo(@RequestBody PsychologistInfoFormDTO fromDTO);
+
 }

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

@@ -20,6 +20,8 @@ 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.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologistInfoFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicDetailFormDTO;
@@ -166,4 +168,9 @@ public class PropertyFeignClientFallback implements PropertyFeignClient {
     public Result<List<PsychologistResultDTO>> listPsychiatrist(PsychologistFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "listPsychiatrist", formDto);
     }
+
+    @Override
+    public Result<PsychologistInfoResultDTO> psychologistInfo(PsychologistInfoFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_PROPERTY_SERVER, "psychologistInfo", formDto);
+    }
 }

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

@@ -23,6 +23,8 @@ 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.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologistInfoFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicListFormDTO;
@@ -289,4 +291,15 @@ public interface PropertyService {
      */
     Result<List<PsychologistResultDTO>> listPsychiatrist(TokenDto userDetail, PsychologistFormDTO formDto);
 
+    /**
+     * 心理咨询师列表
+     *
+     * @param userDetail 用户信息
+     * @param formDto    查询参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.PsychologistInfoResultDTO>>
+     * @author zhangyuan
+     * @date 2020/6/8 09:15
+     */
+    Result<PsychologistInfoResultDTO> psychologistInfo(TokenDto userDetail, PsychologistInfoFormDTO formDto);
+
 }

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

@@ -28,6 +28,8 @@ 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.psychology.form.PsychologistFormDTO;
+import com.elink.esua.epdc.dto.psychology.form.PsychologistInfoFormDTO;
+import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO;
 import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicDetailFormDTO;
@@ -335,4 +337,10 @@ public class PropertyServiceImpl implements PropertyService {
         formDto.setGridId(userDetail.getGridId());
         return propertyFeignClient.listPsychiatrist(formDto);
     }
+
+    @Override
+    public Result<PsychologistInfoResultDTO> psychologistInfo(TokenDto userDetail, PsychologistInfoFormDTO formDto) {
+        formDto.setGridId(userDetail.getGridId());
+        return propertyFeignClient.psychologistInfo(formDto);
+    }
 }