diff --git a/february-patient/february-patient-circle/february-patient-circle-common/src/main/java/com/february/patient/circle/domain/response/DiseaseName.java b/february-patient/february-patient-circle/february-patient-circle-common/src/main/java/com/february/patient/circle/domain/response/DiseaseName.java new file mode 100644 index 0000000..3bb01d5 --- /dev/null +++ b/february-patient/february-patient-circle/february-patient-circle-common/src/main/java/com/february/patient/circle/domain/response/DiseaseName.java @@ -0,0 +1,21 @@ +package com.february.patient.circle.domain.response; + +import lombok.Data; + +/** + * @program: february + * @description: 科室名称 + * @author: Mr.Wang + * @create: 2023-10-22 15:47 + **/ +@Data +public class DiseaseName { + /** + * 科室id + */ + private Integer diseaseId; + /** + * 科室名称 + */ + private String diseaseName; +} diff --git a/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/controller/PatientController.java b/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/controller/PatientController.java index a91a899..06ae919 100644 --- a/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/controller/PatientController.java +++ b/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/controller/PatientController.java @@ -24,131 +24,140 @@ import java.util.List; public class PatientController { @Autowired private PatientService patientService; - /** - * 病友圈列表信息 - * @param userId - * @return - */ - @PostMapping("/patientCircleList") - public Result> patientCircleList(Integer diseaseId){ - return patientService.patientCircleList(diseaseId); - } - /** - * 个人信息展示 - */ - @PostMapping("/patientList") - public Result> patientList(String patientNickname){ - return patientService.patientList(patientNickname); - } - /** - * 评论列表 - * @return - */ - @GetMapping("/reviewList") - public Result> reviewList(){ - return patientService.reviewList(); - } - /** - * 病友圈搜索功能 - * @param patientCircle - * @return - */ - @PostMapping("/findPatientCircle") - public Result> findPatientCircle(String patientCircle){ - return patientService.findPatientCircle(patientCircle); - } +// /** +// * 病友圈列表信息 +// * @param userId +// * @return +// */ +// @PostMapping("/patientCircleList") +// public Result> patientCircleList(Integer diseaseId){ +// return patientService.patientCircleList(diseaseId); +// } +// /** +// * 个人信息展示 +// */ +// @PostMapping("/patientList") +// public Result> patientList(String patientNickname){ +// return patientService.patientList(patientNickname); +// } +// /** +// * 评论列表 +// * @return +// */ +// @GetMapping("/reviewList") +// public Result> reviewList(){ +// return patientService.reviewList(); +// } +// /** +// * 病友圈搜索功能 +// * @param patientCircle +// * @return +// */ +// @PostMapping("/findPatientCircle") +// public Result> findPatientCircle(String patientCircle){ +// return patientService.findPatientCircle(patientCircle); +// } +// +// /** +// * 病症级联查询 +// * @return +// */ +// @GetMapping("diseaseList") +// public Result> diseaseList(){ +// return patientService.diseaseList(); +// } +// +// /** +// * 药品级联查询 +// * @return +// */ +// @GetMapping("/drugList") +// public Result> drugList(){ +// return patientService.drugList(); +// } +// +// /** +// * 发布病友圈 +// * @param patientCircleRequest +// * @return +// */ +// @PostMapping("/addPatientCircle") +// public Result addPatientCircle(PatientCircleRequest patientCircleRequest){ +// return patientService.addPatientCircle(patientCircleRequest); +// } +// +// /** +// * 发布的病友圈发布者信息 +// * @param userId +// * @return +// */ +// @PostMapping("/findPatientCircleList") +// public Result> findPatientCircleList(@RequestParam Integer userId){ +// return patientService.findPatientCircleList(userId); +// } +// +// /** +// * 查询被采纳的建议 +// * @param isAdopt +// * @return +// */ +// @PostMapping("/findAdoptReview") +// public Result findAdoptReview(@RequestParam Integer isAdopt){ +// return patientService.findAdoptReview(isAdopt); +// } +// /** +// * 身份证照片上传 +// * @param file +// * @return +// */ +// @PostMapping("/upload") +// public Result upload(@RequestParam("file")MultipartFile file){ +// return patientService.upload(file); +// } +// +// /** +// * 根据邮箱号查询 +// * @param userEmailNumber +// * @return +// */ +// @PostMapping("/findByUserEmail") +// public Result findByUserEmail(@RequestParam String userEmailNumber){ +// return patientService.findByUserEmail(userEmailNumber); +// } +// /** +// * 患者病友圈发表评论 +// */ +// @PostMapping("/patientToSick") +// public Result patientToSick(@RequestBody ReviewPatientRequest reviewPatientRequest){ +// return patientService.patientToSick(reviewPatientRequest); +// } +// +// /** +// * 上传照片文件 +// * @param file +// * @return +// */ +// @PostMapping("/uploadMsg") +// public Result uploadMsg(@RequestParam("file")MultipartFile file){ +// return patientService.uploadMsg(file); +// } +// +// /** +// * 科室名称查询 +// * @param diseaseId +// * @return +// */ +// @PostMapping("/findDiseaseName") +// public String findDiseaseName(@RequestParam Integer diseaseId){ +// return patientService.findDiseaseName(diseaseId); +// } /** - * 病症级联查询 + * 查询科室名称 * @return */ - @GetMapping("diseaseList") - public Result> diseaseList(){ - return patientService.diseaseList(); - } - - /** - * 药品级联查询 - * @return - */ - @GetMapping("/drugList") - public Result> drugList(){ - return patientService.drugList(); - } - - /** - * 发布病友圈 - * @param patientCircleRequest - * @return - */ - @PostMapping("/addPatientCircle") - public Result addPatientCircle(PatientCircleRequest patientCircleRequest){ - return patientService.addPatientCircle(patientCircleRequest); - } - - /** - * 发布的病友圈发布者信息 - * @param userId - * @return - */ - @PostMapping("/findPatientCircleList") - public Result> findPatientCircleList(@RequestParam Integer userId){ - return patientService.findPatientCircleList(userId); - } - - /** - * 查询被采纳的建议 - * @param isAdopt - * @return - */ - @PostMapping("/findAdoptReview") - public Result findAdoptReview(@RequestParam Integer isAdopt){ - return patientService.findAdoptReview(isAdopt); - } - /** - * 身份证照片上传 - * @param file - * @return - */ - @PostMapping("/upload") - public Result upload(@RequestParam("file")MultipartFile file){ - return patientService.upload(file); - } - - /** - * 根据邮箱号查询 - * @param userEmailNumber - * @return - */ - @PostMapping("/findByUserEmail") - public Result findByUserEmail(@RequestParam String userEmailNumber){ - return patientService.findByUserEmail(userEmailNumber); - } - /** - * 患者病友圈发表评论 - */ - @PostMapping("/patientToSick") - public Result patientToSick(@RequestBody ReviewPatientRequest reviewPatientRequest){ - return patientService.patientToSick(reviewPatientRequest); - } - - /** - * 上传照片文件 - * @param file - * @return - */ - @PostMapping("/uploadMsg") - public Result uploadMsg(@RequestParam("file")MultipartFile file){ - return patientService.uploadMsg(file); - } - - /** - * 科室名称查询 - * @param diseaseId - * @return - */ - @PostMapping("/findDiseaseName") - public String findDiseaseName(@RequestParam Integer diseaseId){ - return patientService.findDiseaseName(diseaseId); + @GetMapping("/findDiseaseName") + public Result> findDiseaseName(){ + return patientService.findDiseaseName(); } } diff --git a/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/mapper/PatientMapper.java b/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/mapper/PatientMapper.java index a4cd189..b0c2d18 100644 --- a/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/mapper/PatientMapper.java +++ b/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/mapper/PatientMapper.java @@ -18,29 +18,30 @@ import java.util.List; **/ @Mapper public interface PatientMapper { - List patientCircleList(@Param("diseaseId") Integer diseaseId); - - - - List reviewList(); - - List findPatientCircle(@Param("patientCircle") String patientCircle); - - List diseaseList(); - - List drugList(); - - Integer addPatientCircle(PatientCircleRequest patientCircleRequest); - - List findPatientCircleList(@Param("userId") Integer userId); - - Review findAdoptReview(@Param("isAdopt") Integer isAdopt); - - User findByUserEmail(@Param("userEmailNumber") String userEmailNumber); - - List patientList(@Param("patientNickname") String patientNickname); - - Integer patientToSick(ReviewPatientRequest reviewPatientRequest); - - String findDiseaseName(@Param("diseaseId") Integer diseaseId); + List findDiseaseName(); +// List patientCircleList(@Param("diseaseId") Integer diseaseId); +// +// +// +// List reviewList(); +// +// List findPatientCircle(@Param("patientCircle") String patientCircle); +// +// List diseaseList(); +// +// List drugList(); +// +// Integer addPatientCircle(PatientCircleRequest patientCircleRequest); +// +// List findPatientCircleList(@Param("userId") Integer userId); +// +// Review findAdoptReview(@Param("isAdopt") Integer isAdopt); +// +// User findByUserEmail(@Param("userEmailNumber") String userEmailNumber); +// +// List patientList(@Param("patientNickname") String patientNickname); +// +// Integer patientToSick(ReviewPatientRequest reviewPatientRequest); +// +// String findDiseaseName(@Param("diseaseId") Integer diseaseId); } diff --git a/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/service/PatientService.java b/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/service/PatientService.java index 794ac40..2ab0c61 100644 --- a/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/service/PatientService.java +++ b/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/service/PatientService.java @@ -20,31 +20,32 @@ import java.util.List; **/ @Component public interface PatientService { - Result> patientCircleList(Integer diseaseId); - - Result> patientList(String patientNickname); - - Result> reviewList(); - - Result> findPatientCircle(String patientCircle); - - Result> diseaseList(); - - Result> drugList(); - - Result addPatientCircle(PatientCircleRequest patientCircleRequest); - - Result> findPatientCircleList(Integer userId); - - Result findAdoptReview(Integer isAdopt); - - Result upload(MultipartFile file); - - Result findByUserEmail(String userEmailNumber); - - Result patientToSick(ReviewPatientRequest reviewPatientRequest); - - Result uploadMsg(MultipartFile file); - - String findDiseaseName(Integer diseaseId); + Result> findDiseaseName(); +// Result> patientCircleList(Integer diseaseId); +// +// Result> patientList(String patientNickname); +// +// Result> reviewList(); +// +// Result> findPatientCircle(String patientCircle); +// +// Result> diseaseList(); +// +// Result> drugList(); +// +// Result addPatientCircle(PatientCircleRequest patientCircleRequest); +// +// Result> findPatientCircleList(Integer userId); +// +// Result findAdoptReview(Integer isAdopt); +// +// Result upload(MultipartFile file); +// +// Result findByUserEmail(String userEmailNumber); +// +// Result patientToSick(ReviewPatientRequest reviewPatientRequest); +// +// Result uploadMsg(MultipartFile file); +// +// String findDiseaseName(Integer diseaseId); } diff --git a/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/service/impl/PatientServiceImpl.java b/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/service/impl/PatientServiceImpl.java index e1de79a..0848ba3 100644 --- a/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/service/impl/PatientServiceImpl.java +++ b/february-patient/february-patient-circle/february-patient-circle-server/src/main/java/com/february/patient/circle/service/impl/PatientServiceImpl.java @@ -33,105 +33,111 @@ public class PatientServiceImpl implements PatientService { private FastUtil fastUtil; @Autowired private OssUtil ossUtil; + @Override - public Result> patientCircleList(Integer diseaseId) { - String diseaseName = findDiseaseName(diseaseId); - List list=patientMapper.patientCircleList(diseaseId); - list.forEach(l->{ - l.setDiseaseName(diseaseName); - }); + public Result> findDiseaseName() { + List list=patientMapper.findDiseaseName(); return Result.success(list); } - - @Override - public Result> patientList(String patientNickname) { - List list=patientMapper.patientList(patientNickname); - return Result.success(list); - } - - @Override - public Result> reviewList() { - List list=patientMapper.reviewList(); - return Result.success(list); - } - - @Override - public Result> findPatientCircle(String patientCircle) { - List list=patientMapper.findPatientCircle(patientCircle); - return Result.success(list); - } - - @Override - public Result> diseaseList() { - List list=patientMapper.diseaseList(); - return Result.success(list); - } - - @Override - public Result> drugList() { - List list=patientMapper.drugList(); - return Result.success(list); - } - - @Override - public Result addPatientCircle(PatientCircleRequest patientCircleRequest) { - Integer i=patientMapper.addPatientCircle(patientCircleRequest); - return Result.success(i); - } - - @Override - public Result> findPatientCircleList(Integer userId) { - List list=patientMapper.findPatientCircleList(userId); - return Result.success(list); - } - - @Override - public Result findAdoptReview(Integer isAdopt) { - Review review=patientMapper.findAdoptReview(isAdopt); - return Result.success(review); - } - - @Override - public Result upload(MultipartFile file) { - String upload=""; - try { - upload = fastUtil.upload(file); - return Result.success("http://47.120.41.50:8888/"+upload,"上传成功"); - }catch (Exception e){ - e.printStackTrace(); - } - return Result.error("上传失败"); - } - - @Override - public Result findByUserEmail(String userEmailNumber) { - User user=patientMapper.findByUserEmail(userEmailNumber); - return Result.success(user); - } - - @Override - public Result patientToSick(ReviewPatientRequest reviewPatientRequest) { - Integer i=patientMapper.patientToSick(reviewPatientRequest); - if(i>0){ - return Result.success("评论成功"); - } - return Result.success("评论失败"); - } - - @Override - public Result uploadMsg(MultipartFile file) { - try { - String s = OssUtil.UploadImage(file); - return Result.success(s); - }catch (Exception e){ - e.printStackTrace(); - } - return Result.success("上传失败"); - } - - @Override - public String findDiseaseName(Integer diseaseId) { - - return patientMapper.findDiseaseName(diseaseId); - } +// @Override +// public Result> patientCircleList(Integer diseaseId) { +// String diseaseName = findDiseaseName(diseaseId); +// List list=patientMapper.patientCircleList(diseaseId); +// list.forEach(l->{ +// l.setDiseaseName(diseaseName); +// }); +// return Result.success(list); +// } +// +// @Override +// public Result> patientList(String patientNickname) { +// List list=patientMapper.patientList(patientNickname); +// return Result.success(list); +// } +// +// @Override +// public Result> reviewList() { +// List list=patientMapper.reviewList(); +// return Result.success(list); +// } +// +// @Override +// public Result> findPatientCircle(String patientCircle) { +// List list=patientMapper.findPatientCircle(patientCircle); +// return Result.success(list); +// } +// +// @Override +// public Result> diseaseList() { +// List list=patientMapper.diseaseList(); +// return Result.success(list); +// } +// +// @Override +// public Result> drugList() { +// List list=patientMapper.drugList(); +// return Result.success(list); +// } +// +// @Override +// public Result addPatientCircle(PatientCircleRequest patientCircleRequest) { +// Integer i=patientMapper.addPatientCircle(patientCircleRequest); +// return Result.success(i); +// } +// +// @Override +// public Result> findPatientCircleList(Integer userId) { +// List list=patientMapper.findPatientCircleList(userId); +// return Result.success(list); +// } +// +// @Override +// public Result findAdoptReview(Integer isAdopt) { +// Review review=patientMapper.findAdoptReview(isAdopt); +// return Result.success(review); +// } +// +// @Override +// public Result upload(MultipartFile file) { +// String upload=""; +// try { +// upload = fastUtil.upload(file); +// return Result.success("http://47.120.41.50:8888/"+upload,"上传成功"); +// }catch (Exception e){ +// e.printStackTrace(); +// } +// return Result.error("上传失败"); +// } +// +// @Override +// public Result findByUserEmail(String userEmailNumber) { +// User user=patientMapper.findByUserEmail(userEmailNumber); +// return Result.success(user); +// } +// +// @Override +// public Result patientToSick(ReviewPatientRequest reviewPatientRequest) { +// Integer i=patientMapper.patientToSick(reviewPatientRequest); +// if(i>0){ +// return Result.success("评论成功"); +// } +// return Result.success("评论失败"); +// } +// +// @Override +// public Result uploadMsg(MultipartFile file) { +// try { +// String s = OssUtil.UploadImage(file); +// return Result.success(s); +// }catch (Exception e){ +// e.printStackTrace(); +// } +// return Result.success("上传失败"); +// } +// +// @Override +// public String findDiseaseName(Integer diseaseId) { +// +// return patientMapper.findDiseaseName(diseaseId); +// } } diff --git a/february-patient/february-patient-circle/february-patient-circle-server/src/main/resources/mapper/circle/PatientMapper.xml b/february-patient/february-patient-circle/february-patient-circle-server/src/main/resources/mapper/circle/PatientMapper.xml index b8b9412..f1065b4 100644 --- a/february-patient/february-patient-circle/february-patient-circle-server/src/main/resources/mapper/circle/PatientMapper.xml +++ b/february-patient/february-patient-circle/february-patient-circle-server/src/main/resources/mapper/circle/PatientMapper.xml @@ -37,5 +37,9 @@ + +