From 6b311f323a82d44889f615824ac02aed6d2625d8 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 8 Jun 2020 16:01:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF-=E5=BF=83=E7=90=86?= =?UTF-8?q?=E5=92=A8=E8=AF=A2-=E9=97=AE=E9=A2=98=E5=88=97=E8=A1=A8app?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppPsychologistController.java | 15 +++++++++ .../psychology/dao/PsychologyAnswerDao.java | 26 ++++++++++++++- .../psychology/dao/PsychologyQuestionDao.java | 27 ++++++++++++++- .../service/PsychologistService.java | 22 +++++++++++++ .../service/impl/PsychologistServiceImpl.java | 33 +++++++++++++++++-- .../mapper/psychology/PsychologyAnswerDao.xml | 31 ++++++++++++++++- .../psychology/PsychologyQuestionDao.xml | 28 +++++++++++++++- 7 files changed, 176 insertions(+), 6 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java index fdfe282..86eb7f0 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/controller/AppPsychologistController.java @@ -24,9 +24,12 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; 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.form.PsychologyAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.form.PsychologyQuestionFormDTO; import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO; import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO; import com.elink.esua.epdc.modules.psychology.service.PsychologistService; import com.elink.esua.epdc.modules.psychology.service.PsychologyQuestionService; import org.springframework.beans.factory.annotation.Autowired; @@ -70,4 +73,16 @@ public class AppPsychologistController { psychologyQuestionService.saveFromApp(formDto); return new Result(); } + + @GetMapping("listUserQuestion") + public Result> listUserQuestion(@RequestBody PsychologyAnswerFormDTO formDto) throws Exception { + List data = psychologistService.listUserQuestion(formDto); + return new Result>().ok(data); + } + + @GetMapping("listQuestion") + public Result> listQuestion(@RequestBody PsychologyAnswerFormDTO formDto) throws Exception { + List data = psychologistService.listQuestion(formDto); + return new Result>().ok(data); + } } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyAnswerDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyAnswerDao.java index febf3ca..5938c74 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyAnswerDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyAnswerDao.java @@ -18,8 +18,13 @@ package com.elink.esua.epdc.modules.psychology.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerInfoResultDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerUserInfoResultDTO; import com.elink.esua.epdc.modules.psychology.entity.PsychologyAnswerEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 心理问题答复表 @@ -29,5 +34,24 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PsychologyAnswerDao extends BaseDao { - + + /** + * 居民端-心理咨询-我的问题列表 + * + * @return java.util.List + * @params [params] + * @author zhangyuan + * @since 2020/5/21 14:54 + */ + List listUserQuestion(@Param("questionId") String questionId); + + /** + * 居民端-心理咨询-我的问题列表 + * + * @return java.util.List + * @params [params] + * @author zhangyuan + * @since 2020/5/21 14:54 + */ + List listQuestion(@Param("questionId") String questionId); } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyQuestionDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyQuestionDao.java index ca6f9aa..602e7ad 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyQuestionDao.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/dao/PsychologyQuestionDao.java @@ -18,9 +18,14 @@ package com.elink.esua.epdc.modules.psychology.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.psychology.form.PsychologyAnswerFormDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO; import com.elink.esua.epdc.modules.psychology.entity.PsychologyQuestionEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 心理问题提问表 * @@ -29,5 +34,25 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PsychologyQuestionDao extends BaseDao { - + + /** + * 居民端-心理咨询-我的问题列表 + * + * @return java.util.List + * @params [params] + * @author zhangyuan + * @since 2020/5/21 14:54 + */ + List listUserQuestion(PsychologyAnswerFormDTO dto); + + /** + * 居民端-心理咨询-问题列表 + * + * @return java.util.List + * @params [params] + * @author zhangyuan + * @since 2020/5/21 14:54 + */ + List listQuestion(PsychologyAnswerFormDTO dto); + } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/PsychologistService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/PsychologistService.java index 8a369bb..8ac22b9 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/PsychologistService.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/PsychologistService.java @@ -22,8 +22,11 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.psychology.PsychologistDTO; 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.form.PsychologyAnswerFormDTO; import com.elink.esua.epdc.dto.psychology.result.PsychologistInfoResultDTO; import com.elink.esua.epdc.dto.psychology.result.PsychologistResultDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListResultDTO; +import com.elink.esua.epdc.dto.psychology.result.PsychologyAnswerListUserResultDTO; import com.elink.esua.epdc.modules.psychology.entity.PsychologistEntity; import java.util.List; @@ -117,4 +120,23 @@ public interface PsychologistService extends BaseService { */ PsychologistInfoResultDTO psychologistInfo(PsychologistInfoFormDTO dto); + /** + * 居民端-心理咨询-我的问题列表 + * + * @param dto + * @return List + * @author zhangyuan + * @date 2020-06-04 + */ + List listUserQuestion(PsychologyAnswerFormDTO dto); + + /** + * 居民端-心理咨询-问题列表 + * + * @param dto + * @return List + * @author zhangyuan + * @date 2020-06-04 + */ + List listQuestion(PsychologyAnswerFormDTO dto); } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java index 98c3567..f1d24db 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/psychology/service/impl/PsychologistServiceImpl.java @@ -26,10 +26,12 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.dto.psychology.PsychologistDTO; 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.psychology.form.PsychologyAnswerFormDTO; +import com.elink.esua.epdc.dto.psychology.result.*; import com.elink.esua.epdc.modules.psychology.dao.PsychologistDao; import com.elink.esua.epdc.modules.psychology.dao.PsychologistTitleRelationDao; +import com.elink.esua.epdc.modules.psychology.dao.PsychologyAnswerDao; +import com.elink.esua.epdc.modules.psychology.dao.PsychologyQuestionDao; import com.elink.esua.epdc.modules.psychology.entity.PsychologistEntity; import com.elink.esua.epdc.modules.psychology.entity.PsychologistTitleRelationEntity; import com.elink.esua.epdc.modules.psychology.redis.PsychologistRedis; @@ -60,6 +62,12 @@ public class PsychologistServiceImpl extends BaseServiceImpl page(Map params) { IPage page = getPage(params); @@ -148,4 +156,25 @@ public class PsychologistServiceImpl extends BaseServiceImpl listUserQuestion(PsychologyAnswerFormDTO dto) { + List data = psychologyQuestionDao.listUserQuestion(dto); + data.forEach(item -> { + List list = psychologyAnswerDao.listUserQuestion(item.getId()); + item.setAnswerList(list == null ? new ArrayList<>() : ConvertUtils.sourceToTarget(list, PsychologyAnswerUserInfoResultDTO.class)); + }); + + return data; + } + + @Override + public List listQuestion(PsychologyAnswerFormDTO dto) { + List data = psychologyQuestionDao.listQuestion(dto); + data.forEach(item -> { + List list = psychologyAnswerDao.listQuestion(item.getId()); + item.setAnswerList(list == null ? new ArrayList<>() : ConvertUtils.sourceToTarget(list, PsychologyAnswerInfoResultDTO.class)); + }); + + return data; + } } \ No newline at end of file diff --git a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyAnswerDao.xml b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyAnswerDao.xml index d3fbf8c..529340d 100644 --- a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyAnswerDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyAnswerDao.xml @@ -16,6 +16,35 @@ + + ID, QUESTION_ID, PSYCHOLOGIST_ID, PSYCHOLOGIST_NAME, ANSWER_CONTENT, + DEL_FLAG, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME + + - + \ No newline at end of file diff --git a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml index b0efe15..d89402b 100644 --- a/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml +++ b/epdc-cloud-property/src/main/resources/mapper/psychology/PsychologyQuestionDao.xml @@ -20,6 +20,32 @@ + + ID, USER_ID, USER_NAME, USER_AVATAR, QUESTION_CONTENT, ANONYMOUS_FLAG, PSYCHOLOGIST_ID, ANSWER_NUM, + DEL_FLAG, DISPLAY_FLAG, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME + + - + \ No newline at end of file