Merge branch 'newMaster' of https://gitea.qinmian.online/cbx/Medical_Treatment into zmy

# Conflicts:
#	pom.xml

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,"登录成功");

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

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

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

doctor-common/doctor-common-core/pom.xml

@@ -121,6 +121,13 @@
         </dependency>
 
 
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>2.2</version>
+        </dependency>
+
+
 
 
     </dependencies>

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

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";
 
     /**
      * 令牌前缀

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);
+    }
+
+
+
     /**
      * 清理分页的线程变量
      */

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;
@@ -52,6 +53,7 @@ public class AuthFilter implements GlobalFilter, Ordered
         {
             return chain.filter(exchange);
         }
+
         String token = getToken(request);
 
         if (StringUtils.isEmpty(token))
@@ -121,14 +123,11 @@ 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);
+            token = request.getHeaders().getFirst(TokenConstants.SESSIONID);
         }
-        if(StringUtils.isNotEmpty(token)){
+        // 如果前端设置了令牌前缀，则裁剪掉前缀``
-            request.getHeaders().set(TokenConstants.SESSIONID,token);
-        }
-        // 如果前端设置了令牌前缀，则裁剪掉前缀
         if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX))
         {
             token = token.replaceFirst(TokenConstants.PREFIX, StringUtils.EMPTY);

doctor-modules/doctor-health/pom.xml

@@ -19,6 +19,7 @@
 
     <dependencies>
 
+
         <!-- Oss上传  -->
         <dependency>
             <groupId>com.aliyun.oss</groupId>

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<List<InquiryRecordVo>> findInquiryRecordList() {
+        List<InquiryRecordVo> inquiryRecordList = inquiryVerifyService.findInquiryRecordList();
+        return HealthR.ok(inquiryRecordList);
+    }
+
+}

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);
     }
@@ -56,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));
-    }
-
 }

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<WalletVo> 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<List<DoctorIncomeRecordVo>> findDoctorIncomeRecordList(@RequestHeader Integer doctorId,
+                                                                          @RequestHeader String sessionId,
+                                                                          @RequestParam Integer page,
+                                                                          @RequestParam Integer count) {
+        List<DoctorIncomeRecordVo> doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count);
+        return HealthR.ok(doctorIncomeRecordEntities);
+    }
+
+    @GetMapping("/findDoctorById")
+    public HealthR<DoctorVo> findDoctorById(@RequestHeader Integer doctorId,
+                                            @RequestHeader String sessionId) {
+        return HealthR.ok(healthJobTitleService.findDoctorById(doctorId));
+    }
+
+    @GetMapping("/findDoctorNoticeReadNum")
+    public HealthR<List<NoticeReadNumVo>> findDoctorNoticeReadNum(@RequestHeader Integer doctorId,
+                                                                  @RequestHeader String sessionId) {
+        List<NoticeReadNumVo> healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId);
+        return HealthR.ok(healthR);
+    }
+
+}

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<List<SickCircleVo>> sickCircleList(@RequestParam Integer page,
+                                                      @RequestParam Integer count,
+                                                      @RequestParam Integer departmentId) {
+        List<SickCircleVo> sickCircleList = sickCircleService.findSickCircleList(page, count, departmentId);
+        return HealthR.ok(sickCircleList);
+    }
+}

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;

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<List<UserSickCircleVo>> findMySickCircleList(@RequestParam Integer page, @RequestParam Integer count){
+        startPage(page,count);
+        List<UserSickCircleVo> userFriendCircles = userSickCircleService.findMySickCircleList();
+        return HealthR.ok(userFriendCircles);
+    }
+
+}

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.*;
-import doctor.domain.entity.UserEntity;
-import doctor.domain.entity.UserInfoCollectionEntity;
-import doctor.domain.entity.UserWalletEntity;
 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,37 @@ public class UserVideoController {
     }
     //添加用户档案
     @PostMapping("/addUserArchives")
