From 3f77960eec05aa6b74d664c98deb763ba92ebb41 Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Sat, 13 Jan 2024 09:04:40 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doctor-auth/src/main/resources/bootstrap.yml | 4 ++-- doctor-gateway/src/main/resources/bootstrap.yml | 4 ++-- doctor-modules/doctor-file/src/main/resources/bootstrap.yml | 4 ++-- doctor-modules/doctor-gen/src/main/resources/bootstrap.yml | 4 ++-- doctor-modules/doctor-health/src/main/resources/bootstrap.yml | 4 ++-- doctor-modules/doctor-job/src/main/resources/bootstrap.yml | 4 ++-- doctor-modules/doctor-system/src/main/resources/bootstrap.yml | 4 ++-- doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index 47c2dad..2e1cf69 100644 --- a/doctor-auth/src/main/resources/bootstrap.yml +++ b/doctor-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index cc0e562..d3e056c 100644 --- a/doctor-gateway/src/main/resources/bootstrap.yml +++ b/doctor-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml index c992149..66f9597 100644 --- a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml index 007713f..81bc32c 100644 --- a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml index 5b5ac25..793ba90 100644 --- a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index 537c5d6..ab123c4 100644 --- a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml index 8def34f..14e7505 100644 --- a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml index 979155f..d94bf20 100644 --- a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml +++ b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 9de208a6-cb30-41ae-a880-78196c99c050 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 From e00d68ef89357d2cad5b49733b52f09a48a00110 Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Mon, 15 Jan 2024 22:32:04 +0800 Subject: [PATCH 02/12] =?UTF-8?q?1.15=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doctor-common/doctor-common-core/pom.xml | 7 ++ .../core/web/controller/BaseController.java | 7 ++ .../doctor/gateway/filter/AuthFilter.java | 2 + .../controller/HealthJobTitleController.java | 55 +++++++++++- .../java/doctor/domain/dto/CheckCodeDto.java | 9 ++ .../entity/DoctorIncomeRecordEntity.java | 86 +++++++++++++++++++ .../domain/entity/DoctorWalletEntity.java | 21 +++++ .../domain/vo/DoctorHistoryInquiryVo.java | 4 + .../domain/vo/DoctorIncomeRecordVo.java | 13 +++ .../main/java/doctor/domain/vo/WalletVo.java | 14 +++ .../doctor/mapper/HealthJobTitleMapper.java | 6 ++ .../doctor/service/HealthJobTitleService.java | 11 ++- .../impl/HealthJobTitleServiceImpl.java | 51 ++++++++++- .../mapper/doctor/HealthJobTitleMapper.xml | 6 ++ .../impl/SysPermissionServiceImpl.java | 8 +- 15 files changed, 290 insertions(+), 10 deletions(-) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/dto/CheckCodeDto.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorIncomeRecordEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorWalletEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorHistoryInquiryVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorIncomeRecordVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/WalletVo.java diff --git a/doctor-common/doctor-common-core/pom.xml b/doctor-common/doctor-common-core/pom.xml index 241f6c2..406e2ec 100644 --- a/doctor-common/doctor-common-core/pom.xml +++ b/doctor-common/doctor-common-core/pom.xml @@ -121,6 +121,13 @@ + + javax.persistence + javax.persistence-api + 2.2 + + + diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/web/controller/BaseController.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/web/controller/BaseController.java index f9e086b..0ffa53c 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/web/controller/BaseController.java +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/web/controller/BaseController.java @@ -48,6 +48,13 @@ public class BaseController PageUtils.startPage(); } + protected void startPage(Integer page,Integer count) + { + PageUtils.startPage(page,count); + } + + + /** * 清理分页的线程变量 */ 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 a924cb3..aefad10 100644 --- a/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java +++ b/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java @@ -52,6 +52,7 @@ public class AuthFilter implements GlobalFilter, Ordered { return chain.filter(exchange); } + String token = getToken(request); if (StringUtils.isEmpty(token)) @@ -126,6 +127,7 @@ public class AuthFilter implements GlobalFilter, Ordered token = request.getQueryParams().getFirst(TokenConstants.SESSIONID); } if(StringUtils.isNotEmpty(token)){ + //TODO 解决报错问题 request.getHeaders().set(TokenConstants.SESSIONID,token); } // 如果前端设置了令牌前缀，则裁剪掉前缀 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 8053894..dc53a38 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 @@ -1,13 +1,16 @@ package doctor.controller; import doctor.common.core.domain.HealthR; +import doctor.common.core.web.controller.BaseController; +import doctor.common.security.utils.SecurityUtils; import doctor.domain.dto.ApplyJoinDto; +import doctor.domain.dto.CheckCodeDto; import doctor.domain.entity.Banners; import doctor.domain.entity.DoctorJobTitleEntity; -import doctor.domain.vo.DoctorVo; -import doctor.domain.vo.FindImagePicVo; +import doctor.domain.vo.*; import doctor.service.BannersService; import doctor.service.HealthJobTitleService; +import doctor.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -16,12 +19,47 @@ import java.util.List; @RestController @RequestMapping("/v1") -public class HealthJobTitleController { +public class HealthJobTitleController extends BaseController { @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("/findDoctorWallet") + public HealthR findDoctorWallet(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + + 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); + return healthR; + } + + @GetMapping("/findDoctorIncomeRecordList") + public HealthR> findDoctorIncomeRecordList(@RequestHeader Integer doctorId, + @RequestHeader String sessionId, + @RequestParam Integer page, + @RequestParam Integer count) { + List doctorIncomeRecordEntities=healthJobTitleService.findDoctorIncomeRecordList(doctorId,page,count); + return HealthR.ok(doctorIncomeRecordEntities); + } + @GetMapping("/bannersShow") public HealthR> bannersShow(){ List banners = bannersService.bannersShow(); @@ -30,11 +68,12 @@ public class HealthJobTitleController { @GetMapping("/findJobTitleList") public HealthR> findJobTitleList() { + LoginUser loginUser = SecurityUtils.getLoginUser(); List doctorJobTitleEntities=healthJobTitleService.findJobTitleList(); return HealthR.ok(doctorJobTitleEntities); } - @PostMapping("/sendEmailCode") + @RequestMapping("/sendEmailCode") public HealthR sendEmailCode(@RequestParam("email") String email) { HealthR healthR= healthJobTitleService.sendEmailCode(email); return HealthR.ok(healthR); @@ -46,6 +85,14 @@ public class HealthJobTitleController { return HealthR.ok(healthR); } + @PostMapping("/checkCode") + public HealthR checkCode(@RequestBody CheckCodeDto checkCodeDto) { + String email = checkCodeDto.getEmail(); + String code = checkCodeDto.getCode(); + HealthR healthR = healthJobTitleService.checkCode(email, code); + return healthR; + } + @GetMapping("/findDoctorById") public HealthR findDoctorById(@RequestHeader Integer doctorId, @RequestHeader String sessionId) { diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/CheckCodeDto.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/CheckCodeDto.java new file mode 100644 index 0000000..b1a8462 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/CheckCodeDto.java @@ -0,0 +1,9 @@ +package doctor.domain.dto; + +import lombok.Data; + +@Data +public class CheckCodeDto { + private String email; + private String code; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorIncomeRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorIncomeRecordEntity.java new file mode 100644 index 0000000..973161f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorIncomeRecordEntity.java @@ -0,0 +1,86 @@ +package doctor.domain.entity; + +import javax.persistence.*; +import java.util.Date; + +@Entity +@Table(name = "doctor_income_record") +public class DoctorIncomeRecordEntity { + @Id + @Column(name = "id") + private Integer id; + + @Column(name = "doctor_id") + private Integer doctorId; + + @Column(name = "money") + private Integer money; + + @Column(name = "direction") + private Integer direction; + + @Column(name = "income_type") + private Integer incomeType; + + @Column(name = "record_time") + private Date recordTime; + + @Column(name = "create_time") + private Date createTime; + + public Integer getId() { + return this.id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getDoctorId() { + return this.doctorId; + } + + public void setDoctorId(Integer doctorId) { + this.doctorId = doctorId; + } + + public Integer getMoney() { + return this.money; + } + + public void setMoney(Integer money) { + this.money = money; + } + + public Integer getDirection() { + return this.direction; + } + + public void setDirection(Integer direction) { + this.direction = direction; + } + + public Integer getIncomeType() { + return this.incomeType; + } + + public void setIncomeType(Integer incomeType) { + this.incomeType = incomeType; + } + + public Date getRecordTime() { + return this.recordTime; + } + + public void setRecordTime(Date recordTime) { + this.recordTime = recordTime; + } + + public Date getCreateTime() { + return this.createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorWalletEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorWalletEntity.java new file mode 100644 index 0000000..5a037b0 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorWalletEntity.java @@ -0,0 +1,21 @@ +package doctor.domain.entity; + + +import lombok.Data; + +import java.util.Date; +@Data +public class DoctorWalletEntity { + private Integer id; + + private Integer doctorId; + + private Integer balance; + + private Integer version; + + private Date updateTime; + + private Date createTime; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorHistoryInquiryVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorHistoryInquiryVo.java new file mode 100644 index 0000000..cb5ce31 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorHistoryInquiryVo.java @@ -0,0 +1,4 @@ +package doctor.domain.vo; + +public class DoctorHistoryInquiryVo { +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorIncomeRecordVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorIncomeRecordVo.java new file mode 100644 index 0000000..1e36203 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorIncomeRecordVo.java @@ -0,0 +1,13 @@ +package doctor.domain.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class DoctorIncomeRecordVo { + private Integer money; + private Integer direction; + private Integer incomeType; + private Date recordTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/WalletVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/WalletVo.java new file mode 100644 index 0000000..a35f308 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/WalletVo.java @@ -0,0 +1,14 @@ +package doctor.domain.vo; + +import io.swagger.models.auth.In; +import lombok.Data; + +@Data +public class WalletVo { + private Integer id; + private Integer doctorId; + private Integer balance; + private Integer version; + private Integer whetherBindIdCard; + private Integer whetherBindBankCard; +} 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 c20b840..75901a4 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 @@ -1,6 +1,8 @@ package doctor.mapper; +import doctor.domain.entity.DoctorIncomeRecordEntity; import doctor.domain.entity.DoctorJobTitleEntity; +import doctor.domain.entity.DoctorWalletEntity; import doctor.system.api.domain.Department; import doctor.system.api.domain.Doctor; import org.apache.ibatis.annotations.Mapper; @@ -23,4 +25,8 @@ public interface HealthJobTitleMapper { List findDoctorImgPic(); void updDoctorImgPicBuyId(@Param("doctorId") Integer doctorId, @Param("s") String s); + + DoctorWalletEntity findDoctorWalletById(Integer doctorId); + + List findDoctorIncomeRecordList(Integer doctorId); } 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 2e4a985..7273780 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 @@ -5,7 +5,8 @@ import doctor.domain.dto.ApplyJoinDto; import doctor.domain.entity.DoctorJobTitleEntity; import doctor.domain.vo.DoctorVo; import doctor.domain.vo.FindImagePicVo; -import io.swagger.models.auth.In; +import doctor.domain.vo.WalletVo; +import doctor.domain.vo.DoctorIncomeRecordVo; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -22,4 +23,12 @@ public interface HealthJobTitleService { List findSystemImagePic(); HealthR uploadImagePic(MultipartFile imagePic, Integer doctorId, String sessionId); + + HealthR checkCode(String email, String code); + + WalletVo findDoctorWallet(Integer doctorId); + + List findDoctorIncomeRecordList(Integer doctorId,Integer page, Integer count); + + HealthR drawCash(Integer doctorId, Integer money); } 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 b2b1a16..9c14a3d 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 @@ -3,9 +3,13 @@ package doctor.service.impl; import doctor.common.core.domain.HealthR; 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.mapper.HealthJobTitleMapper; import doctor.service.HealthJobTitleService; import doctor.system.api.domain.Department; @@ -15,7 +19,6 @@ import doctor.util.OssUtil; import doctor.util.RSAUtils; import doctor.util.RsaKey; import doctor.util.SendEmail; -import org.bouncycastle.jcajce.provider.asymmetric.rsa.RSAUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -130,4 +133,50 @@ public class HealthJobTitleServiceImpl implements HealthJobTitleService { tokenService.createToken(loginUser); return HealthR.ok(s); } + + @Override + public HealthR checkCode(String email, String code) { + if (email==null||email.equals("")){ + return HealthR.fail(); + } + if (code==null||code.equals("")){ + return HealthR.fail(); + } + if (!redisTemplate.hasKey(email)){ + return HealthR.fail(); + } + Integer integer = redisTemplate.opsForValue().get(email); + if (!String.valueOf(integer).equals(code)){ + return HealthR.fail(); + } + return HealthR.ok(); + } + + @Override + public WalletVo findDoctorWallet(Integer doctorId) { + WalletVo walletVo=new WalletVo(); + DoctorWalletEntity doctorWalletEntity = healthJobTitleMapper.findDoctorWalletById(doctorId); + BeanUtils.copyProperties(doctorWalletEntity,walletVo); + walletVo.setWhetherBindIdCard(1); + walletVo.setWhetherBindBankCard(1); + return walletVo; + } + + @Override + public List findDoctorIncomeRecordList(Integer doctorId, Integer page, Integer count) { + List doctorIncomeRecordList = healthJobTitleMapper.findDoctorIncomeRecordList(doctorId); + ArrayList doctorIncomeRecordVos = new ArrayList<>(); + for (DoctorIncomeRecordEntity doctorIncomeRecordEntity : doctorIncomeRecordList) { + DoctorIncomeRecordVo doctorIncomeRecordVo = new DoctorIncomeRecordVo(); + BeanUtils.copyProperties(doctorIncomeRecordEntity,doctorIncomeRecordVo); + doctorIncomeRecordVos.add(doctorIncomeRecordVo); + } + return doctorIncomeRecordVos; + } + + @Override + public HealthR drawCash(Integer doctorId, Integer money) { + + return null; + } } 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 8401276..ba908f5 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 @@ -28,4 +28,10 @@ + + diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysPermissionServiceImpl.java b/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysPermissionServiceImpl.java index a85d417..8a0595c 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysPermissionServiceImpl.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysPermissionServiceImpl.java @@ -14,7 +14,7 @@ import doctor.system.service.ISysRoleService; /** * 用户权限处理 - * + * * @author ruoyi */ @Service @@ -28,7 +28,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService /** * 获取角色数据权限 - * + * * @param userId 用户Id * @return 角色权限信息 */ @@ -50,8 +50,8 @@ public class SysPermissionServiceImpl implements ISysPermissionService /** * 获取菜单数据权限 - * - * @param userId 用户Id + * + * @param user 用户Id * @return 菜单权限信息 */ @Override From 0a15f6acddc3e1c69fba24ba35f2f5d375cdc45c Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Tue, 16 Jan 2024 14:32:40 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BD=91=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/TokenConstants.java | 2 +- .../doctor/gateway/filter/AuthFilter.java | 9 +++----- .../impl/HealthJobTitleServiceImpl.java | 1 + .../service/impl/SysDictTypeServiceImpl.java | 23 +++++++++---------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/TokenConstants.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/TokenConstants.java index a3155f8..8450fd3 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/TokenConstants.java +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/TokenConstants.java @@ -11,7 +11,7 @@ public class TokenConstants * 令牌自定义标识 */ public static final String AUTHENTICATION = "Authorization"; - public static final String SESSIONID = "SESSIONID"; + public static final String SESSIONID = "Sessionid"; /** * 令牌前缀 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 aefad10..83c623f 100644 --- a/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java +++ b/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java @@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.core.Ordered; +import org.springframework.http.HttpHeaders; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; @@ -122,13 +123,9 @@ public class AuthFilter implements GlobalFilter, Ordered private String getToken(ServerHttpRequest request) { String token = request.getHeaders().getFirst(TokenConstants.AUTHENTICATION); - if (StringUtils.isNotEmpty(token)) + if (StringUtils.isEmpty(token)) { - token = request.getQueryParams().getFirst(TokenConstants.SESSIONID); - } - if(StringUtils.isNotEmpty(token)){ - //TODO 解决报错问题 - request.getHeaders().set(TokenConstants.SESSIONID,token); + token = request.getHeaders().getFirst(TokenConstants.SESSIONID); } // 如果前端设置了令牌前缀，则裁剪掉前缀 if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX)) 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 9c14a3d..cf520b2 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 @@ -19,6 +19,7 @@ import doctor.util.OssUtil; import doctor.util.RSAUtils; import doctor.util.RsaKey; import doctor.util.SendEmail; +import lombok.extern.log4j.Log4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysDictTypeServiceImpl.java b/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysDictTypeServiceImpl.java index cba1ff1..2bb9d41 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysDictTypeServiceImpl.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysDictTypeServiceImpl.java @@ -20,7 +20,7 @@ import doctor.system.service.ISysDictTypeService; /** * 字典 业务层处理 - * + * * @author ruoyi */ @Service @@ -43,7 +43,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 根据条件分页查询字典类型 - * + * * @param dictType 字典类型信息 * @return 字典类型集合信息 */ @@ -55,7 +55,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 根据所有字典类型 - * + * * @return 字典类型集合信息 */ @Override @@ -66,7 +66,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 根据字典类型查询字典数据 - * + * * @param dictType 字典类型 * @return 字典数据集合信息 */ @@ -89,7 +89,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 根据字典类型ID查询信息 - * + * * @param dictId 字典类型ID * @return 字典类型 */ @@ -101,7 +101,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 根据字典类型查询信息 - * + * * @param dictType 字典类型 * @return 字典类型 */ @@ -113,7 +113,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 批量删除字典类型信息 - * + * * @param dictIds 需要删除的字典ID */ @Override @@ -167,7 +167,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 新增保存字典类型信息 - * + * * @param dict 字典类型信息 * @return 结果 */ @@ -184,7 +184,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 修改保存字典类型信息 - * + * * @param dict 字典类型信息 * @return 结果 */ @@ -205,13 +205,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 校验字典类型称是否唯一 - * + * * @param dict 字典类型 * @return 结果 */ @Override - public boolean checkDictTypeUnique(SysDictType dict) - { + public boolean checkDictTypeUnique(SysDictType dict) { Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId(); SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType()); if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue()) From 18acab80068bfd00bbf362fefed191dfc34a5d1d Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Tue, 16 Jan 2024 22:27:20 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HealthDoctorController.java | 7 +- .../main/java/doctor/auth/form/LoginBody.java | 42 ++--- .../main/java/doctor/auth/vo/DoctorVo.java | 140 ++++++----------- .../src/main/java/doctor/auth/vo/UserVo.java | 145 ++++-------------- .../java/doctor/common/core/WebConfig.java | 38 +++++ doctor-modules/doctor-health/pom.xml | 1 + .../controller/HealthJobTitleController.java | 3 +- .../controller/HealthUserVideoController.java | 1 - .../controller/UserSickCircleController.java | 35 +++++ .../controller/UserVideoController.java | 18 ++- .../java/doctor/domain/dto/ApplyJoinDto.java | 24 ++- .../doctor/domain/dto/UserArchivesDto.java | 85 +++------- .../main/java/doctor/domain/dto/VideoDto.java | 15 +- .../domain/entity/UserArchivesEntity.java | 16 +- .../java/doctor/domain/entity/UserEntity.java | 29 +++- .../domain/entity/UserSickCircleEntity.java | 32 ++++ .../java/doctor/domain/vo/DepartmentVo.java | 3 + .../doctor/domain/vo/UserDoctorFollowVo.java | 24 +++ .../doctor/domain/vo/UserSickCircleVo.java | 20 +++ .../main/java/doctor/domain/vo/UserVo.java | 21 ++- .../doctor/mapper/UserSickCircleMapper.java | 17 ++ .../java/doctor/mapper/UserVideoMapper.java | 6 +- .../doctor/service/UserSickCircleService.java | 16 ++ .../java/doctor/service/UserVideoService.java | 6 +- .../impl/UserSickCircleServiceImpl.java | 30 ++++ .../service/impl/UserVideoServiceImpl.java | 11 +- .../mapper/doctor/UserSickCircleMapper.xml | 11 ++ .../mapper/doctor/UserVideoMapper.xml | 6 + pom.xml | 16 ++ 29 files changed, 485 insertions(+), 333 deletions(-) create mode 100644 doctor-common/doctor-common-core/src/main/java/doctor/common/core/WebConfig.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/UserSickCircleController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserSickCircleEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserDoctorFollowVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserSickCircleVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/UserSickCircleMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/UserSickCircleService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserSickCircleServiceImpl.java create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserSickCircleMapper.xml diff --git a/doctor-auth/src/main/java/doctor/auth/controller/HealthDoctorController.java b/doctor-auth/src/main/java/doctor/auth/controller/HealthDoctorController.java index 3f7c47a..d0bcf22 100644 --- a/doctor-auth/src/main/java/doctor/auth/controller/HealthDoctorController.java +++ b/doctor-auth/src/main/java/doctor/auth/controller/HealthDoctorController.java @@ -4,6 +4,9 @@ import doctor.auth.service.HealthDoctorService; import doctor.auth.service.HealthUserService; import doctor.auth.vo.DoctorVo; import doctor.common.core.domain.HealthR; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -12,13 +15,15 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/doctor/v1") +@Api(tags = "登录") public class HealthDoctorController { @Autowired private HealthDoctorService healthDoctorService; @PostMapping("/login") - public HealthR login(@RequestParam String email, @RequestParam String pwd) { + @ApiOperation("邮箱密码登录") + public HealthR login(@RequestParam @ApiParam("email") String email, @RequestParam @ApiParam("pwd") String pwd) { DoctorVo userInfo = healthDoctorService.login(email,pwd); if (userInfo!=null){ return HealthR.ok(userInfo,"登录成功"); diff --git a/doctor-auth/src/main/java/doctor/auth/form/LoginBody.java b/doctor-auth/src/main/java/doctor/auth/form/LoginBody.java index f309f53..2e50174 100644 --- a/doctor-auth/src/main/java/doctor/auth/form/LoginBody.java +++ b/doctor-auth/src/main/java/doctor/auth/form/LoginBody.java @@ -1,39 +1,27 @@ package doctor.auth.form; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; + /** * 用户登录对象 - * + * * @author ruoyi */ +@Data +@ApiModel("用户登录") public class LoginBody { - /** - * 用户名 - */ + @NotBlank(message = "用户名不能为空") + @ApiModelProperty("姓名") private String username; - /** - * 用户密码 - */ + @NotBlank(message = "密码不能为空") + @Size(min = 1, message = "密码长度不能小于1") + @ApiModelProperty("密码") private String password; - - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } } diff --git a/doctor-auth/src/main/java/doctor/auth/vo/DoctorVo.java b/doctor-auth/src/main/java/doctor/auth/vo/DoctorVo.java index 5ba557c..ed44029 100644 --- a/doctor-auth/src/main/java/doctor/auth/vo/DoctorVo.java +++ b/doctor-auth/src/main/java/doctor/auth/vo/DoctorVo.java @@ -1,112 +1,58 @@ package doctor.auth.vo; -public class DoctorVo { +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +public class DoctorVo implements Serializable { + @NotNull(message = "医生ID不能为空") + @ApiModelProperty("医生ID") private int doctorId; + + @NotBlank(message = "会话ID不能为空") + @ApiModelProperty("会话ID") private String sessionId; + + @NotBlank(message = "姓名不能为空") + @ApiModelProperty("姓名") private String name; + + @NotBlank(message = "用户名不能为空") + @ApiModelProperty("用户名") private String userName; + + @NotNull(message = "审核状态不能为空") + @ApiModelProperty("审核状态") private int reviewStatus; + + @NotBlank(message = "极光密码不能为空") + @ApiModelProperty("极光密码") private String jiGuangPwd; + + @ApiModelProperty("图片") private String imagePic; + + @NotBlank(message = "就职医院不能为空") + @ApiModelProperty("就职医院") private String inauguralHospital; + + @NotBlank(message = "职称不能为空") + @ApiModelProperty("职称") private String jobTitle; + + @NotNull(message = "科室ID不能为空") + @ApiModelProperty("科室ID") private int departmentId; + + @NotBlank(message = "科室名称不能为空") + @ApiModelProperty("科室名称") private String departmentName; + + @NotNull(message = "是否有图文咨询权限不能为空") + @ApiModelProperty("图文咨询权限") private int whetherHaveImagePic; - - public int getDoctorId() { - return doctorId; - } - - public void setDoctorId(int doctorId) { - this.doctorId = doctorId; - } - - public String getSessionId() { - return sessionId; - } - - public void setSessionId(String sessionId) { - this.sessionId = sessionId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public int getReviewStatus() { - return reviewStatus; - } - - public void setReviewStatus(int reviewStatus) { - this.reviewStatus = reviewStatus; - } - - public String getJiGuangPwd() { - return jiGuangPwd; - } - - public void setJiGuangPwd(String jiGuangPwd) { - this.jiGuangPwd = jiGuangPwd; - } - - public String getImagePic() { - return imagePic; - } - - public void setImagePic(String imagePic) { - this.imagePic = imagePic; - } - - public String getInauguralHospital() { - return inauguralHospital; - } - - public void setInauguralHospital(String inauguralHospital) { - this.inauguralHospital = inauguralHospital; - } - - public String getJobTitle() { - return jobTitle; - } - - public void setJobTitle(String jobTitle) { - this.jobTitle = jobTitle; - } - - public int getDepartmentId() { - return departmentId; - } - - public void setDepartmentId(int departmentId) { - this.departmentId = departmentId; - } - - public String getDepartmentName() { - return departmentName; - } - - public void setDepartmentName(String departmentName) { - this.departmentName = departmentName; - } - - public int getWhetherHaveImagePic() { - return whetherHaveImagePic; - } - - public void setWhetherHaveImagePic(int whetherHaveImagePic) { - this.whetherHaveImagePic = whetherHaveImagePic; - } } diff --git a/doctor-auth/src/main/java/doctor/auth/vo/UserVo.java b/doctor-auth/src/main/java/doctor/auth/vo/UserVo.java index 0bdb29d..1ae25d4 100644 --- a/doctor-auth/src/main/java/doctor/auth/vo/UserVo.java +++ b/doctor-auth/src/main/java/doctor/auth/vo/UserVo.java @@ -1,130 +1,53 @@ package doctor.auth.vo; +import lombok.Data; + +import javax.validation.constraints.Email; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data public class UserVo { + @NotNull(message = "用户ID不能为空") private Integer userId; + + @NotBlank(message = "会话ID不能为空") private String sessionId; + + @NotBlank(message = "昵称不能为空") private String nickName; + + @NotBlank(message = "用户名不能为空") private String userName; + + + @NotBlank(message = "极光密码不能为空") private String jiGuangPwd; + private String headPic; + + @NotNull(message = "性别不能为空") private Integer sex; + + @Min(value = 0, message = "年龄不能小于0") private Integer age; + + @Min(value = 0, message = "身高不能小于0") private Integer height; + + @Min(value = 0, message = "体重不能小于0") private Integer weight; + + @Email(message = "请输入有效的邮箱地址") private String email; + + @NotNull(message = "是否绑定微信不能为空") private Integer whetherBingWeChat; + private String invitationCode; + + @NotNull(message = "面部标志不能为空") private Integer faceFlag; - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public String getSessionId() { - return sessionId; - } - - public void setSessionId(String sessionId) { - this.sessionId = sessionId; - } - - public String getNickName() { - return nickName; - } - - public void setNickName(String nickName) { - this.nickName = nickName; - } - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public String getJiGuangPwd() { - return jiGuangPwd; - } - - public void setJiGuangPwd(String jiGuangPwd) { - this.jiGuangPwd = jiGuangPwd; - } - - public String getHeadPic() { - return headPic; - } - - public void setHeadPic(String headPic) { - this.headPic = headPic; - } - - public Integer getSex() { - return sex; - } - - public void setSex(Integer sex) { - this.sex = sex; - } - - public Integer getAge() { - return age; - } - - public void setAge(Integer age) { - this.age = age; - } - - public Integer getHeight() { - return height; - } - - public void setHeight(Integer height) { - this.height = height; - } - - public Integer getWeight() { - return weight; - } - - public void setWeight(Integer weight) { - this.weight = weight; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public Integer getWhetherBingWeChat() { - return whetherBingWeChat; - } - - public void setWhetherBingWeChat(Integer whetherBingWeChat) { - this.whetherBingWeChat = whetherBingWeChat; - } - - public String getInvitationCode() { - return invitationCode; - } - - public void setInvitationCode(String invitationCode) { - this.invitationCode = invitationCode; - } - - public Integer getFaceFlag() { - return faceFlag; - } - - public void setFaceFlag(Integer faceFlag) { - this.faceFlag = faceFlag; - } } diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/WebConfig.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/WebConfig.java new file mode 100644 index 0000000..358b6ad --- /dev/null +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/WebConfig.java @@ -0,0 +1,38 @@ +package doctor.common.core; + +import org.hibernate.validator.HibernateValidator; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.validation.beanvalidation.MethodValidationPostProcessor; + +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; + +/** + * @ClassName : WebConfig + * @Description : 校验参数配置 + * @Author : FJJ + * @Date: 2024-01-16 14:29 + */ +@Configuration +public class WebConfig { + + @Bean + public Validator validator() { + ValidatorFactory validatorFactory = Validation.byProvider(HibernateValidator.class) + .configure() + //failFast为true出现校验失败的情况，立即结束校验，不再进行后续的校验 + .failFast(true) + .buildValidatorFactory(); + + return validatorFactory.getValidator(); + } + + @Bean + public MethodValidationPostProcessor methodValidationPostProcessor() { + MethodValidationPostProcessor methodValidationPostProcessor = new MethodValidationPostProcessor(); + methodValidationPostProcessor.setValidator(validator()); + return methodValidationPostProcessor; + } +} diff --git a/doctor-modules/doctor-health/pom.xml b/doctor-modules/doctor-health/pom.xml index bad8103..a082a43 100644 --- a/doctor-modules/doctor-health/pom.xml +++ b/doctor-modules/doctor-health/pom.xml @@ -14,6 +14,7 @@ + com.aliyun.oss 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 8053894..ed2b74e 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 @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.validation.Valid; import java.util.List; @RestController @@ -41,7 +42,7 @@ public class HealthJobTitleController { } @PostMapping("/applyJoin") - public HealthR applyJoin(@RequestBody ApplyJoinDto applyJoinDto) { + public HealthR applyJoin(@RequestBody @Valid ApplyJoinDto applyJoinDto) { HealthR healthR= healthJobTitleService.applyJoin(applyJoinDto); return HealthR.ok(healthR); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java index 5d9d1aa..3e45158 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthUserVideoController.java @@ -2,7 +2,6 @@ package doctor.controller; import doctor.common.core.domain.HealthR; -import doctor.domain.dto.VideoDto; import doctor.domain.vo.VideoCategoryVo; import doctor.domain.vo.VideoVo; import doctor.service.HealthUserVideoService; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserSickCircleController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserSickCircleController.java new file mode 100644 index 0000000..82f418f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserSickCircleController.java @@ -0,0 +1,35 @@ +package doctor.controller; + +import doctor.common.core.domain.HealthR; +import doctor.domain.vo.UserSickCircleVo; +import doctor.service.UserSickCircleService; +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; + +/** + * @ClassName : SickCircleController + * @Description : 病友圈 + * @Author : FJJ + * @Date: 2024-01-16 22:08 + */ +@RestController +@RequestMapping("/user/sickCircle/verify/v1") +public class UserSickCircleController { + @Autowired + private UserSickCircleService userSickCircleService; + //查看我的病友圈 + @GetMapping("/findMySickCircleList") + public HealthR> findMySickCircleList(@RequestParam Integer page, @RequestParam Integer count){ + startPage(page,count); + List userFriendCircles = userSickCircleService.findMySickCircleList(); + return HealthR.ok(userFriendCircles); + } + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java index beaf89e..bc1a678 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java @@ -2,15 +2,13 @@ package doctor.controller; import doctor.common.core.domain.HealthR; import doctor.domain.dto.UserArchivesDto; -import doctor.domain.entity.UserAdoptCommentEntity; -import doctor.domain.entity.UserEntity; -import doctor.domain.entity.UserInfoCollectionEntity; -import doctor.domain.entity.UserWalletEntity; +import doctor.domain.entity.*; import doctor.domain.vo.*; import doctor.service.UserVideoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; import static com.github.pagehelper.page.PageMethod.startPage; @@ -96,9 +94,17 @@ public class UserVideoController { } //添加用户档案 @PostMapping("/addUserArchives") - public HealthR addUserArchives(@RequestBody UserArchivesDto userArchivesDto){ - userVideoService.addUserArchives(userArchivesDto); + public HealthR addUserArchives(@RequestBody UserArchivesEntity userArchivesEntity, @RequestHeader Integer userId){ + userVideoService.addUserArchives(userArchivesEntity,userId); + return HealthR.ok(); + } + //上传用户档案图片 + @PostMapping("/uploadArchivesPicture") + public HealthR uploadUserArchivesImg(@RequestParam Integer id){ + userVideoService.uploadUserArchivesImg(id); return HealthR.ok(); } + //用户关注医生列表 + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/ApplyJoinDto.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/ApplyJoinDto.java index c5ef08e..3e10a6e 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/ApplyJoinDto.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/ApplyJoinDto.java @@ -2,15 +2,37 @@ package doctor.domain.dto; import lombok.Data; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.io.Serializable; + @Data -public class ApplyJoinDto { +public class ApplyJoinDto implements Serializable { + private static final long serialVersionUID = 1L; + @Email(message = "请输入有效的邮箱地址") private String email; + + @NotBlank(message = "验证码不能为空") private String code; + + @Size(min = 4, message = "密码长度不能小于4") private String pwd1; + + @Size(min = 4, message = "确认密码长度不能小于4") private String pwd2; + + @NotBlank(message = "姓名不能为空") private String name; + + @NotBlank(message = "就职医院不能为空") private String inauguralHospital; + + @NotNull(message = "部门ID不能为空") private Integer departmentId; + + @NotNull(message = "职称ID不能为空") private Integer jobTitleId; private String personalProfile; private String goodFieId; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/UserArchivesDto.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/UserArchivesDto.java index a3e2ed5..cc8bc39 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/UserArchivesDto.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/UserArchivesDto.java @@ -1,82 +1,41 @@ package doctor.domain.dto; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * @ClassName : UserArchivesDto * @Description : 添加用户档案 * @Author : FJJ * @Date: 2024-01-15 21:51 */ +@Data public class UserArchivesDto { private Integer userId; + + + private String picture; + + private String diseaseMain; + + private String diseaseNow; + + private String diseaseBefore; + + private String treatmentHospitalRecent; + + private String treatmentProcess; + + private String treatmentStartTime; + private String treatmentEndTime; - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public String getDiseaseMain() { - return diseaseMain; - } - - public void setDiseaseMain(String diseaseMain) { - this.diseaseMain = diseaseMain; - } - - public String getDiseaseNow() { - return diseaseNow; - } - - public void setDiseaseNow(String diseaseNow) { - this.diseaseNow = diseaseNow; - } - - public String getDiseaseBefore() { - return diseaseBefore; - } - - public void setDiseaseBefore(String diseaseBefore) { - this.diseaseBefore = diseaseBefore; - } - - public String getTreatmentHospitalRecent() { - return treatmentHospitalRecent; - } - - public void setTreatmentHospitalRecent(String treatmentHospitalRecent) { - this.treatmentHospitalRecent = treatmentHospitalRecent; - } - - public String getTreatmentProcess() { - return treatmentProcess; - } - - public void setTreatmentProcess(String treatmentProcess) { - this.treatmentProcess = treatmentProcess; - } - - public String getTreatmentStartTime() { - return treatmentStartTime; - } - - public void setTreatmentStartTime(String treatmentStartTime) { - this.treatmentStartTime = treatmentStartTime; - } - - public String getTreatmentEndTime() { - return treatmentEndTime; - } - - public void setTreatmentEndTime(String treatmentEndTime) { - this.treatmentEndTime = treatmentEndTime; - } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/VideoDto.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/VideoDto.java index 3ed0734..8dc98f1 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/VideoDto.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/VideoDto.java @@ -4,11 +4,22 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + @Data @AllArgsConstructor @NoArgsConstructor public class VideoDto { + @NotNull(message = "分类ID不能为空") private Integer categoryId; - private Integer page=1; - private Integer count=1; + + @NotNull(message = "页码不能为空") + @Min(value = 1, message = "页码不能小于1") + private Integer page = 1; + + @NotNull(message = "每页数量不能为空") + @Min(value = 1, message = "每页数量不能小于1") + private Integer count = 1; + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserArchivesEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserArchivesEntity.java index 5fb6e04..0091fc0 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserArchivesEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserArchivesEntity.java @@ -1,6 +1,7 @@ package doctor.domain.entity; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -19,10 +20,13 @@ public class UserArchivesEntity { private String diseaseBefore; private String treatmentHospitalRecent; private String treatmentProcess; - private Date treatmentStartTime; - private Date treatmentEndTime; + private String treatmentStartTime; + + private String treatmentEndTime; private String picture; + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date updateTime; + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date createTime; public Integer getId() { @@ -81,19 +85,19 @@ public class UserArchivesEntity { this.treatmentProcess = treatmentProcess; } - public Date getTreatmentStartTime() { + public String getTreatmentStartTime() { return treatmentStartTime; } - public void setTreatmentStartTime(Date treatmentStartTime) { + public void setTreatmentStartTime(String treatmentStartTime) { this.treatmentStartTime = treatmentStartTime; } - public Date getTreatmentEndTime() { + public String getTreatmentEndTime() { return treatmentEndTime; } - public void setTreatmentEndTime(Date treatmentEndTime) { + public void setTreatmentEndTime(String treatmentEndTime) { this.treatmentEndTime = treatmentEndTime; } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java index f37475a..7e179ad 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java @@ -4,6 +4,11 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; +import java.io.Serializable; import java.util.Date; /** @@ -15,19 +20,29 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -public class UserEntity { +public class UserEntity implements Serializable { + @NotBlank(message = "用户ID不能为空") private Integer id; + + @NotBlank(message = "手机号不能为空") + @Pattern(regexp = "^1[0-9]{10}$", message = "请输入有效的手机号") private String phone; + + @NotBlank(message = "密码不能为空") + @Size(min = 1, message = "密码长度不能小于1") private String pwd; + + @NotBlank(message = "邮箱不能为空") + @Email(message = "请输入有效的邮箱地址") private String email; + + @NotBlank(message = "昵称不能为空") private String nickName; + + @NotBlank(message = "用户名不能为空") private String userName; - private String headPic; - private Integer sex; - private Integer age; - private String height; - private String weight; - private String invitationCode; + + private Date updateTime; private Long createTime; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserSickCircleEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserSickCircleEntity.java new file mode 100644 index 0000000..1011f59 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserSickCircleEntity.java @@ -0,0 +1,32 @@ +package doctor.domain.entity; + +import lombok.Data; + +/** + * @ClassName : UserSickCircleEntity + * @Description : 患者病友圈列表 + * @Author : FJJ + * @Date: 2024-01-16 22:02 + */ +@Data +public class UserSickCircleEntity { + private String sickCircleId; + private String userId; + private String title; + private String departmentId; + private String adoptCommentId; + private String disease; + private String detail; + private String treatmentHospital; + private String treatmentStartTime; + private String treatmentEndTime; + private String treatmentProcess; + private String picture; + private String releaseTime; + private String adoptTime; + private String amount; + private String createTime; + private String collectionNum; + private String commentNum; + private String id; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DepartmentVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DepartmentVo.java index dd5cbbe..7628688 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DepartmentVo.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DepartmentVo.java @@ -4,6 +4,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import javax.validation.constraints.NotNull; + /** * @BelongsProject: Medical_Treatment * @BelongsPackage: doctor.domain.vo @@ -15,6 +17,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class DepartmentVo { + @NotNull(message = "id不能为空") private Integer id; private String departmentName; private String pic; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserDoctorFollowVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserDoctorFollowVo.java new file mode 100644 index 0000000..3e85df7 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserDoctorFollowVo.java @@ -0,0 +1,24 @@ +package doctor.domain.vo; + +import lombok.Data; + +/** + * @ClassName : UserDoctorFollowVo + * @Description : 用户关注医生 + * @Author : FJJ + * @Date: 2024-01-16 22:20 + */ +@Data +public class UserDoctorFollowVo { + private Integer id; + private Integer doctorId; + private String name; + private String imagePic; + private String jobTitle; + private String inauguralHospital; + private Integer departmentId; + private String departmentName; + private Integer praiseNum; + private Integer badNum; + private Integer number; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserSickCircleVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserSickCircleVo.java new file mode 100644 index 0000000..431f1df --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserSickCircleVo.java @@ -0,0 +1,20 @@ +package doctor.domain.vo; + +import lombok.Data; + +/** + * @ClassName : UserSickCircleVo + * @Description : 患者朋友圈 + * @Author : FJJ + * @Date: 2024-01-16 22:04 + */ +@Data +public class UserSickCircleVo { + private Integer sickCircleId; + private String title; + private String detail; + private Integer amount; + private Integer collectionNum; + private Integer commentNum; + private long releaseTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java index 1986bd4..d9d225e 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java @@ -3,6 +3,11 @@ package doctor.domain.vo; import lombok.Data; import org.apache.catalina.User; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; + /** * @BelongsProject: Medical_Treatment * @BelongsPackage: doctor.vo @@ -11,15 +16,19 @@ import org.apache.catalina.User; */ @Data public class UserVo { + @NotBlank(message = "密码不能为空") + @Size(min = 4, message = "密码长度不能小于4") private String pwd; - //邮箱 + + @NotBlank(message = "邮箱不能为空") + @Email(message = "请输入有效的邮箱地址") private String email; - //昵称 + + @NotBlank(message = "昵称不能为空") private String nickName; - //验证码 + + @NotBlank(message = "验证码不能为空") + @Pattern(regexp = "\\d{4}", message = "验证码必须是6位数字") private String code; - public static User toUser(UserVo userVo) { - return null; - } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserSickCircleMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserSickCircleMapper.java new file mode 100644 index 0000000..3e31b23 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserSickCircleMapper.java @@ -0,0 +1,17 @@ +package doctor.mapper; + +import doctor.domain.entity.UserSickCircleEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @ClassName : UserSickCircleMapper + * @Description : + * @Author : FJJ + * @Date: 2024-01-16 22:09 + */ +@Mapper +public interface UserSickCircleMapper { + List findUserSickCircleList(); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java index c5d9f75..f5c1a6a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java @@ -35,5 +35,9 @@ public interface UserVideoMapper { List findUserArchives(@Param("userId") Integer userId); - void addUserArchives(UserArchivesDto userArchivesDto); + void addUserArchives(UserArchivesEntity userArchivesEntity, @Param("userId") Integer userId); + + void uploadUserArchivesImg(@Param("id") Integer id); + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/UserSickCircleService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/UserSickCircleService.java new file mode 100644 index 0000000..ea24211 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/UserSickCircleService.java @@ -0,0 +1,16 @@ +package doctor.service; + +import doctor.domain.vo.UserSickCircleVo; + +import java.util.List; + +/** + * @ClassName : UserSickCircleService + * @Description : + * @Author : FJJ + * @Date: 2024-01-16 22:09 + */ +public interface UserSickCircleService { + + List findMySickCircleList(); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java index 402a398..e23c4b9 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java @@ -2,6 +2,7 @@ package doctor.service; import doctor.domain.dto.UserArchivesDto; import doctor.domain.entity.UserAdoptCommentEntity; +import doctor.domain.entity.UserArchivesEntity; import doctor.domain.entity.UserEntity; import doctor.domain.entity.UserWalletEntity; import doctor.domain.vo.*; @@ -39,5 +40,8 @@ public interface UserVideoService { List findUserArchives(Integer userId); - void addUserArchives(UserArchivesDto userArchivesDto); + void addUserArchives(UserArchivesEntity userArchivesEntity, Integer userId); + + void uploadUserArchivesImg(Integer id); + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserSickCircleServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserSickCircleServiceImpl.java new file mode 100644 index 0000000..8412cd1 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserSickCircleServiceImpl.java @@ -0,0 +1,30 @@ +package doctor.service.impl; + +import doctor.domain.entity.UserSickCircleEntity; +import doctor.domain.vo.UserSickCircleVo; +import doctor.mapper.UserSickCircleMapper; +import doctor.mapper.UserVideoMapper; +import doctor.service.UserSickCircleService; +import doctor.util.ConvertUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName : UserSickCircleServiceImpl + * @Description : + * @Author : FJJ + * @Date: 2024-01-16 22:10 + */ +@Service +public class UserSickCircleServiceImpl implements UserSickCircleService { + @Autowired + private UserSickCircleMapper userSickCircleMapper; + @Override + public List findMySickCircleList() { + List userSickCircleEntityList=userSickCircleMapper.findUserSickCircleList(); + List userSickCircleVoList = ConvertUtil.entityToVoList(userSickCircleEntityList, UserSickCircleVo.class); + return userSickCircleVoList; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java index ce70aa8..6d87436 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java @@ -70,10 +70,17 @@ public class UserVideoServiceImpl implements UserVideoService { } @Override - public void addUserArchives(UserArchivesDto userArchivesDto) { - userVideoMapper.addUserArchives(userArchivesDto); + public void addUserArchives(UserArchivesEntity userArchivesEntity,Integer userId) { + userVideoMapper.addUserArchives(userArchivesEntity,userId); } + @Override + public void uploadUserArchivesImg(Integer id) { + userVideoMapper.uploadUserArchivesImg(id); + } + + + @Override public List findUserVideoBuyList() { diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserSickCircleMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserSickCircleMapper.xml new file mode 100644 index 0000000..6f017c2 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserSickCircleMapper.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml index f569431..f6b9918 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml @@ -30,6 +30,11 @@ create_time now() ); + + update user_archives + set picture = #{picture} + where id=#{id} + delete from user_video_collection @@ -70,4 +75,5 @@ create_time select * from user_archives where user_id=#{userId} + diff --git a/pom.xml b/pom.xml index 94655ec..37a767b 100644 --- a/pom.xml +++ b/pom.xml @@ -206,6 +206,22 @@ ${doctor.version} + + org.springframework.boot + spring-boot-starter-validation + 2.7.18 + + + + com.github.xiaoymin + knife4j-spring-boot-starter + 2.0.9 + + + + + + From d294516c493cd3b061b50507e1868aea10985f90 Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Tue, 16 Jan 2024 22:30:44 +0800 Subject: [PATCH 05/12] 1.16 --- .../doctor/gateway/filter/AuthFilter.java | 2 +- .../HealthInquiryVerifyController.java | 26 ++++++++++ .../controller/HealthJobTitleController.java | 49 +++++++++++-------- .../controller/HealthSickController.java | 28 +++++++++++ .../domain/entity/SickCircleEntity.java | 49 +++++++++++++++++++ .../entity/doctorSystemNoticeEntity.java | 17 +++++++ .../doctor/domain/vo/InquiryRecordVo.java | 15 ++++++ .../doctor/domain/vo/NoticeReadNumVo.java | 9 ++++ .../java/doctor/domain/vo/SickCircleVo.java | 12 +++++ .../doctor/mapper/HealthJobTitleMapper.java | 3 ++ .../mapper/InquiryVerifyServiceMapper.java | 4 ++ .../java/doctor/mapper/SickCircleMapper.java | 12 +++++ .../doctor/service/HealthJobTitleService.java | 9 ++-- .../doctor/service/InquiryVerifyService.java | 11 +++++ .../doctor/service/SickCircleService.java | 11 +++++ .../impl/HealthJobTitleServiceImpl.java | 30 ++++++++++-- .../impl/InquiryVerifyServiceImpl.java | 22 +++++++++ .../service/impl/SickCircleServiceImpl.java | 34 +++++++++++++ .../mapper/doctor/HealthJobTitleMapper.xml | 3 ++ .../doctor/InquiryVerifyServiceMapper.xml | 8 +++ .../mapper/doctor/SickCircleMapper.xml | 11 +++++ 21 files changed, 335 insertions(+), 30 deletions(-) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/HealthInquiryVerifyController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/doctorSystemNoticeEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryRecordVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/NoticeReadNumVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/SickCircleMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/InquiryVerifyService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryVerifyServiceImpl.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml 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 @@ + + + + + + + From f0c7d445513d15288c01f771e8e4e3cb9a5c863f Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Wed, 17 Jan 2024 11:35:47 +0800 Subject: [PATCH 06/12] 1.17 --- .../controller/HealthJobTitleController.java | 38 +------------ .../controller/HealthSickController.java | 16 +++++- .../controller/HealthVerifyController.java | 56 +++++++++++++++++++ .../domain/entity/SickCircleEntity.java | 2 +- .../doctor/domain/vo/SearchSickCircleVo.java | 15 +++++ .../doctor/domain/vo/SickCircleInfoVo.java | 25 +++++++++ .../java/doctor/domain/vo/SickCircleVo.java | 4 +- .../java/doctor/mapper/SickCircleMapper.java | 5 ++ .../doctor/service/SickCircleService.java | 7 ++- .../impl/HealthJobTitleServiceImpl.java | 2 +- .../service/impl/SickCircleServiceImpl.java | 17 +++++- .../mapper/doctor/SickCircleMapper.xml | 6 ++ 12 files changed, 149 insertions(+), 44 deletions(-) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java 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 9a8a938..1d37ef0 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 @@ -10,7 +10,6 @@ import doctor.domain.entity.DoctorJobTitleEntity; import doctor.domain.vo.*; import doctor.service.BannersService; import doctor.service.HealthJobTitleService; -import doctor.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -27,30 +26,16 @@ public class HealthJobTitleController { private BannersService bannersService; - - @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; + return healthR; } - @GetMapping("/findDoctorWallet") - public HealthR findDoctorWallet(@RequestHeader Integer doctorId, - @RequestHeader String sessionId) { - WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId); - return HealthR.ok(healthR); - } @PostMapping("/drawCash") public HealthR drawCash(@RequestHeader Integer doctorId, @@ -60,14 +45,6 @@ public class HealthJobTitleController { return healthR; } - @GetMapping("/findDoctorIncomeRecordList") - public HealthR> findDoctorIncomeRecordList(@RequestHeader Integer doctorId, - @RequestHeader String sessionId, - @RequestParam Integer page, - @RequestParam Integer count) { - List doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count); - return HealthR.ok(doctorIncomeRecordEntities); - } @GetMapping("/bannersShow") public HealthR> bannersShow() { @@ -101,22 +78,11 @@ public class HealthJobTitleController { return healthR; } - @GetMapping("/findDoctorById") - public HealthR findDoctorById(@RequestHeader Integer doctorId, - @RequestHeader String sessionId) { - return HealthR.ok(healthJobTitleService.findDoctorById(doctorId)); - } + @GetMapping("/findSystemImagePic") public HealthR> findSystemImagePic() { return HealthR.ok(healthJobTitleService.findSystemImagePic()); } - @PostMapping("/uploadImagePic") - public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic, - @RequestHeader String sessionId, - @RequestHeader Integer doctorId) { - 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 index ba5e4f8..bbdb006 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java @@ -1,6 +1,9 @@ package doctor.controller; import doctor.common.core.domain.HealthR; +import doctor.common.core.web.controller.BaseController; +import doctor.domain.vo.SearchSickCircleVo; +import doctor.domain.vo.SickCircleInfoVo; import doctor.domain.vo.SickCircleVo; import doctor.service.SickCircleService; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +16,7 @@ import java.util.List; @RestController @RequestMapping("/sickCircle/v1") -public class HealthSickController { +public class HealthSickController { @Autowired private SickCircleService sickCircleService; @@ -25,4 +28,15 @@ public class HealthSickController { List sickCircleList = sickCircleService.findSickCircleList(page, count, departmentId); return HealthR.ok(sickCircleList); } + + @GetMapping("/findSickCircleInfo") + public HealthR findSickCircleInfo(@RequestParam Integer sickCircleId) { + SickCircleInfoVo sickCircleInfoVo = sickCircleService.findSickCircleInfo(sickCircleId); + return HealthR.ok(sickCircleInfoVo); + } + @GetMapping("/searchSickCircle") + public HealthR> searchSickCircle(@RequestParam String keyWord) { + List searchSickCircleVoList = sickCircleService.searchSickCircle(keyWord); + return HealthR.ok(searchSickCircleVoList); + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java new file mode 100644 index 0000000..7064ae0 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java @@ -0,0 +1,56 @@ +package doctor.controller; + +import doctor.common.core.domain.HealthR; +import doctor.domain.vo.DoctorIncomeRecordVo; +import doctor.domain.vo.DoctorVo; +import doctor.domain.vo.NoticeReadNumVo; +import doctor.domain.vo.WalletVo; +import doctor.service.HealthJobTitleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +@RestController +@RequestMapping("/verify/v1") +public class HealthVerifyController { + @Autowired + private HealthJobTitleService healthJobTitleService; + @GetMapping("/findDoctorById") + public HealthR findDoctorById(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + return HealthR.ok(healthJobTitleService.findDoctorById(doctorId)); + } + + @GetMapping("/findDoctorNoticeReadNum") + public HealthR> findDoctorNoticeReadNum(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + List healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId); + return HealthR.ok(healthR); + } + + @PostMapping("/uploadImagePic") + public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic, + @RequestHeader String sessionId, + @RequestHeader Integer doctorId) { + return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic, doctorId, sessionId)); + } + + @GetMapping("/findDoctorIncomeRecordList") + public HealthR> findDoctorIncomeRecordList(@RequestHeader Integer doctorId, + @RequestHeader String sessionId, + @RequestParam Integer page, + @RequestParam Integer count) { + List doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count); + return HealthR.ok(doctorIncomeRecordEntities); + } + + @GetMapping("/findDoctorWallet") + public HealthR findDoctorWallet(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + + WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId); + return HealthR.ok(healthR); + } +} 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 99468ef..fb7326e 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,7 +9,7 @@ import java.util.Date; @Data public class SickCircleEntity { - private Integer id; + private Integer sickCircleId; private Integer userId; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java new file mode 100644 index 0000000..1c628d7 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java @@ -0,0 +1,15 @@ +package doctor.domain.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SearchSickCircleVo { + private Integer sickCircleId; + private String title; + private String detail; + private Integer amount; + private Date releaseTime; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java new file mode 100644 index 0000000..ad33e99 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java @@ -0,0 +1,25 @@ +package doctor.domain.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SickCircleInfoVo { + private Integer id; + private Integer userId; + private String authorName; + private String title; + private Integer departmentId; + private String departmentName; + private String disease; + private String detail; + private String treatmentHospital; + private Date treatmentStartTime; + private Date treatmentEndTime; + private String treatmentProcess; + private String picture; + private Integer amount; + private String content; + private Integer whetherContent; +} 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 index 6ccc422..cdd0855 100644 --- 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 @@ -2,11 +2,13 @@ package doctor.domain.vo; import lombok.Data; +import java.util.Date; + @Data public class SickCircleVo { private Integer sickCircleId; private String title; private String detail; - private long releaseTime; + private Date releaseTime; private Integer amount; } 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 ae8f55a..7692b4e 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 @@ -1,6 +1,8 @@ package doctor.mapper; import doctor.domain.entity.SickCircleEntity; +import doctor.domain.vo.SearchSickCircleVo; +import doctor.domain.vo.SickCircleInfoVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -9,4 +11,7 @@ import java.util.List; public interface SickCircleMapper { List findSickCircleList(Integer departmentId); + SickCircleInfoVo findSickCircleInfo(Integer sickCircleId); + + List searchSickCircle(String keyWord); } 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 index 81a47ef..f10a160 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java @@ -1,11 +1,16 @@ package doctor.service; import doctor.common.core.domain.HealthR; +import doctor.domain.vo.SearchSickCircleVo; +import doctor.domain.vo.SickCircleInfoVo; import doctor.domain.vo.SickCircleVo; import java.util.List; public interface SickCircleService { - List findSickCircleList(Integer page, Integer size, Integer departmentId); + List findSickCircleList(Integer page, Integer count, Integer departmentId); + SickCircleInfoVo findSickCircleInfo(Integer sickCircleId); + + List searchSickCircle(String keyWord); } 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 98ad438..3e68c2c 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 @@ -164,7 +164,7 @@ public class HealthJobTitleServiceImpl extends BaseController implements HealthJ @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) { 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 f314126..18b1776 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 @@ -3,6 +3,8 @@ 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.SearchSickCircleVo; +import doctor.domain.vo.SickCircleInfoVo; import doctor.domain.vo.SickCircleVo; import doctor.mapper.SickCircleMapper; import doctor.service.SickCircleService; @@ -19,16 +21,25 @@ public class SickCircleServiceImpl extends BaseController implements SickCircleS @Autowired private SickCircleMapper sickCircleMapper; @Override - public List findSickCircleList(Integer page, Integer size, Integer departmentId) { - startPage(page,size); + public List findSickCircleList(Integer page, Integer count, Integer departmentId) { List list = sickCircleMapper.findSickCircleList(departmentId); ArrayList sickCircleVos = new ArrayList<>(); for (SickCircleEntity sickCircleEntity : list) { SickCircleVo sickCircleVo = new SickCircleVo(); - sickCircleVo.setSickCircleId(sickCircleEntity.getId()); + sickCircleVo.setSickCircleId(sickCircleEntity.getSickCircleId()); BeanUtils.copyProperties(sickCircleEntity,sickCircleVo); sickCircleVos.add(sickCircleVo); } return sickCircleVos; } + + @Override + public SickCircleInfoVo findSickCircleInfo(Integer sickCircleId) { + return sickCircleMapper.findSickCircleInfo(sickCircleId); + } + + @Override + public List searchSickCircle(String keyWord) { + return sickCircleMapper.searchSickCircle(keyWord); + } } 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 1e82943..94eca4e 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 @@ -8,4 +8,10 @@ + + From 690e465eeab0a41147a0ebfa906786bc0c0c01a0 Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Wed, 17 Jan 2024 11:46:46 +0800 Subject: [PATCH 07/12] Revert "1.17" This reverts commit f0c7d445513d15288c01f771e8e4e3cb9a5c863f. --- .../controller/HealthJobTitleController.java | 38 ++++++++++++- .../controller/HealthSickController.java | 16 +----- .../controller/HealthVerifyController.java | 56 ------------------- .../domain/entity/SickCircleEntity.java | 2 +- .../doctor/domain/vo/SearchSickCircleVo.java | 15 ----- .../doctor/domain/vo/SickCircleInfoVo.java | 25 --------- .../java/doctor/domain/vo/SickCircleVo.java | 4 +- .../java/doctor/mapper/SickCircleMapper.java | 5 -- .../doctor/service/SickCircleService.java | 7 +-- .../impl/HealthJobTitleServiceImpl.java | 2 +- .../service/impl/SickCircleServiceImpl.java | 17 +----- .../mapper/doctor/SickCircleMapper.xml | 6 -- 12 files changed, 44 insertions(+), 149 deletions(-) delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java 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 1d37ef0..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 @@ -10,6 +10,7 @@ import doctor.domain.entity.DoctorJobTitleEntity; import doctor.domain.vo.*; import doctor.service.BannersService; import doctor.service.HealthJobTitleService; +import doctor.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -26,16 +27,30 @@ public class HealthJobTitleController { private BannersService bannersService; + + @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 healthR; + return null; } + @GetMapping("/findDoctorWallet") + public HealthR findDoctorWallet(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId); + return HealthR.ok(healthR); + } @PostMapping("/drawCash") public HealthR drawCash(@RequestHeader Integer doctorId, @@ -45,6 +60,14 @@ public class HealthJobTitleController { return healthR; } + @GetMapping("/findDoctorIncomeRecordList") + public HealthR> findDoctorIncomeRecordList(@RequestHeader Integer doctorId, + @RequestHeader String sessionId, + @RequestParam Integer page, + @RequestParam Integer count) { + List doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count); + return HealthR.ok(doctorIncomeRecordEntities); + } @GetMapping("/bannersShow") public HealthR> bannersShow() { @@ -78,11 +101,22 @@ public class HealthJobTitleController { return healthR; } - + @GetMapping("/findDoctorById") + public HealthR findDoctorById(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + return HealthR.ok(healthJobTitleService.findDoctorById(doctorId)); + } @GetMapping("/findSystemImagePic") public HealthR> findSystemImagePic() { return HealthR.ok(healthJobTitleService.findSystemImagePic()); } + @PostMapping("/uploadImagePic") + public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic, + @RequestHeader String sessionId, + @RequestHeader Integer doctorId) { + 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 index bbdb006..ba5e4f8 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthSickController.java @@ -1,9 +1,6 @@ package doctor.controller; import doctor.common.core.domain.HealthR; -import doctor.common.core.web.controller.BaseController; -import doctor.domain.vo.SearchSickCircleVo; -import doctor.domain.vo.SickCircleInfoVo; import doctor.domain.vo.SickCircleVo; import doctor.service.SickCircleService; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +13,7 @@ import java.util.List; @RestController @RequestMapping("/sickCircle/v1") -public class HealthSickController { +public class HealthSickController { @Autowired private SickCircleService sickCircleService; @@ -28,15 +25,4 @@ public class HealthSickController { List sickCircleList = sickCircleService.findSickCircleList(page, count, departmentId); return HealthR.ok(sickCircleList); } - - @GetMapping("/findSickCircleInfo") - public HealthR findSickCircleInfo(@RequestParam Integer sickCircleId) { - SickCircleInfoVo sickCircleInfoVo = sickCircleService.findSickCircleInfo(sickCircleId); - return HealthR.ok(sickCircleInfoVo); - } - @GetMapping("/searchSickCircle") - public HealthR> searchSickCircle(@RequestParam String keyWord) { - List searchSickCircleVoList = sickCircleService.searchSickCircle(keyWord); - return HealthR.ok(searchSickCircleVoList); - } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java deleted file mode 100644 index 7064ae0..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthVerifyController.java +++ /dev/null @@ -1,56 +0,0 @@ -package doctor.controller; - -import doctor.common.core.domain.HealthR; -import doctor.domain.vo.DoctorIncomeRecordVo; -import doctor.domain.vo.DoctorVo; -import doctor.domain.vo.NoticeReadNumVo; -import doctor.domain.vo.WalletVo; -import doctor.service.HealthJobTitleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; - -@RestController -@RequestMapping("/verify/v1") -public class HealthVerifyController { - @Autowired - private HealthJobTitleService healthJobTitleService; - @GetMapping("/findDoctorById") - public HealthR findDoctorById(@RequestHeader Integer doctorId, - @RequestHeader String sessionId) { - return HealthR.ok(healthJobTitleService.findDoctorById(doctorId)); - } - - @GetMapping("/findDoctorNoticeReadNum") - public HealthR> findDoctorNoticeReadNum(@RequestHeader Integer doctorId, - @RequestHeader String sessionId) { - List healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId); - return HealthR.ok(healthR); - } - - @PostMapping("/uploadImagePic") - public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic, - @RequestHeader String sessionId, - @RequestHeader Integer doctorId) { - return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic, doctorId, sessionId)); - } - - @GetMapping("/findDoctorIncomeRecordList") - public HealthR> findDoctorIncomeRecordList(@RequestHeader Integer doctorId, - @RequestHeader String sessionId, - @RequestParam Integer page, - @RequestParam Integer count) { - List doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count); - return HealthR.ok(doctorIncomeRecordEntities); - } - - @GetMapping("/findDoctorWallet") - public HealthR findDoctorWallet(@RequestHeader Integer doctorId, - @RequestHeader String sessionId) { - - WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId); - return HealthR.ok(healthR); - } -} 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..99468ef 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,7 +9,7 @@ import java.util.Date; @Data public class SickCircleEntity { - private Integer sickCircleId; + private Integer id; private Integer userId; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java deleted file mode 100644 index 1c628d7..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SearchSickCircleVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package doctor.domain.vo; - -import lombok.Data; - -import java.util.Date; - -@Data -public class SearchSickCircleVo { - private Integer sickCircleId; - private String title; - private String detail; - private Integer amount; - private Date releaseTime; - -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java deleted file mode 100644 index ad33e99..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/SickCircleInfoVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package doctor.domain.vo; - -import lombok.Data; - -import java.util.Date; - -@Data -public class SickCircleInfoVo { - private Integer id; - private Integer userId; - private String authorName; - private String title; - private Integer departmentId; - private String departmentName; - private String disease; - private String detail; - private String treatmentHospital; - private Date treatmentStartTime; - private Date treatmentEndTime; - private String treatmentProcess; - private String picture; - private Integer amount; - private String content; - private Integer whetherContent; -} 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 index cdd0855..6ccc422 100644 --- 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 @@ -2,13 +2,11 @@ package doctor.domain.vo; import lombok.Data; -import java.util.Date; - @Data public class SickCircleVo { private Integer sickCircleId; private String title; private String detail; - private Date releaseTime; + private long releaseTime; private Integer amount; } 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 7692b4e..ae8f55a 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 @@ -1,8 +1,6 @@ package doctor.mapper; import doctor.domain.entity.SickCircleEntity; -import doctor.domain.vo.SearchSickCircleVo; -import doctor.domain.vo.SickCircleInfoVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -11,7 +9,4 @@ import java.util.List; public interface SickCircleMapper { List findSickCircleList(Integer departmentId); - SickCircleInfoVo findSickCircleInfo(Integer sickCircleId); - - List searchSickCircle(String keyWord); } 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 index f10a160..81a47ef 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/SickCircleService.java @@ -1,16 +1,11 @@ package doctor.service; import doctor.common.core.domain.HealthR; -import doctor.domain.vo.SearchSickCircleVo; -import doctor.domain.vo.SickCircleInfoVo; import doctor.domain.vo.SickCircleVo; import java.util.List; public interface SickCircleService { - List findSickCircleList(Integer page, Integer count, Integer departmentId); + List findSickCircleList(Integer page, Integer size, Integer departmentId); - SickCircleInfoVo findSickCircleInfo(Integer sickCircleId); - - List searchSickCircle(String keyWord); } 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 3e68c2c..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 @@ -164,7 +164,7 @@ public class HealthJobTitleServiceImpl extends BaseController implements HealthJ @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) { 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 18b1776..f314126 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 @@ -3,8 +3,6 @@ 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.SearchSickCircleVo; -import doctor.domain.vo.SickCircleInfoVo; import doctor.domain.vo.SickCircleVo; import doctor.mapper.SickCircleMapper; import doctor.service.SickCircleService; @@ -21,25 +19,16 @@ public class SickCircleServiceImpl extends BaseController implements SickCircleS @Autowired private SickCircleMapper sickCircleMapper; @Override - public List findSickCircleList(Integer page, Integer count, Integer departmentId) { + 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.getSickCircleId()); + sickCircleVo.setSickCircleId(sickCircleEntity.getId()); BeanUtils.copyProperties(sickCircleEntity,sickCircleVo); sickCircleVos.add(sickCircleVo); } return sickCircleVos; } - - @Override - public SickCircleInfoVo findSickCircleInfo(Integer sickCircleId) { - return sickCircleMapper.findSickCircleInfo(sickCircleId); - } - - @Override - public List searchSickCircle(String keyWord) { - return sickCircleMapper.searchSickCircle(keyWord); - } } 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 94eca4e..1e82943 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 @@ -8,10 +8,4 @@ - - From b62f617ad0d5c14cdd6ea7b82956396c28abc2a2 Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Wed, 17 Jan 2024 15:54:39 +0800 Subject: [PATCH 08/12] 1.17 --- .../controller/HealthJobTitleController.java | 37 +------------------ .../impl/HealthJobTitleServiceImpl.java | 1 - .../service/impl/SickCircleServiceImpl.java | 1 - 3 files changed, 1 insertion(+), 38 deletions(-) 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 9a8a938..19da92a 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 @@ -27,14 +27,6 @@ public class HealthJobTitleController { private BannersService bannersService; - - @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, @@ -44,13 +36,6 @@ public class HealthJobTitleController { return null; } - @GetMapping("/findDoctorWallet") - public HealthR findDoctorWallet(@RequestHeader Integer doctorId, - @RequestHeader String sessionId) { - - WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId); - return HealthR.ok(healthR); - } @PostMapping("/drawCash") public HealthR drawCash(@RequestHeader Integer doctorId, @@ -60,14 +45,7 @@ public class HealthJobTitleController { return healthR; } - @GetMapping("/findDoctorIncomeRecordList") - public HealthR> findDoctorIncomeRecordList(@RequestHeader Integer doctorId, - @RequestHeader String sessionId, - @RequestParam Integer page, - @RequestParam Integer count) { - List doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count); - return HealthR.ok(doctorIncomeRecordEntities); - } + @GetMapping("/bannersShow") public HealthR> bannersShow() { @@ -101,22 +79,9 @@ public class HealthJobTitleController { return healthR; } - @GetMapping("/findDoctorById") - public HealthR findDoctorById(@RequestHeader Integer doctorId, - @RequestHeader String sessionId) { - return HealthR.ok(healthJobTitleService.findDoctorById(doctorId)); - } - @GetMapping("/findSystemImagePic") public HealthR> findSystemImagePic() { return HealthR.ok(healthJobTitleService.findSystemImagePic()); } - @PostMapping("/uploadImagePic") - public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic, - @RequestHeader String sessionId, - @RequestHeader Integer doctorId) { - return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic, doctorId, sessionId)); - } - } 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 98ad438..4a305c7 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 @@ -164,7 +164,6 @@ public class HealthJobTitleServiceImpl extends BaseController implements HealthJ @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) { 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 f314126..169dd76 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 @@ -20,7 +20,6 @@ public class SickCircleServiceImpl extends BaseController implements SickCircleS 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) { From 228cef25a8475ac668ee1f49d9c7683c40398b1e Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Wed, 17 Jan 2024 15:57:05 +0800 Subject: [PATCH 09/12] 1.17 --- .../controller/HealthRVerifyController.java | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/HealthRVerifyController.java diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthRVerifyController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthRVerifyController.java new file mode 100644 index 0000000..b6b495f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/HealthRVerifyController.java @@ -0,0 +1,58 @@ +package doctor.controller; + +import doctor.common.core.domain.HealthR; +import doctor.domain.vo.DoctorIncomeRecordVo; +import doctor.domain.vo.DoctorVo; +import doctor.domain.vo.NoticeReadNumVo; +import doctor.domain.vo.WalletVo; +import doctor.service.HealthJobTitleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +@RestController +@RequestMapping("/verify/v1") +public class HealthRVerifyController { + @Autowired + private HealthJobTitleService healthJobTitleService; + + @GetMapping("/findDoctorWallet") + public HealthR findDoctorWallet(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + + WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId); + return HealthR.ok(healthR); + } + + @PostMapping("/uploadImagePic") + public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic, + @RequestHeader String sessionId, + @RequestHeader Integer doctorId) { + return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic, doctorId, sessionId)); + } + + @GetMapping("/findDoctorIncomeRecordList") + public HealthR> findDoctorIncomeRecordList(@RequestHeader Integer doctorId, + @RequestHeader String sessionId, + @RequestParam Integer page, + @RequestParam Integer count) { + List doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count); + return HealthR.ok(doctorIncomeRecordEntities); + } + + @GetMapping("/findDoctorById") + public HealthR findDoctorById(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + return HealthR.ok(healthJobTitleService.findDoctorById(doctorId)); + } + + @GetMapping("/findDoctorNoticeReadNum") + public HealthR> findDoctorNoticeReadNum(@RequestHeader Integer doctorId, + @RequestHeader String sessionId) { + List healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId); + return HealthR.ok(healthR); + } + +} From 61d82c1018ce77af0c26b35a949e59ed7a6256d7 Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Wed, 17 Jan 2024 15:59:30 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserVideoController.java | 30 +++++++++++++++---- .../doctor/domain/dto/UserTaskRecordDto.java | 25 ++++++++++++++++ .../java/doctor/domain/entity/TaskEntity.java | 20 +++++++++++++ .../domain/entity/UserTaskRecordEntity.java | 21 +++++++++++++ .../doctor/domain/vo/UserTaskRecordVo.java | 19 ++++++++++++ .../java/doctor/mapper/UserVideoMapper.java | 10 ++++++- .../java/doctor/service/UserVideoService.java | 9 +++++- .../service/impl/UserVideoServiceImpl.java | 13 ++++++++ .../mapper/doctor/UserVideoMapper.xml | 13 ++++++++ 9 files changed, 152 insertions(+), 8 deletions(-) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/dto/UserTaskRecordDto.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/TaskEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserTaskRecordEntity.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserTaskRecordVo.java diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java index beaf89e..d46d52f 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java @@ -2,15 +2,13 @@ package doctor.controller; import doctor.common.core.domain.HealthR; import doctor.domain.dto.UserArchivesDto; -import doctor.domain.entity.UserAdoptCommentEntity; -import doctor.domain.entity.UserEntity; -import doctor.domain.entity.UserInfoCollectionEntity; -import doctor.domain.entity.UserWalletEntity; +import doctor.domain.entity.*; import doctor.domain.vo.*; import doctor.service.UserVideoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; import static com.github.pagehelper.page.PageMethod.startPage; @@ -96,9 +94,29 @@ public class UserVideoController { } //添加用户档案 @PostMapping("/addUserArchives") - public HealthR addUserArchives(@RequestBody UserArchivesDto userArchivesDto){ - userVideoService.addUserArchives(userArchivesDto); + public HealthR addUserArchives(@RequestBody UserArchivesEntity userArchivesEntity, @RequestHeader Integer userId){ + userVideoService.addUserArchives(userArchivesEntity,userId); + return HealthR.ok(); + } + //上传用户档案图片 + @PostMapping("/uploadArchivesPicture") + public HealthR uploadUserArchivesImg(@RequestParam Integer id){ + userVideoService.uploadUserArchivesImg(id); return HealthR.ok(); } + //用户关注医生列表 + @GetMapping("/findUserDoctorFollowList") + public HealthR> findUserDoctorFollowList(){ + List userDoctorFollowVos = userVideoService.findUserDoctorFollowList(); + return HealthR.ok(userDoctorFollowVos); + } + //查询用户任务列表 + @GetMapping("/findUserTaskList") + public HealthR> findUserTaskList(){ + List userTaskRecordVos = userVideoService.findUserTaskList(); + return HealthR.ok(userTaskRecordVos); + } +// //查询用户连续签到列表 +// @GetMapping("/findUserSign") } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/UserTaskRecordDto.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/UserTaskRecordDto.java new file mode 100644 index 0000000..0234d1f --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/dto/UserTaskRecordDto.java @@ -0,0 +1,25 @@ +package doctor.domain.dto; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName : UserTaskRecordDto + * @Description : + * @Author : FJJ + * @Date: 2024-01-17 10:54 + */ +@Data +public class UserTaskRecordDto { + private Integer id; + private Integer userId; + private Integer taskId; + private String taskName; + private String taskType; + private String reward; + private Date taskTime; + private Integer status; + private Date createTime; + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/TaskEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/TaskEntity.java new file mode 100644 index 0000000..f187658 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/TaskEntity.java @@ -0,0 +1,20 @@ +package doctor.domain.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName : TaskEntity + * @Description : 任务表 + * @Author : FJJ + * @Date: 2024-01-17 10:59 + */ +@Data +public class TaskEntity { + private Integer id; + private String taskName; + private String taskType; + private String reward; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserTaskRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserTaskRecordEntity.java new file mode 100644 index 0000000..60b0155 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserTaskRecordEntity.java @@ -0,0 +1,21 @@ +package doctor.domain.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName : UserTaskRecord + * @Description : 患者任务列表 + * @Author : FJJ + * @Date: 2024-01-17 10:47 + */ +@Data +public class UserTaskRecordEntity { + private Integer id; + private Integer userId; + private Integer taskId; + private Date taskTime; + private Integer status; + private long createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserTaskRecordVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserTaskRecordVo.java new file mode 100644 index 0000000..4619783 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserTaskRecordVo.java @@ -0,0 +1,19 @@ +package doctor.domain.vo; + +import lombok.Data; + +/** + * @ClassName : UserTaskRecordVo + * @Description : 用户任务 + * @Author : FJJ + * @Date: 2024-01-17 10:50 + */ +@Data +public class UserTaskRecordVo { + private Integer id; + private String taskName; + private Integer taskType; + private Integer reward; + private Integer whetherFinish; + private Integer whetherReceive; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java index c5d9f75..f38152b 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java @@ -1,6 +1,7 @@ package doctor.mapper; import doctor.domain.dto.UserArchivesDto; +import doctor.domain.dto.UserTaskRecordDto; import doctor.domain.entity.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -35,5 +36,12 @@ public interface UserVideoMapper { List findUserArchives(@Param("userId") Integer userId); - void addUserArchives(UserArchivesDto userArchivesDto); + void addUserArchives(UserArchivesEntity userArchivesEntity, @Param("userId") Integer userId); + + void uploadUserArchivesImg(@Param("id") Integer id); + + + List findUserDoctorFollowList(); + + List findUserTaskList(); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java index 402a398..ab5c4f2 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java @@ -2,6 +2,7 @@ package doctor.service; import doctor.domain.dto.UserArchivesDto; import doctor.domain.entity.UserAdoptCommentEntity; +import doctor.domain.entity.UserArchivesEntity; import doctor.domain.entity.UserEntity; import doctor.domain.entity.UserWalletEntity; import doctor.domain.vo.*; @@ -39,5 +40,11 @@ public interface UserVideoService { List findUserArchives(Integer userId); - void addUserArchives(UserArchivesDto userArchivesDto); + void addUserArchives(UserArchivesEntity userArchivesEntity, Integer userId); + + void uploadUserArchivesImg(Integer id); + + List findUserDoctorFollowList(); + + List findUserTaskList(); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java index ce70aa8..cca8571 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java @@ -1,6 +1,7 @@ package doctor.service.impl; import doctor.domain.dto.UserArchivesDto; +import doctor.domain.dto.UserTaskRecordDto; import doctor.domain.entity.*; import doctor.domain.vo.*; import doctor.mapper.UserVideoMapper; @@ -74,6 +75,12 @@ public class UserVideoServiceImpl implements UserVideoService { userVideoMapper.addUserArchives(userArchivesDto); } + @Override + public List findUserTaskList() { + List userTaskRecordDtos=userVideoMapper.findUserTaskList(); + List userTaskRecordVoList = ConvertUtil.entityToVoList(userTaskRecordDtos, UserTaskRecordVo.class); + return userTaskRecordVoList; + } @Override public List findUserVideoBuyList() { @@ -92,5 +99,11 @@ public class UserVideoServiceImpl implements UserVideoService { return userVideoMapper.findUserWallet(); } + @Override + public List findUserDoctorFollowList() { + List userDoctorFollowEntityList=userVideoMapper.findUserDoctorFollowList(); + List userDoctorFollowVoList = ConvertUtil.entityToVoList(userDoctorFollowEntityList, UserDoctorFollowVo.class); + return userDoctorFollowVoList; + } } diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml index f569431..8286cbf 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml @@ -30,6 +30,11 @@ create_time now() ); + + update user_archives + set picture = #{picture} + where id=#{id} + delete from user_video_collection @@ -70,4 +75,12 @@ create_time select * from user_archives where user_id=#{userId} + + + From 1eceecfdb2927d35e41bac5a5782096e3692d787 Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Wed, 17 Jan 2024 16:01:53 +0800 Subject: [PATCH 11/12] 1.17 --- .../java/doctor/controller/HealthJobTitleController.java | 7 ------- 1 file changed, 7 deletions(-) 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 ed2b74e..ef17a6a 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 @@ -57,11 +57,4 @@ public class HealthJobTitleController { return HealthR.ok(healthJobTitleService.findSystemImagePic()); } - @PostMapping("/uploadImagePic") - public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic, - @RequestHeader String sessionId, - @RequestHeader Integer doctorId) { - return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic,doctorId,sessionId)); - } - } From 88ee5e376bf537f21fdd302eee66f6a72530f3df Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Wed, 17 Jan 2024 16:49:31 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=9B=B4=E6=96=B01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserVideoController.java | 22 ++++++++++++++++++- .../java/doctor/domain/entity/SignEntity.java | 21 ++++++++++++++++++ .../java/doctor/domain/entity/UserEntity.java | 9 ++++++-- .../main/java/doctor/domain/vo/UserVo.java | 14 ++++++++++++ .../java/doctor/mapper/UserVideoMapper.java | 6 +++++ .../java/doctor/service/UserVideoService.java | 10 +++++---- .../service/impl/UserVideoServiceImpl.java | 19 ++++++++++++++++ .../mapper/doctor/UserVideoMapper.xml | 11 ++++++++++ 8 files changed, 105 insertions(+), 7 deletions(-) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SignEntity.java diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java index bc1a678..9a467e4 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java @@ -106,5 +106,25 @@ public class UserVideoController { } //用户关注医生列表 - + @GetMapping("/findUserDoctorFollowList") + public HealthR> findUserDoctorFollowList(@RequestParam Integer page,@RequestParam Integer count){ + startPage(page,count); + List userDoctorFollowVos = userVideoService.findUserDoctorFollowList(); + return HealthR.ok(userDoctorFollowVos); + } + //用户任务列表 + @GetMapping("/findUserTaskList") + public HealthR> findUserTaskList(){ + List userTaskRecordVos = userVideoService.findUserTaskList(); + return HealthR.ok(userTaskRecordVos); + } + //用户连续签到天数 + @GetMapping("/findUserSign") + public HealthR> findUserSign(@RequestHeader Integer userId){ + List signEntities = userVideoService.findUserSign(userId); + return HealthR.ok(signEntities); + } +// //根据用户ID查询用户信息 +// @GetMapping("/getUserInfoById") +// public HealthR<> } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SignEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SignEntity.java new file mode 100644 index 0000000..b14d8bb --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SignEntity.java @@ -0,0 +1,21 @@ +package doctor.domain.entity; + +import lombok.Data; + +import java.util.Date; + +/** + * @ClassName : SignEntity + * @Description : 用户签到列表 + * @Author : FJJ + * @Date: 2024-01-17 16:18 + */ +@Data +public class SignEntity { + private Integer id; + private Integer userId; + private Date signTime; + private Integer signNum; + private Integer signReward; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java index 7e179ad..0bdad94 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java @@ -42,9 +42,14 @@ public class UserEntity implements Serializable { @NotBlank(message = "用户名不能为空") private String userName; - + private String headPic; + private Integer sex; + private Integer age; + private Integer height; + private Integer weight; + private String invitationCode; private Date updateTime; - private Long createTime; + private Date createTime; } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java index d9d225e..7d48a64 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVo.java @@ -16,6 +16,20 @@ import javax.validation.constraints.Size; */ @Data public class UserVo { + private Integer id; + private String userName; + private String jiGuangPwd; + private String headPic; + private Integer sex; + private Integer age; + private Integer height; + private Integer weight; + private Integer whetherBingWeChat; + private String invitationCode; + private Integer idCardFlag; + private Integer bankFlag; + private Integer faceFlag; + @NotBlank(message = "密码不能为空") @Size(min = 4, message = "密码长度不能小于4") private String pwd; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java index f5c1a6a..1664b98 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java @@ -1,6 +1,7 @@ package doctor.mapper; import doctor.domain.dto.UserArchivesDto; +import doctor.domain.dto.UserTaskRecordDto; import doctor.domain.entity.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -40,4 +41,9 @@ public interface UserVideoMapper { void uploadUserArchivesImg(@Param("id") Integer id); + List findUserDoctorFollowList(); + + List findUserTaskList(); + + List findUserSign(@Param("userId") Integer userId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java index e23c4b9..3da852d 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java @@ -1,10 +1,7 @@ package doctor.service; import doctor.domain.dto.UserArchivesDto; -import doctor.domain.entity.UserAdoptCommentEntity; -import doctor.domain.entity.UserArchivesEntity; -import doctor.domain.entity.UserEntity; -import doctor.domain.entity.UserWalletEntity; +import doctor.domain.entity.*; import doctor.domain.vo.*; import java.util.List; @@ -44,4 +41,9 @@ public interface UserVideoService { void uploadUserArchivesImg(Integer id); + List findUserDoctorFollowList(); + + List findUserTaskList(); + + List findUserSign(Integer userId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java index 6d87436..a8b59a5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java @@ -1,6 +1,7 @@ package doctor.service.impl; import doctor.domain.dto.UserArchivesDto; +import doctor.domain.dto.UserTaskRecordDto; import doctor.domain.entity.*; import doctor.domain.vo.*; import doctor.mapper.UserVideoMapper; @@ -79,7 +80,25 @@ public class UserVideoServiceImpl implements UserVideoService { userVideoMapper.uploadUserArchivesImg(id); } + @Override + public List findUserDoctorFollowList() { + List userDoctorFollowEntityList=userVideoMapper.findUserDoctorFollowList(); + List userDoctorFollowVoList = ConvertUtil.entityToVoList(userDoctorFollowEntityList, UserDoctorFollowVo.class); + return userDoctorFollowVoList; + } + @Override + public List findUserTaskList() { + List userTaskRecordDtos=userVideoMapper.findUserTaskList(); + List userTaskRecordVoList = ConvertUtil.entityToVoList(userTaskRecordDtos, UserTaskRecordVo.class); + return userTaskRecordVoList; + } + + @Override + public List findUserSign(Integer userId) { + List userEntityList=userVideoMapper.findUserSign(userId); + return userEntityList; + } @Override diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml index f6b9918..0b6832b 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml @@ -75,5 +75,16 @@ create_time select * from user_archives where user_id=#{userId} + + +