diff --git a/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java b/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java index 83c623f..7c95e99 100644 --- a/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java +++ b/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java @@ -127,7 +127,7 @@ public class AuthFilter implements GlobalFilter, Ordered { token = request.getHeaders().getFirst(TokenConstants.SESSIONID); } - // 如果前端设置了令牌前缀,则裁剪掉前缀 + // 如果前端设置了令牌前缀,则裁剪掉前缀`` if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX)) { token = token.replaceFirst(TokenConstants.PREFIX, StringUtils.EMPTY); diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthInquiryVerifyController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthInquiryVerifyController.java new file mode 100644 index 0000000..4e9e189 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthInquiryVerifyController.java @@ -0,0 +1,26 @@ +package doctor.controller; + +import doctor.common.core.domain.HealthR; +import doctor.domain.vo.InquiryRecordVo; +import doctor.service.InquiryVerifyService; +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.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/inquiry/verify/v1") +public class HealthInquiryVerifyController { + + @Autowired + private InquiryVerifyService inquiryVerifyService; + + @GetMapping("/findInquiryRecordList") + public HealthR> findInquiryRecordList() { + List inquiryRecordList = inquiryVerifyService.findInquiryRecordList(); + return HealthR.ok(inquiryRecordList); + } + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java index dc53a38..9a8a938 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java @@ -19,35 +19,44 @@ import java.util.List; @RestController @RequestMapping("/v1") -public class HealthJobTitleController extends BaseController { +public class HealthJobTitleController { @Autowired private HealthJobTitleService healthJobTitleService; @Autowired private BannersService bannersService; -// @GetMapping("/findHistoryInquiryRecord") -// public HealthR> findHistoryInquiryRecord(@RequestHeader Integer doctorId, -// @RequestHeader String sessionId, -// @RequestParam Integer page, -// @RequestParam Integer size) { -// HealthR> healthR= healthJobTitleService.findHistoryInquiryRecord(); -// return null; -// } + + + @GetMapping("/findDoctorNoticeReadNum") + public HealthR> findDoctorNoticeReadNum(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + List healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId); + return HealthR.ok(healthR); + } + + @GetMapping("/findHistoryInquiryRecord") + public HealthR> findHistoryInquiryRecord(@RequestHeader Integer doctorId, + @RequestHeader String sessionId, + @RequestParam Integer page, + @RequestParam Integer size) { + HealthR> healthR = healthJobTitleService.findHistoryInquiryRecord(page, size); + return null; + } @GetMapping("/findDoctorWallet") public HealthR findDoctorWallet(@RequestHeader Integer doctorId, @RequestHeader String sessionId) { - WalletVo healthR= healthJobTitleService.findDoctorWallet(doctorId); + WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId); return HealthR.ok(healthR); } @PostMapping("/drawCash") public HealthR drawCash(@RequestHeader Integer doctorId, - @RequestHeader String sessionId, - @RequestParam Integer money) { - HealthR healthR= healthJobTitleService.drawCash(doctorId,money); + @RequestHeader String sessionId, + @RequestParam Integer money) { + HealthR healthR = healthJobTitleService.drawCash(doctorId, money); return healthR; } @@ -56,32 +65,31 @@ public class HealthJobTitleController extends BaseController { @RequestHeader String sessionId, @RequestParam Integer page, @RequestParam Integer count) { - List doctorIncomeRecordEntities=healthJobTitleService.findDoctorIncomeRecordList(doctorId,page,count); + List doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count); return HealthR.ok(doctorIncomeRecordEntities); } @GetMapping("/bannersShow") - public HealthR> bannersShow(){ + public HealthR> bannersShow() { List banners = bannersService.bannersShow(); return HealthR.ok(banners); } @GetMapping("/findJobTitleList") public HealthR> findJobTitleList() { - LoginUser loginUser = SecurityUtils.getLoginUser(); - List doctorJobTitleEntities=healthJobTitleService.findJobTitleList(); + List doctorJobTitleEntities = healthJobTitleService.findJobTitleList(); return HealthR.ok(doctorJobTitleEntities); } @RequestMapping("/sendEmailCode") public HealthR sendEmailCode(@RequestParam("email") String email) { - HealthR healthR= healthJobTitleService.sendEmailCode(email); + HealthR healthR = healthJobTitleService.sendEmailCode(email); return HealthR.ok(healthR); } @PostMapping("/applyJoin") public HealthR applyJoin(@RequestBody ApplyJoinDto applyJoinDto) { - HealthR healthR= healthJobTitleService.applyJoin(applyJoinDto); + HealthR healthR = healthJobTitleService.applyJoin(applyJoinDto); return HealthR.ok(healthR); } @@ -98,6 +106,7 @@ public class HealthJobTitleController extends BaseController { @RequestHeader String sessionId) { return HealthR.ok(healthJobTitleService.findDoctorById(doctorId)); } + @GetMapping("/findSystemImagePic") public HealthR> findSystemImagePic() { return HealthR.ok(healthJobTitleService.findSystemImagePic()); @@ -107,7 +116,7 @@ public class HealthJobTitleController extends BaseController { public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic, @RequestHeader String sessionId, @RequestHeader Integer doctorId) { - return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic,doctorId,sessionId)); + return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic, doctorId, sessionId)); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java new file mode 100644 index 0000000..ba5e4f8 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java @@ -0,0 +1,28 @@ +package doctor.controller; + +import doctor.common.core.domain.HealthR; +import doctor.domain.vo.SickCircleVo; +import doctor.service.SickCircleService; +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; + +@RestController +@RequestMapping("/sickCircle/v1") +public class HealthSickController { + + @Autowired + private SickCircleService sickCircleService; + + @GetMapping("/findSickCircleList") + public HealthR> sickCircleList(@RequestParam Integer page, + @RequestParam Integer count, + @RequestParam Integer departmentId) { + List sickCircleList = sickCircleService.findSickCircleList(page, count, departmentId); + return HealthR.ok(sickCircleList); + } +} 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 new file mode 100644 index 0000000..99468ef --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java @@ -0,0 +1,49 @@ +package doctor.domain.entity; + +import lombok.Data; + +import javax.persistence.*; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; + +@Data +public class SickCircleEntity { + private Integer id; + + private Integer userId; + + private String title; + + private Integer departmentId; + + 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; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/doctorSystemNoticeEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/doctorSystemNoticeEntity.java new file mode 100644 index 0000000..2563a62 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/doctorSystemNoticeEntity.java @@ -0,0 +1,17 @@ +package doctor.domain.entity; + +import lombok.Data; + +import java.util.Date; + +@Data +public class doctorSystemNoticeEntity { + private Integer id; + private Integer num; + private String content; + private Integer noticeType; + private Integer pushType; + private Integer status; + private Date createTime; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryRecordVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryRecordVo.java new file mode 100644 index 0000000..aeea719 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryRecordVo.java @@ -0,0 +1,15 @@ +package doctor.domain.vo; + +import lombok.Data; + +@Data +public class InquiryRecordVo { + private Integer recordId; + private Integer userId; + private String uerHeadPic; + private String doctorHeadPic; + private String listContent; + private String nickName; + private long inquiryTime; + private Integer status; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/NoticeReadNumVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/NoticeReadNumVo.java new file mode 100644 index 0000000..28a2942 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/NoticeReadNumVo.java @@ -0,0 +1,9 @@ +package doctor.domain.vo; + +import lombok.Data; + +@Data +public class NoticeReadNumVo { + private int notReadNum; + private int noticeType; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleVo.java new file mode 100644 index 0000000..6ccc422 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleVo.java @@ -0,0 +1,12 @@ +package doctor.domain.vo; + +import lombok.Data; + +@Data +public class SickCircleVo { + private Integer sickCircleId; + private String title; + private String detail; + private long releaseTime; + private Integer amount; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthJobTitleMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthJobTitleMapper.java index 75901a4..430954e 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthJobTitleMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthJobTitleMapper.java @@ -3,6 +3,7 @@ package doctor.mapper; import doctor.domain.entity.DoctorIncomeRecordEntity; import doctor.domain.entity.DoctorJobTitleEntity; import doctor.domain.entity.DoctorWalletEntity; +import doctor.domain.entity.doctorSystemNoticeEntity; import doctor.system.api.domain.Department; import doctor.system.api.domain.Doctor; import org.apache.ibatis.annotations.Mapper; @@ -29,4 +30,6 @@ public interface HealthJobTitleMapper { DoctorWalletEntity findDoctorWalletById(Integer doctorId); List findDoctorIncomeRecordList(Integer doctorId); + + List findDoctorNoticeReadNum(Integer doctorId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java new file mode 100644 index 0000000..3779261 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java @@ -0,0 +1,4 @@ +package doctor.mapper; + +public interface InquiryVerifyServiceMapper { +} 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 new file mode 100644 index 0000000..ae8f55a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java @@ -0,0 +1,12 @@ +package doctor.mapper; + +import doctor.domain.entity.SickCircleEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SickCircleMapper { + List findSickCircleList(Integer departmentId); + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthJobTitleService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthJobTitleService.java index 7273780..e810d5f 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/HealthJobTitleService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/HealthJobTitleService.java @@ -3,10 +3,7 @@ package doctor.service; import doctor.common.core.domain.HealthR; import doctor.domain.dto.ApplyJoinDto; import doctor.domain.entity.DoctorJobTitleEntity; -import doctor.domain.vo.DoctorVo; -import doctor.domain.vo.FindImagePicVo; -import doctor.domain.vo.WalletVo; -import doctor.domain.vo.DoctorIncomeRecordVo; +import doctor.domain.vo.*; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -31,4 +28,8 @@ public interface HealthJobTitleService { List findDoctorIncomeRecordList(Integer doctorId,Integer page, Integer count); HealthR drawCash(Integer doctorId, Integer money); + + HealthR> findHistoryInquiryRecord(Integer page, Integer size); + + List findDoctorNoticeReadNum(Integer doctorId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryVerifyService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryVerifyService.java new file mode 100644 index 0000000..1f0c886 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryVerifyService.java @@ -0,0 +1,11 @@ +package doctor.service; + +import doctor.common.core.domain.HealthR; +import doctor.domain.vo.InquiryRecordVo; + +import java.util.List; + +public interface InquiryVerifyService { + List findInquiryRecordList(); + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java new file mode 100644 index 0000000..81a47ef --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java @@ -0,0 +1,11 @@ +package doctor.service; + +import doctor.common.core.domain.HealthR; +import doctor.domain.vo.SickCircleVo; + +import java.util.List; + +public interface SickCircleService { + List findSickCircleList(Integer page, Integer size, Integer departmentId); + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java index cf520b2..98ad438 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java @@ -1,15 +1,14 @@ package doctor.service.impl; import doctor.common.core.domain.HealthR; +import doctor.common.core.web.controller.BaseController; import doctor.common.security.service.TokenService; import doctor.domain.dto.ApplyJoinDto; import doctor.domain.entity.DoctorIncomeRecordEntity; import doctor.domain.entity.DoctorJobTitleEntity; import doctor.domain.entity.DoctorWalletEntity; -import doctor.domain.vo.DoctorVo; -import doctor.domain.vo.FindImagePicVo; -import doctor.domain.vo.WalletVo; -import doctor.domain.vo.DoctorIncomeRecordVo; +import doctor.domain.entity.doctorSystemNoticeEntity; +import doctor.domain.vo.*; import doctor.mapper.HealthJobTitleMapper; import doctor.service.HealthJobTitleService; import doctor.system.api.domain.Department; @@ -34,7 +33,7 @@ import java.util.Random; import java.util.concurrent.TimeUnit; @Service -public class HealthJobTitleServiceImpl implements HealthJobTitleService { +public class HealthJobTitleServiceImpl extends BaseController implements HealthJobTitleService { @Autowired private HealthJobTitleMapper healthJobTitleMapper; @Autowired @@ -165,6 +164,7 @@ public class HealthJobTitleServiceImpl implements HealthJobTitleService { @Override public List findDoctorIncomeRecordList(Integer doctorId, Integer page, Integer count) { + startPage(page,count); List doctorIncomeRecordList = healthJobTitleMapper.findDoctorIncomeRecordList(doctorId); ArrayList doctorIncomeRecordVos = new ArrayList<>(); for (DoctorIncomeRecordEntity doctorIncomeRecordEntity : doctorIncomeRecordList) { @@ -180,4 +180,24 @@ public class HealthJobTitleServiceImpl implements HealthJobTitleService { return null; } + + @Override + public HealthR> findHistoryInquiryRecord(Integer page, Integer size) { + startPage(page,size); + + return null; + } + + @Override + public List findDoctorNoticeReadNum(Integer doctorId) { + List doctorSystemNoticeEntities = healthJobTitleMapper.findDoctorNoticeReadNum(doctorId); + ArrayList noticeReadNumVos = new ArrayList<>(); + for (doctorSystemNoticeEntity doctorSystemNoticeEntity : doctorSystemNoticeEntities) { + NoticeReadNumVo noticeReadNumVo = new NoticeReadNumVo(); + noticeReadNumVo.setNotReadNum(doctorSystemNoticeEntity.getNum()); + noticeReadNumVo.setNoticeType(doctorSystemNoticeEntity.getNoticeType()); + noticeReadNumVos.add(noticeReadNumVo); + } + return noticeReadNumVos; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryVerifyServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryVerifyServiceImpl.java new file mode 100644 index 0000000..10bd216 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryVerifyServiceImpl.java @@ -0,0 +1,22 @@ +package doctor.service.impl; + +import doctor.common.core.web.controller.BaseController; +import doctor.domain.vo.InquiryRecordVo; +import doctor.mapper.InquiryVerifyServiceMapper; +import doctor.service.InquiryVerifyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class InquiryVerifyServiceImpl extends BaseController implements InquiryVerifyService { + @Autowired + private InquiryVerifyServiceMapper inquiryVerifyServiceMapper; + + @Override + public List findInquiryRecordList() { + + return null; + } +} 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 new file mode 100644 index 0000000..f314126 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java @@ -0,0 +1,34 @@ +package doctor.service.impl; + +import doctor.common.core.domain.HealthR; +import doctor.common.core.web.controller.BaseController; +import doctor.domain.entity.SickCircleEntity; +import doctor.domain.vo.SickCircleVo; +import doctor.mapper.SickCircleMapper; +import doctor.service.SickCircleService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class SickCircleServiceImpl extends BaseController implements SickCircleService { + + @Autowired + private SickCircleMapper sickCircleMapper; + @Override + public List findSickCircleList(Integer page, Integer size, Integer departmentId) { + startPage(page,size); + List list = sickCircleMapper.findSickCircleList(departmentId); + ArrayList sickCircleVos = new ArrayList<>(); + for (SickCircleEntity sickCircleEntity : list) { + SickCircleVo sickCircleVo = new SickCircleVo(); + sickCircleVo.setSickCircleId(sickCircleEntity.getId()); + BeanUtils.copyProperties(sickCircleEntity,sickCircleVo); + sickCircleVos.add(sickCircleVo); + } + return sickCircleVos; + } +} diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/HealthJobTitleMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/HealthJobTitleMapper.xml index ba908f5..2b0dcf6 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/HealthJobTitleMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/HealthJobTitleMapper.xml @@ -34,4 +34,7 @@ + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml new file mode 100644 index 0000000..92a7923 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml @@ -0,0 +1,8 @@ + + + + + + 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 new file mode 100644 index 0000000..1e82943 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml @@ -0,0 +1,11 @@ + + + + + + +