-    public HealthR addUserArchives(@RequestBody UserArchivesDto userArchivesDto){
+    public HealthR addUserArchives(@RequestBody  UserArchivesEntity userArchivesEntity, @RequestHeader Integer userId){
-        userVideoService.addUserArchives(userArchivesDto);
+        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<List<UserDoctorFollowVo>> findUserDoctorFollowList(@RequestParam Integer page,@RequestParam Integer count){
+        startPage(page,count);
+        List<UserDoctorFollowVo> userDoctorFollowVos = userVideoService.findUserDoctorFollowList();
+        return HealthR.ok(userDoctorFollowVos);
+    }
+    //用户任务列表
+    @GetMapping("/findUserTaskList")
+    public HealthR<List<UserTaskRecordVo>> findUserTaskList(){
+        List<UserTaskRecordVo> userTaskRecordVos = userVideoService.findUserTaskList();
+        return HealthR.ok(userTaskRecordVos);
+    }
+    //用户连续签到天数
+    @GetMapping("/findUserSign")
+    public HealthR<List<SignEntity>> findUserSign(@RequestHeader Integer userId){
+        List<SignEntity> signEntities = userVideoService.findUserSign(userId);
+        return HealthR.ok(signEntities);
+    }
+//    //根据用户ID查询用户信息
+//    @GetMapping("/getUserInfoById")
+//    public HealthR<>
 }

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;

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

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

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

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

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

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

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

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

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

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 String treatmentStartTime;
-    private Date treatmentEndTime;
+
+    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;
     }
 

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,21 +20,36 @@ 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 Integer height;
-    private String weight;
+    private Integer weight;
-    private String invitationCode;
+    private String  invitationCode;
     private Date updateTime;
-    private Long createTime;
+    private Date createTime;
 
 
 }

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

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

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

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;

doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorHistoryInquiryVo.java

@@ -0,0 +1,4 @@
+package doctor.domain.vo;
+
+public class DoctorHistoryInquiryVo {
+}

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

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

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

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

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

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

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

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,33 @@ import org.apache.catalina.User;
  */
 @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;
-    //邮箱
+
+    @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;
-    }
 }

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

doctor-modules/doctor-health/src/main/java/doctor/mapper/HealthJobTitleMapper.java

@@ -1,6 +1,9 @@
 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;
@@ -23,4 +26,10 @@ public interface HealthJobTitleMapper {
     List<String> findDoctorImgPic();
 
     void updDoctorImgPicBuyId(@Param("doctorId") Integer doctorId, @Param("s") String s);
+
+    DoctorWalletEntity findDoctorWalletById(Integer doctorId);
+
+    List<DoctorIncomeRecordEntity> findDoctorIncomeRecordList(Integer doctorId);
+
+    List<doctorSystemNoticeEntity> findDoctorNoticeReadNum(Integer doctorId);
 }

doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryVerifyServiceMapper.java

@@ -0,0 +1,4 @@
+package doctor.mapper;
+
+public interface InquiryVerifyServiceMapper {
+}

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<SickCircleEntity> findSickCircleList(Integer departmentId);
+
+}

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<UserSickCircleEntity> findUserSickCircleList();
+}

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,14 @@ public interface UserVideoMapper {
 
     List<UserArchivesEntity> findUserArchives(@Param("userId") Integer userId);
 
-    void addUserArchives(UserArchivesDto userArchivesDto);
+    void addUserArchives(UserArchivesEntity userArchivesEntity, @Param("userId") Integer userId);
+
+    void uploadUserArchivesImg(@Param("id") Integer id);
+
+
+    List<UserDoctorFollowEntity> findUserDoctorFollowList();
+
+    List<UserTaskRecordDto> findUserTaskList();
+
+    List<SignEntity> findUserSign(@Param("userId") Integer userId);
 }

doctor-modules/doctor-health/src/main/java/doctor/service/HealthJobTitleService.java

@@ -3,9 +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.*;
-import doctor.domain.vo.FindImagePicVo;
-import io.swagger.models.auth.In;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -22,4 +20,16 @@ public interface HealthJobTitleService {
     List<FindImagePicVo> findSystemImagePic();
 
     HealthR uploadImagePic(MultipartFile imagePic, Integer doctorId, String sessionId);
+
+    HealthR checkCode(String email, String code);
+
+    WalletVo findDoctorWallet(Integer doctorId);
+
+    List<DoctorIncomeRecordVo> findDoctorIncomeRecordList(Integer doctorId,Integer page, Integer count);
+
+    HealthR drawCash(Integer doctorId, Integer money);
+
+    HealthR<List<DoctorHistoryInquiryVo>> findHistoryInquiryRecord(Integer page, Integer size);
+
+    List<NoticeReadNumVo> findDoctorNoticeReadNum(Integer doctorId);
 }

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<InquiryRecordVo> findInquiryRecordList();
+
+}

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<SickCircleVo> findSickCircleList(Integer page, Integer size, Integer departmentId);
+
+}

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<UserSickCircleVo> findMySickCircleList();
+}

doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java

@@ -1,9 +1,7 @@
 package doctor.service;
 
 import doctor.domain.dto.UserArchivesDto;
