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} + + +