From cd84674a5015a2d3d8afc7ff36c1bb324251ef15 Mon Sep 17 00:00:00 2001 From: liyongbin <2954265606@qq,com> Date: Sat, 20 Jan 2024 08:57:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=97=85=E5=8F=8B=E5=9C=88=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/security/utils/SecurityUtils.java | 9 +- .../controller/CollectSickController.java | 6 +- .../DiseaseKnowledgeController.java | 15 ++- .../HealthDepartmentController.java | 62 ++++++++++ .../doctor/controller/PatientController.java | 61 ++++------ .../controller/SickCircleController.java | 69 +++++++++++ .../domain/entity/SickCircleEntity.java | 62 +++++++++- .../domain/entity/SickCommentEntity.java | 41 ++++--- .../java/doctor/mapper/PatientMapper.java | 2 + .../java/doctor/mapper/SickCircleMapper.java | 12 +- .../java/doctor/service/PatientService.java | 7 +- .../java/doctor/service/SickCircleServer.java | 21 ++++ .../service/impl/PatientServiceImpl.java | 14 ++- .../service/impl/SickCircleServerImpl.java | 107 ++++++++++++++++++ .../service/impl/SickCircleServiceImpl.java | 2 +- .../doctor/DiseaseCategoryServiceMapper.xml | 1 + .../resources/mapper/doctor/PatientMapper.xml | 26 ++++- .../mapper/doctor/SickCircleMapper.xml | 4 + 18 files changed, 443 insertions(+), 78 deletions(-) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/SickCircleController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleServer.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServerImpl.java diff --git a/doctor-common/doctor-common-security/src/main/java/doctor/common/security/utils/SecurityUtils.java b/doctor-common/doctor-common-security/src/main/java/doctor/common/security/utils/SecurityUtils.java index e26c1a3..126e886 100644 --- a/doctor-common/doctor-common-security/src/main/java/doctor/common/security/utils/SecurityUtils.java +++ b/doctor-common/doctor-common-security/src/main/java/doctor/common/security/utils/SecurityUtils.java @@ -11,7 +11,7 @@ import doctor.system.api.model.LoginUser; /** * 权限获取工具类 - * + * * @author ruoyi */ public class SecurityUtils @@ -63,6 +63,11 @@ public class SecurityUtils { // 从header获取token标识 String token = request.getHeader(TokenConstants.AUTHENTICATION); + if (StringUtils.isEmpty(token)) + { + // 从参数获取token + token = request.getHeader(TokenConstants.SESSIONID); + } return replaceTokenPrefix(token); } @@ -81,7 +86,7 @@ public class SecurityUtils /** * 是否为管理员 - * + * * @param userId 用户ID * @return 结果 */ diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/CollectSickController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/CollectSickController.java index 9ee8153..3b87e44 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/CollectSickController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/CollectSickController.java @@ -27,7 +27,7 @@ import java.util.Map; * @Author 栗永斌 */ @RestController -@RequestMapping("/verify/v1") +@RequestMapping("/user/verify/v1") public class CollectSickController { @Autowired CollectSickService service; @@ -60,8 +60,9 @@ public class CollectSickController { */ @PostMapping("/file") public void file(MultipartFile file) { - // TODO 存储OSS + String s = OssUtil.uploadMultipartFile(file); + String host = "https://cardnumber.market.alicloudapi.com"; String path = "/rest/160601/ocr/ocr_idcard.json"; String appcode = "94e0f9d0960f4931ad24eabfa187dcfe"; @@ -143,4 +144,5 @@ public class CollectSickController { } return imgBase64; } + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java index b12af44..508013b 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java @@ -4,6 +4,7 @@ package doctor.controller; import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.*; +import doctor.service.DiseaseCategoryService; import doctor.service.DiseaseKnowledgeService; import doctor.service.HealthJobTitleService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +34,14 @@ public class DiseaseKnowledgeController { List departments= diseaseKnowledgeService.findDepartment(); return HealthR.ok(departments); } + @Autowired + private DiseaseCategoryService diseaseCategoryService; + + @GetMapping("/findDiseaseCategory") + public HealthR> findDiseaseCategory(@RequestParam Integer departmentId){ + List list=diseaseCategoryService.findDiseaseCategory(departmentId); + return HealthR.ok(list); + } //罕见病症详情 @GetMapping("/findDiseaseKnowledge") @@ -53,11 +62,13 @@ public class DiseaseKnowledgeController { List list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId); return HealthR.ok(list); } + @GetMapping("/findDrugsKnowledge") public HealthR findDrugsKnowledge(@RequestParam Integer id){ DrugsKnowledge list=diseaseKnowledgeService.findDrugsKnowledge(id); return HealthR.ok(list); } + @GetMapping("/popularSearch") public HealthR> popularSeach(){ List list=diseaseKnowledgeService.popularSeach(); @@ -68,8 +79,4 @@ public class DiseaseKnowledgeController { - - - - } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java new file mode 100644 index 0000000..bd8a3b5 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java @@ -0,0 +1,62 @@ +package doctor.controller; + +import doctor.common.core.domain.HealthR; +import doctor.domain.entity.*; +import doctor.service.DepartmentService; +import doctor.service.DiseaseCategoryService; +import doctor.service.DiseaseKnowledgeService; +import doctor.service.HealthDepartmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +import static com.github.pagehelper.page.PageMethod.startPage; + +@RestController +@RequestMapping("/knowledgeBase/v1") +public class HealthDepartmentController { + + @Autowired + private HealthDepartmentService healthV1Service; + @Autowired + private DiseaseCategoryService diseaseCategoryService; + + @Autowired + private DiseaseKnowledgeService diseaseKnowledgeService; + //罕见病症详情 + @GetMapping("/findDiseaseKnowledge") + public HealthR> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){ + return HealthR.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId)); + } + + @GetMapping("/findDrugsCategoryList") + public HealthR> findDrugsCategoryList(){ + return HealthR.ok(diseaseKnowledgeService.findDrugsCategoryList()); + } + @GetMapping("/findDrugsKnowledgeList") + public HealthR> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId, + @RequestParam(value = "page",defaultValue = "1") Integer page, + @RequestParam(value = "count",defaultValue = "5") Integer count){ + + startPage(page,count); + List list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId); + return HealthR.ok(list); + } + + + @GetMapping("/findDiseaseCategory") + public HealthR> findDiseaseCategory(@RequestParam Integer departmentId){ + List list=diseaseCategoryService.findDiseaseCategory(departmentId); + return HealthR.ok(list); + } + + @GetMapping("/findDepartment") + public HealthR> findDepartment(){ + List departmentEntities=healthV1Service.findDepartment(); + return HealthR.ok(departmentEntities); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java index 2220e32..cfdd639 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java @@ -25,47 +25,13 @@ import java.util.List; * @Author 栗永斌 */ @RestController -@RequestMapping("/sickCircle/v1/") +@RequestMapping("/user/sickCircle/v1/") public class PatientController { @Autowired private PatientService patientService; - @Autowired - private SickCircleService sickCircleService; - /** - * 发表评论 - */ - @PostMapping("/publishComment") - public Result publishComment( - @RequestParam("sickCircleId") Integer sickCircleId, - @RequestParam("content") String content) { - - return sickCircleService.publishComment(sickCircleId, content); - } - - - /** - * 点采 - * @param opinion - * @return - */ - @PutMapping("expressOpinion") - public HealthR expressOpinion(@RequestParam("opinion") Integer opinion){ -// return sickCircleServer.expressOpinion(commentId, opinion); - System.out.println(opinion); - return null; - } - - /** - * 新增病友圈 - */ - @PostMapping("/publishSickCircle") - public HealthR publishSickCircle(@RequestBody SickCircleEntity sickCircleEntity) { - - return sickCircleService.publishSickCircle(sickCircleEntity); - } @@ -78,7 +44,8 @@ public class PatientController { @GetMapping("/findSickCircleList") public HealthR> sickCircleList(@RequestParam(value = "departmentId",required = false) Integer departmentId, @RequestParam(value = "page",defaultValue = "1") Integer page, - @RequestParam(value = "count",defaultValue = "10") Integer count) { + @RequestParam(value = "count",defaultValue = "20") Integer count) { + return patientService.sickCircleList(departmentId); } @@ -122,9 +89,27 @@ public class PatientController { * @param keyWord * @return */ - @GetMapping("searchSickCircle") + @GetMapping("/searchSickCircle") public HealthR> searchSickCircle(@RequestParam(value = "keyWord",required = false) String keyWord){ + System.out.println(keyWord); return patientService.searchSickCircle(keyWord); - } + + + /** + * 查询患者创建的病友圈 + * @param patientUserId + * @return + */ + @GetMapping("/findPatientSickCircleList") + public HealthR> findPatientSickCircleList(@RequestParam(value = "patientUserId",required = false) Integer patientUserId, + @RequestParam(value = "page",defaultValue = "1") Integer page, + @RequestParam(value = "count",defaultValue = "20") Integer count) { + startPage(page, count); + return patientService.findPatientSickCircleList(patientUserId); + } + + + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/SickCircleController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/SickCircleController.java new file mode 100644 index 0000000..e2c7c3a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/SickCircleController.java @@ -0,0 +1,69 @@ +package doctor.controller; + +import com.alibaba.nacos.api.model.v2.Result; +import doctor.common.core.domain.HealthR; +import doctor.domain.entity.SickCircleEntity; +import doctor.domain.vo.SickCommentVo; +import doctor.service.SickCircleServer; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +/** + * @ClassName SickCircle + * @Description 新增病友圈 + */ +@RestController +@RequestMapping("/user/sickCircle/verify/v1/") +public class SickCircleController { + @Autowired + SickCircleServer sickCircleServer; + + + /** + * 新增病友圈 + */ + @PostMapping("/publishSickCircle") + public HealthR publishSickCircle(@RequestBody SickCircleEntity sickCircleEntity) { + + return sickCircleServer.publishSickCircle(sickCircleEntity); + } + + /** + * 上传图片 + * + * @param picture + * @return + */ + @PostMapping("/uploadSickCirclePicture") + public Result upload(@RequestParam("picture") MultipartFile picture) { + return sickCircleServer.pictures(picture); + } + + + /** + * 发表评论 + */ + @PostMapping("/publishComment") + public Result publishComment( + @RequestParam("sickCircleId") Integer sickCircleId, + @RequestParam("content") String content) { + return sickCircleServer.publishComment(sickCircleId, content); + } + + + /** + * 点采 + * @param opinion + * @return + */ + @PutMapping("expressOpinion") + public HealthR expressOpinion(@RequestParam("commentId") Integer commentId, + @RequestParam("opinion") Integer opinion){ +// return sickCircleServer.expressOpinion(commentId, opinion); + + return sickCircleServer.expressOpinion(commentId, opinion); + } + + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java index fb7326e..b5fc231 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java @@ -9,41 +9,99 @@ import java.util.Date; @Data public class SickCircleEntity { + /** + * 病例ID + */ private Integer sickCircleId; - private Integer userId; + /** + * 用户ID + */ + private Long userId; + /** + * 病例标题 + */ private String title; + /** + * 部门ID + */ private Integer departmentId; + /** + * 采纳评论ID + */ private Integer adoptCommentId; + /** + * 疾病名称 + */ private String disease; - + /** + * 病例详情 + */ private String detail; + /** + * 治疗医院 + */ private String treatmentHospital; + /** + * 治疗开始时间 + */ private Date treatmentStartTime; + /** + * 治疗结束时间 + */ private Date treatmentEndTime; + /** + * 治疗过程 + */ private String treatmentProcess; + /** + * 图片 + */ private String picture; + /** + * 发布时间 + */ private Date releaseTime; + /** + * 采纳时间 + */ private Date adoptTime; + /** + * 治愈人数 + */ private Integer amount; + /** + * 创建时间 + */ private LocalDateTime createTime; + /** + * 收藏数 + */ private Integer collectionNum; + /** + * 评论数 + */ private Integer commentNum; + /** + * 科室名称 + */ + private String department; + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCommentEntity.java index 28fff5e..b633f52 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCommentEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCommentEntity.java @@ -2,6 +2,8 @@ package doctor.domain.entity; import lombok.Data; +import java.util.Date; + /** * @ClassName SickConmentEntity * @Description 评论表 @@ -10,19 +12,32 @@ import lombok.Data; @Data public class SickCommentEntity { - // 私有变量，评论的ID - private String id; - // 私有变量，评论所属的圈子ID - private String sickCircleId; - // 私有变量，评论的用户ID - private String userId; - // 私有变量，评论的内容 +// // 私有变量，评论的ID +// private String id; +// // 私有变量，评论所属的圈子ID +// private String sickCircleId; +// // 私有变量，评论的用户ID +// private String patientUserId; +// // 私有变量，评论的内容 +// private String content; +// // 私有变量，评论的评论时间 +// private String commentTime; +// // 私有变量，是否为医生评论 +// private String whetherDoctor; +// // 私有变量，评论的创建时间 +// private String createTime; + + private String content; - // 私有变量，评论的评论时间 - private String commentTime; - // 私有变量，是否为医生评论 - private String whetherDoctor; - // 私有变量，评论的创建时间 - private String createTime; + private Date createTime; + private Integer patientUserId; + private Integer whetherDoctor; + private Integer commentId; + private Integer opposeNum; + private Integer supportNum; + private Integer opinion; + + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/PatientMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/PatientMapper.java index 7772ed8..f0772ec 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/PatientMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/PatientMapper.java @@ -37,4 +37,6 @@ public interface PatientMapper { List searchSickCircle(@Param("keyWord") String keyWord); + List findPatientSickCircleList(@Param("patientUserId") Integer patientUserId); + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java index 43b5d7a..84d12f3 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java @@ -3,18 +3,22 @@ package doctor.mapper; import doctor.domain.entity.SickCircleEntity; import doctor.domain.vo.SickInfoVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper public interface SickCircleMapper { - List findSickCircleList(Integer departmentId); + List findSickCircleList(@Param("departmentId") Integer departmentId); - SickCircleEntity findSickCircleInfo(Integer sickCircleId); + SickCircleEntity findSickCircleInfo(@Param("sickCircleId") Integer sickCircleId); - SickCircleEntity findSickCircleInfoByKeyWord(String keyWord); + SickCircleEntity findSickCircleInfoByKeyWord(@Param("keyWord") String keyWord); - void publishComment(Integer sickCircleId, Long userid, String content); + void publishComment(@Param("sickCircleId") Integer sickCircleId, @Param("userid") Long userid, @Param("content") String content); void publishSickCircle(SickCircleEntity sickCircleEntity); + + + void expressOpinion(@Param("commentId") Integer commentId, @Param("opinion") Integer opinion, @Param("userid") Long userid); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/PatientService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/PatientService.java index dd76484..1af179c 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/PatientService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/PatientService.java @@ -5,6 +5,7 @@ import doctor.common.core.domain.HealthR; import doctor.domain.entity.SickCircleEntity; import doctor.domain.entity.SickCommentEntity; import doctor.domain.entity.SymptomEntity; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,13 +30,15 @@ public interface PatientService { - HealthR> sickCircleList(Integer departmentId); + HealthR> sickCircleList(@Param("departmentId") Integer departmentId); - HealthR> findSickCircleCommentList(Integer sickCircleId); + HealthR> findSickCircleCommentList(@Param("sickCircleId") Integer sickCircleId); HealthR> searchSickCircle(String keyWord); + HealthR> findPatientSickCircleList(Integer patientUserId); + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleServer.java b/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleServer.java new file mode 100644 index 0000000..4f918ed --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleServer.java @@ -0,0 +1,21 @@ +package doctor.service; + +import com.alibaba.nacos.api.model.v2.Result; +import doctor.common.core.domain.HealthR; +import doctor.domain.entity.SickCircleEntity; +import doctor.domain.vo.SickCommentVo; +import org.springframework.web.multipart.MultipartFile; + +/** + * @ClassName SickCircleServer + * @Description 描述 + */ +public interface SickCircleServer { + HealthR publishSickCircle(SickCircleEntity sickCircleEntity); + Result pictures(MultipartFile picture); + Result publishComment(Integer sickCircleId, String content); + + + HealthR expressOpinion(Integer commentId, Integer opinion); + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java index 5a4a5a5..fb645d6 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.nacos.api.model.v2.Result; import doctor.common.core.constant.TokenConstants; import doctor.common.core.domain.HealthR; import doctor.common.security.service.TokenService; +import doctor.common.security.utils.SecurityUtils; import doctor.domain.entity.SickCircleEntity; import doctor.domain.entity.SickCommentEntity; import doctor.domain.entity.SymptomEntity; @@ -28,12 +29,6 @@ public class PatientServiceImpl implements PatientService { @Autowired private PatientMapper patientMapper; - - - - - - @Override public HealthR> sickCircleList(Integer departmentId) { /** @@ -62,9 +57,16 @@ public class PatientServiceImpl implements PatientService { @Override public HealthR> searchSickCircle(String keyWord) { List list= patientMapper.searchSickCircle(keyWord); + return HealthR.ok(list); } + @Override + public HealthR> findPatientSickCircleList(Integer patientUserId) { + List sickCircleEntity = patientMapper.findPatientSickCircleList(patientUserId); + return HealthR.ok(sickCircleEntity); + } + @Override public SickCircleEntity findSickCircleInfo(Integer id) { diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServerImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServerImpl.java new file mode 100644 index 0000000..9382176 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServerImpl.java @@ -0,0 +1,107 @@ +package doctor.service.impl; + +import com.alibaba.nacos.api.model.v2.Result; +import doctor.common.core.constant.TokenConstants; +import doctor.common.core.domain.HealthR; +import doctor.common.core.domain.R; +import doctor.common.security.service.TokenService; +import doctor.common.core.utils.StringUtils; +import doctor.domain.entity.SickCircleEntity; +import doctor.domain.vo.SickCommentVo; +import doctor.mapper.SickCircleMapper; +import doctor.service.SickCircleServer; +import doctor.system.api.model.LoginUser; +import doctor.util.OssUtil; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.persistence.Access; +import javax.servlet.http.HttpServletRequest; + +/** + * @ClassName SickCircleServerImpl + * @Description 描述 + */ +@Service +@Log4j2 +public class SickCircleServerImpl implements SickCircleServer { + + @Autowired + SickCircleMapper mapper; + + @Override + public HealthR publishSickCircle(SickCircleEntity sickCircleEntity) { + if (StringUtils.isEmpty(sickCircleEntity.getTitle())) { + Result.failure("标题不能为空"); + } + if (StringUtils.isEmpty(sickCircleEntity.getTitle())) { + Result.failure("标题不能为空"); + } + if (StringUtils.isEmpty(sickCircleEntity.getDisease())) { + Result.failure("症状不能为空"); + } + if (StringUtils.isEmpty(sickCircleEntity.getDetail())) { + Result.failure("描述不能为空"); + } + if (StringUtils.isEmpty(sickCircleEntity.getTreatmentProcess())) { + Result.failure("治疗过程不能为空"); + } + LoginUser login = Login(); + sickCircleEntity.setUserId(login.getUserid()); + String s = redisTemplate.opsForValue().get("url"); + sickCircleEntity.setPicture(s); + mapper.publishSickCircle(sickCircleEntity); + return HealthR.ok(sickCircleEntity); + } + + + @Autowired + HttpServletRequest httpServletRequest; + @Autowired + TokenService tokenService; + + private LoginUser Login() { + + String header = httpServletRequest.getHeader(TokenConstants.SESSIONID); + LoginUser loginUser = tokenService.getLoginUser(header); + return loginUser; + } + + + @Autowired + RedisTemplate redisTemplate; + @Override + public Result pictures(MultipartFile picture) { + String url = OssUtil.uploadMultipartFile(picture); + if (StringUtils.isEmpty(url)){ + log.info("上传oss成功:"+url); + } +// redisTemplate.opsForValue().set("usr",url); + return Result.success(url); + } + + @Override + public Result publishComment(Integer sickCircleId, String content) { + //获取用户对象 + LoginUser login = Login(); + //获取用户id + Long userid = login.getUserid(); + + mapper.publishComment(sickCircleId,userid, content); + + return Result.success(null); + } + + @Override + public HealthR expressOpinion(Integer commentId, Integer opinion) { + LoginUser login = Login(); + Long userid = login.getUserid(); + mapper.expressOpinion(commentId, opinion,userid); + + return HealthR.ok(); + } + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java index 7ef7fd7..94b7f59 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java @@ -90,7 +90,7 @@ public class SickCircleServiceImpl extends BaseController implements SickCircleS Result.failure("治疗过程不能为空"); } LoginUser login = Login(); - sickCircleEntity.setUserId(login.getUserid().intValue()); + sickCircleEntity.setUserId(login.getUserid()); sickCircleMapper.publishSickCircle(sickCircleEntity); return HealthR.ok(sickCircleEntity); diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseCategoryServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseCategoryServiceMapper.xml index d883b5a..9007f3f 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseCategoryServiceMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseCategoryServiceMapper.xml @@ -8,4 +8,5 @@ + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml index 5d630e4..21a7a0c 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml @@ -28,14 +28,32 @@ SELECT sick_circle.*,department.department_name department FROM sick_circle LEFT JOIN department on sick_circle.department_id=department.id WHERE sick_circle.sick_circle_id=#{id} + + + + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml index 79ef09a..2015375 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml @@ -24,4 +24,8 @@ INSERT INTO `doctor`.`sick_circle_comment` ( `sick_circle_id`, `user_id`, `content`, `comment_time`, `whether_doctor`, `create_time`) VALUES (#{sickCircleId},#{userid},#{content},now(),1,now()) + + UPDATE sick_circle_comment_view set opinion=#{opinion} ,user_id=#{userid} WHERE comment_id=#{commentId} + +