-import doctor.domain.entity.UserAdoptCommentEntity;
+import doctor.domain.entity.*;
-import doctor.domain.entity.UserEntity;
-import doctor.domain.entity.UserWalletEntity;
 import doctor.domain.vo.*;
 
 import java.util.List;
@@ -39,5 +37,13 @@ public interface UserVideoService {
 
     List<UserArchivesVo> findUserArchives(Integer userId);
 
-    void addUserArchives(UserArchivesDto userArchivesDto);
+    void addUserArchives(UserArchivesEntity userArchivesEntity, Integer userId);
+
+    void uploadUserArchivesImg(Integer id);
+
+    List<UserDoctorFollowVo> findUserDoctorFollowList();
+
+    List<UserTaskRecordVo> findUserTaskList();
+
+    List<SignEntity> findUserSign(Integer userId);
 }

doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java

@@ -1,11 +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.vo.DoctorVo;
+import doctor.domain.entity.DoctorWalletEntity;
-import doctor.domain.vo.FindImagePicVo;
+import doctor.domain.entity.doctorSystemNoticeEntity;
+import doctor.domain.vo.*;
 import doctor.mapper.HealthJobTitleMapper;
 import doctor.service.HealthJobTitleService;
 import doctor.system.api.domain.Department;
@@ -15,7 +18,7 @@ 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 lombok.extern.log4j.Log4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -30,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
@@ -130,4 +133,70 @@ 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<DoctorIncomeRecordVo> findDoctorIncomeRecordList(Integer doctorId, Integer page, Integer count) {
+        List<DoctorIncomeRecordEntity> doctorIncomeRecordList = healthJobTitleMapper.findDoctorIncomeRecordList(doctorId);
+        ArrayList<DoctorIncomeRecordVo> 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;
+    }
+
+    @Override
+    public HealthR<List<DoctorHistoryInquiryVo>> findHistoryInquiryRecord(Integer page, Integer size) {
+        startPage(page,size);
+
+        return null;
+    }
+
+    @Override
+    public List<NoticeReadNumVo> findDoctorNoticeReadNum(Integer doctorId) {
+        List<doctorSystemNoticeEntity> doctorSystemNoticeEntities = healthJobTitleMapper.findDoctorNoticeReadNum(doctorId);
+        ArrayList<NoticeReadNumVo> noticeReadNumVos = new ArrayList<>();
+        for (doctorSystemNoticeEntity doctorSystemNoticeEntity : doctorSystemNoticeEntities) {
+            NoticeReadNumVo noticeReadNumVo = new NoticeReadNumVo();
+            noticeReadNumVo.setNotReadNum(doctorSystemNoticeEntity.getNum());
+            noticeReadNumVo.setNoticeType(doctorSystemNoticeEntity.getNoticeType());
+            noticeReadNumVos.add(noticeReadNumVo);
+        }
+        return noticeReadNumVos;
+    }
 }

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<InquiryRecordVo> findInquiryRecordList() {
+
+        return null;
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/service/impl/SickCircleServiceImpl.java

@@ -0,0 +1,33 @@
+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<SickCircleVo> findSickCircleList(Integer page, Integer size, Integer departmentId) {
+        List<SickCircleEntity> list = sickCircleMapper.findSickCircleList(departmentId);
+        ArrayList<SickCircleVo> sickCircleVos = new ArrayList<>();
+        for (SickCircleEntity sickCircleEntity : list) {
+            SickCircleVo sickCircleVo = new SickCircleVo();
+            sickCircleVo.setSickCircleId(sickCircleEntity.getId());
+            BeanUtils.copyProperties(sickCircleEntity,sickCircleVo);
+            sickCircleVos.add(sickCircleVo);
+        }
+        return sickCircleVos;
+    }
+}

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<UserSickCircleVo> findMySickCircleList() {
+        List<UserSickCircleEntity> userSickCircleEntityList=userSickCircleMapper.findUserSickCircleList();
+        List<UserSickCircleVo> userSickCircleVoList = ConvertUtil.entityToVoList(userSickCircleEntityList, UserSickCircleVo.class);
+        return userSickCircleVoList;
+    }
+}

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;
@@ -70,8 +71,33 @@ public class UserVideoServiceImpl implements UserVideoService {
     }
 
     @Override
-    public void addUserArchives(UserArchivesDto userArchivesDto) {
+    public void addUserArchives(UserArchivesEntity userArchivesEntity,Integer userId) {
-        userVideoMapper.addUserArchives(userArchivesDto);
+        userVideoMapper.addUserArchives(userArchivesEntity,userId);
+    }
+
+    @Override
+    public void uploadUserArchivesImg(Integer id) {
+        userVideoMapper.uploadUserArchivesImg(id);
+    }
+
+    @Override
+    public List<UserDoctorFollowVo> findUserDoctorFollowList() {
+        List<UserDoctorFollowEntity> userDoctorFollowEntityList=userVideoMapper.findUserDoctorFollowList();
+        List<UserDoctorFollowVo> userDoctorFollowVoList = ConvertUtil.entityToVoList(userDoctorFollowEntityList, UserDoctorFollowVo.class);
+        return userDoctorFollowVoList;
+    }
+
+    @Override
+    public List<UserTaskRecordVo> findUserTaskList() {
+        List<UserTaskRecordDto> userTaskRecordDtos=userVideoMapper.findUserTaskList();
+        List<UserTaskRecordVo> userTaskRecordVoList = ConvertUtil.entityToVoList(userTaskRecordDtos, UserTaskRecordVo.class);
+        return userTaskRecordVoList;
+    }
+
+    @Override
+    public List<SignEntity> findUserSign(Integer userId) {
+        List<SignEntity> userEntityList=userVideoMapper.findUserSign(userId);
+        return userEntityList;
     }
 
 

doctor-modules/doctor-health/src/main/resources/mapper/doctor/HealthJobTitleMapper.xml

@@ -28,4 +28,13 @@
     <select id="findDoctorImgPic" resultType="java.lang.String">
         select image_pic from doctor
     </select>
+    <select id="findDoctorWalletById" resultType="doctor.domain.entity.DoctorWalletEntity">
+        select * from doctor_wallet where doctor_id=#{doctorId}
+    </select>
+    <select id="findDoctorIncomeRecordList" resultType="doctor.domain.entity.DoctorIncomeRecordEntity">
+        select * from doctor_income_record where doctor_id=#{doctorId}
+    </select>
+    <select id="findDoctorNoticeReadNum" resultType="doctor.domain.entity.doctorSystemNoticeEntity">
+        SELECT COUNT(id) num,notice_type FROM doctor_system_notice where receive_doctor_id=#{doctorId} and status=2 GROUP BY notice_type
+    </select>
 </mapper>

doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryVerifyServiceMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="doctor.mapper.InquiryVerifyServiceMapper">
+
+
+</mapper>

doctor-modules/doctor-health/src/main/resources/mapper/doctor/SickCircleMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="doctor.mapper.SickCircleMapper">
+
+
+    <select id="findSickCircleList" resultType="doctor.domain.entity.SickCircleEntity">
+        SELECT * FROM sick_circle WHERE department_id = #{departmentId}
+    </select>
+</mapper>

doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserSickCircleMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="doctor.mapper.UserSickCircleMapper">
+
+    <select id="findUserSickCircleList" resultType="doctor.domain.entity.UserSickCircleEntity">
+        select *
+        from user_sick_circle
+    </select>
+</mapper>

doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml

@@ -30,6 +30,11 @@ create_time
                 now()
                );
     </insert>
+    <update id="uploadUserArchivesImg">
+        update user_archives
+        set picture = #{picture}
+        where id=#{id}
+    </update>
     <delete id="cancelVideoCollection">
         delete
         from user_video_collection
@@ -70,4 +75,16 @@ create_time
         select *
         from user_archives where user_id=#{userId}
     </select>
+    <select id="findUserDoctorFollowList" resultType="doctor.domain.entity.UserDoctorFollowEntity">
+        select *
+        from user_doctor_follow
+    </select>
+    <select id="findUserTaskList" resultType="doctor.domain.dto.UserTaskRecordDto">
+        SELECT user_task_record.*,task.task_name,task.task_type,task.reward FROM user_task_record LEFT JOIN task ON user_task_record.task_id=task.id
+    </select>
+    <select id="findUserSign" resultType="doctor.domain.entity.SignEntity">
+        select *
+        from sign where user_id=#{userId}
+    </select>
+
 </mapper>

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())

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

pom.xml

@@ -207,22 +207,6 @@
                 <version>${doctor.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.mapstruct</groupId>
-                <artifactId>mapstruct</artifactId>
-                <version>${mapstruct.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.mapstruct</groupId>
-                <artifactId>mapstruct-jdk8</artifactId>
-                <version>${mapstruct.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.mapstruct</groupId>
-                <artifactId>mapstruct-processor</artifactId>
-                <version>${mapstruct.version}</version>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>