1.21

# Conflicts:
#	doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java
#	doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java
#	doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml

doctor-api/doctor-api-system/src/main/java/doctor/system/api/RemoteDoctorService.java

@@ -1,6 +1,7 @@
 package doctor.system.api;
 
 import doctor.common.core.constant.ServiceNameConstants;
+import doctor.common.core.domain.HealthR;
 import doctor.common.core.domain.R;
 import doctor.system.api.factory.RemoteDoctorFallbackFactory;
 import doctor.system.api.model.LoginUser;
@@ -8,11 +9,11 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(contextId = "remoteDoctorService", value = ServiceNameConstants.FILE_DOCTOR, fallback = RemoteDoctorFallbackFactory.class)
+@FeignClient(contextId = "remoteDoctorService", value = ServiceNameConstants.FILE_DOCTOR, fallbackFactory = RemoteDoctorFallbackFactory.class)
 public interface RemoteDoctorService {
 
     @PostMapping("/doctor/getDoctor")
-  public   R<LoginUser> getDoctorInfo(@RequestParam("email") String email);
+    public R<LoginUser> getDoctorInfo(@RequestParam("email") String email);
 
     @PostMapping("/doctor/getUser")
     public R<LoginUser> getUser(@RequestParam("email") String email);

doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Doctor.java

@@ -1,10 +1,11 @@
 package doctor.system.api.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
-
+@Data
 public class Doctor {
     private Integer id;
     private Integer departmentId;
@@ -12,7 +13,7 @@ public class Doctor {
     private String userName;
     private Integer reviewStatus;
     private String phone;
-    private String password;
+    private String pwd;
     private String name;
     private String imagePic;
     private String jobTitle;
@@ -34,115 +35,4 @@ public class Doctor {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getDepartmentId() {
-        return departmentId;
-    }
-
-    public void setDepartmentId(Integer departmentId) {
-        this.departmentId = departmentId;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public Integer getReviewStatus() {
-        return reviewStatus;
-    }
-
-    public void setReviewStatus(Integer reviewStatus) {
-        this.reviewStatus = reviewStatus;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getImagePic() {
-        return imagePic;
-    }
-
-    public void setImagePic(String imagePic) {
-        this.imagePic = imagePic;
-    }
-
-    public String getJobTitle() {
-        return jobTitle;
-    }
-
-    public void setJobTitle(String jobTitle) {
-        this.jobTitle = jobTitle;
-    }
-
-    public String getInauguralHospital() {
-        return inauguralHospital;
-    }
-
-    public void setInauguralHospital(String inauguralHospital) {
-        this.inauguralHospital = inauguralHospital;
-    }
-
-    public String getPersonalProfile() {
-        return personalProfile;
-    }
-
-    public void setPersonalProfile(String personalProfile) {
-        this.personalProfile = personalProfile;
-    }
-
-    public String getGoodField() {
-        return goodField;
-    }
-
-    public void setGoodField(String goodField) {
-        this.goodField = goodField;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 }

doctor-api/doctor-api-system/src/main/java/doctor/system/api/factory/RemoteDoctorFallbackFactory.java

@@ -1,45 +1,34 @@
 package doctor.system.api.factory;
 
+import doctor.common.core.domain.HealthR;
 import doctor.common.core.domain.R;
 import doctor.system.api.RemoteDoctorService;
 import doctor.system.api.model.LoginUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 @Component
-public class RemoteDoctorFallbackFactory implements RemoteDoctorService {
+public class RemoteDoctorFallbackFactory implements FallbackFactory<RemoteDoctorService> {
 
     private static final Logger log = LoggerFactory.getLogger(RemoteDoctorFallbackFactory.class);
 
     @Override
-    public R<LoginUser> getDoctorInfo(String email) {
-        log.error("文件服务调用失败");
-        return R.fail("登录超时");
-    }
+    public RemoteDoctorService create(Throwable throwable)
+    {
+        log.error("文件服务调用失败:{}", throwable.getMessage());
+        return new RemoteDoctorService() {
+            @Override
+            public R<LoginUser> getDoctorInfo(String email) {
+                return R.fail("登录失败");
+            }
 
-    @Override
-    public R<LoginUser> getUser(String email) {
-        log.error("文件服务调用失败");
-        return R.fail("登录超时");
-    }
+            @Override
+            public R<LoginUser> getUser(String email) {
+                return R.fail("登录失败");
+            }
 
-//    @Override
-//    public RemoteDoctorService create(Throwable throwable)
-//    {
-//        log.error("文件服务调用失败:{}", throwable.getMessage());
-//        return new RemoteDoctorService() {
-//            @Override
-//            public R<LoginUser> getDoctorInfo(String email) {
-//                return R.fail("登录超时");
-//            }
-//
-//            @Override
-//            public R<LoginUser> getUser(String email) {
-//                return R.fail("登录失败");
-//            }
-//
-//
-//        };
-//    }
+        };
+    }
 }

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,12 +15,14 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/doctor/v1")
+@Api(tags = "登录")
 public class HealthDoctorController {
 
     @Autowired
     private HealthDoctorService healthDoctorService;
 
     @PostMapping("/login")
+    @ApiOperation("邮箱密码登录")
     public HealthR<?> login(@RequestParam String email, @RequestParam String pwd) {
         DoctorVo userInfo = healthDoctorService.login(email,pwd);
         if (userInfo!=null){

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/service/HealthDoctorService.java

@@ -3,7 +3,7 @@ package doctor.auth.service;
 import doctor.auth.util.RSAUtils;
 import doctor.auth.util.RsaKey;
 import doctor.auth.vo.DoctorVo;
-import doctor.auth.vo.UserVo;
+import doctor.common.core.domain.HealthR;
 import doctor.common.core.domain.R;
 import doctor.common.security.service.TokenService;
 import doctor.system.api.RemoteDoctorService;
@@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
-import java.util.UUID;
 
 @Component
 public class HealthDoctorService {
@@ -31,7 +30,10 @@ public class HealthDoctorService {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        if (s.equals(data.getSysUser().getPassword())){
+        if (data==null){
+            return null;
+        }
+        if (s.equals(data.getDoctor().getPwd())){
             Map<String, Object> token = tokenService.createToken(data);
             String accessToken = (String) token.get("access_token");
             doctorVo.setSessionId(accessToken);

doctor-auth/src/main/java/doctor/auth/service/HealthUserService.java

@@ -6,8 +6,6 @@ import doctor.auth.vo.UserVo;
 import doctor.common.core.domain.R;
 import doctor.common.security.service.TokenService;
 import doctor.system.api.RemoteDoctorService;
-import doctor.system.api.RemoteUserService;
-import doctor.system.api.factory.RemoteUserFallbackFactory;
 import doctor.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -32,6 +30,9 @@ public class HealthUserService {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
+        if (data==null){
+            return null;
+        }
         if (s.equals(data.getUser().getPwd())){
             Map<String, Object> token = tokenService.createToken(data);
             String accessToken = (String) token.get("access_token");
@@ -44,8 +45,8 @@ public class HealthUserService {
             doctorUserVo.setJiGuangPwd(s);
             doctorUserVo.setHeadPic(data.getUser().getHeadPic());
             doctorUserVo.setSex(data.getUser().getSex());
-            doctorUserVo.setHeight(Integer.valueOf(data.getUser().getHeight()));
-            doctorUserVo.setWeight(Integer.valueOf(data.getUser().getWeight()));
+            doctorUserVo.setHeight(data.getUser().getHeight());
+            doctorUserVo.setWeight(data.getUser().getWeight());
             doctorUserVo.setFaceFlag(1);
             UUID uuid = UUID.randomUUID();
             String inviteCode = uuid.toString().replaceAll("-", "").substring(0, 8);
@@ -55,5 +56,4 @@ public class HealthUserService {
         }
         return null;
     }
-
 }

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

@@ -113,6 +113,22 @@
             <artifactId>swagger-annotations</artifactId>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+        </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-common/doctor-common-security/src/main/java/doctor/common/security/utils/SecurityUtils.java

@@ -11,7 +11,7 @@ import doctor.system.api.model.LoginUser;
 
 /**
  * 权限获取工具类
- * 
+ *
  * @author ruoyi
  */
 public class SecurityUtils
@@ -63,6 +63,11 @@ public class SecurityUtils
     {
         // 从header获取token标识
         String token = request.getHeader(TokenConstants.AUTHENTICATION);
+        if (StringUtils.isEmpty(token))
+        {
+            // 从参数获取token
+            token = request.getHeader(TokenConstants.SESSIONID);
+        }
         return replaceTokenPrefix(token);
     }
 
@@ -81,7 +86,7 @@ public class SecurityUtils
 
     /**
      * 是否为管理员
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */

doctor-common/doctor-common-swagger/src/main/java/doctor/common/swagger/annotation/EnableCustomSwagger2.java

@@ -16,5 +16,4 @@ import doctor.common.swagger.config.SwaggerAutoConfiguration;
 @Import({ SwaggerAutoConfiguration.class })
 public @interface EnableCustomSwagger2
 {
-
 }

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

@@ -12,8 +12,51 @@
 
     <artifactId>doctor-health</artifactId>
 
+    <properties>
+        <lombok.version>1.18.12</lombok.version>
+        <mapstruct.version>1.4.2.Final</mapstruct.version>
+    </properties>
+
     <dependencies>
 
+        <!-- websocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.76</version>
+        </dependency>
+
+<!--        &lt;!&ndash; https://mvnrepository.com/artifact/com.alipay.sdk/alipay-sdk-java &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.alipay.sdk</groupId>-->
+<!--            <artifactId>alipay-sdk-java</artifactId>-->
+<!--            <version>4.13.50</version>-->
+<!--        </dependency>-->
+
+        <!--支付宝依赖 -->
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-easysdk</artifactId>
+            <version>2.2.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>4.38.149.ALL</version>
+        </dependency>
+
+        <!-- Oss上传  -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.10.2</version>
+        </dependency>
+
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -84,9 +127,62 @@
             <artifactId>doctor-api-system</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </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>
+
+
+        <!-- 其他依赖 ... -->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.4.0</version> <!-- 根据最新版本调整 -->
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.80</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>facebody20191230</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.4.1</version>
+        </dependency>
 
     </dependencies>
 
+
+
+
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
@@ -104,4 +200,5 @@
         </plugins>
     </build>
 
+
 </project>

doctor-modules/doctor-health/src/main/java/doctor/AliPayConfig.java

@@ -0,0 +1,23 @@
+package doctor;
+
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+@Component
+public class AliPayConfig {
+
+
+
+    @Bean
+    public AlipayClient initAlipayClient(AlipayConfigProperties alipayConfigProperties) {
+        return new
+                DefaultAlipayClient(
+                alipayConfigProperties.getGatewayUrl(),
+                alipayConfigProperties.getAppId(),
+                alipayConfigProperties.getMerchantPrivateKey(),
+                "json", alipayConfigProperties.getCharset(),
+                alipayConfigProperties.getAlipayPublicKey(),
+                alipayConfigProperties.getSignType());
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/AlipayConfigProperties.java

@@ -0,0 +1,62 @@
+package doctor;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@Data
+//@ConfigurationProperties(prefix = "pay.alipay")
+public class AlipayConfigProperties {
+
+
+    /**
+     * 应用ID,您的APPID，收款账号既是您的APPID对应支付宝账号
+     */
+    private String appId = "9021000132656203";
+
+    /**
+     * 商户私钥，您的PKCS8格式RSA2私钥
+     */
+    private String merchantPrivateKey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC7lh2ErwckK+mODTqBRWi78nlUR5a1OrCP5b+ImFjsB0EIkeOpSKiqGJv9omaRUfKxwoSqBc6c22KLszNdS6rKvcDrRObFRcLaOoMVT7CS0sSsq7ZATVy4WvouyudAOTNL6H4QOyj+YnyM6pU7Ja2jepAJwvDD9h/7c0fvASAtSteC0akuRq/r2SJ7ZRQpLWtrW4KBz+NneYHHP519sWtF2GSToN8brZJrDB9xI75N43+42L8MEuVsRK375wBv4jkwPtrB9mYQsuSMDXOsLbjuCHfxcTlFEUJ3c6SiZeIrDH9auW/lPJ+QZg91DYsZr7+HdijBej/CRT+rTmgzb7VpAgMBAAECggEASuCxB7WV9CpTIBDHubIrDFrNc4bf8ZdrwwTCX5Pwasa6fuE9LuWB7ePE4Ilix78eUTaEHhoTTymDPKBbcHIzypnT2BW4yCYAkXupt2gH45OeTg58wU4gJLasBuGXTVuHzlUPfQsgYeqOLPG2f9WaahcSR9M4qAAm5AgwPocEgQ8eRxC13xBX5r+ZRhKdnI+jLIpYggv52oIiPxz+LBUcTNHyrzOVgmn+jvEvYWQ784vNQxRYidBTO6nz89PcdfXFeH1/GdGTnodutj3C5ccodlEbOsgtZQ9o6+E7x6YDRE2oKhCZOZGE9xaNfQDSnWMv07jb/i0GoF3DsB8xVUbwwQKBgQD7BLtS6dQTCR41fO7RGWKvhGTKS6RKL5djfVlB/IYujscNUnC36Uf2ZYJnQh1wF+ztcSyZQUStxDFy4+U/M39P03Nz1yG1cejonegll8OzZ706lNE/uqXa/ruGvuztg1kuM+qWYYK57EuWJIuFdirr6ZQ6kmPSzyrlnqPaQEoeSwKBgQC/Tx/rBAjbSiceaon0UAO61/TypjvsI7lwypyjIIew3/Nwm8icaaw3GZUCX/9JH89rddioZMncucuuCp8cHBwvNj+BnrqRJc4VAUhJ0U06oNFoxfdrjeU9Pg+RMoZ4i/pHrnkDsLbvu/JYjjcGwJXDlBcDGJvv3yzJtUTsUhtamwKBgCrm3yFHp6BtQYWAycxhG1XGOfe9P+ISCjzN0rCNeV2Bt5GWUn+MVmlNZiFB0ogy/qKCYk37MsLEMnNhcfAAXDUHfccBsNgzFMyVGHU8YA1MoLHfd3f97ZTlTqW0AgiCF37nDqQPHGmscirCKjpwPNu/Oz9bf8Yq9Dj0iSqnLEPLAoGAdiIRDpm2MluO3mxhdbj3JKh4PGJEPGQu/aRPpzfOMn2IIPBBp7xlOL0WU5od1PTMq4ng2NMsB52/VWB/seb1zH2OJ6dxg3G52SSqk9KoAt0Nkso0J3k+plutVzbA7K1bRmpJlerIfC8tzls7RXMkx9mpgCLxH+VLDd9eiSOGeqMCgYB5TqHy94+lVMBf9T+8qsvmBBbOhoerqdUzV3EIqumEpT2xCgCwUzKtUIgiPljbze5hzyOJRI3xvOa5DqAiaxI/iyG1bYqogIBjkQcz+WR/CvpciqO9OL5oHz/YzTtdX/vhLdTkZ88O/CbzMhQyolkLfvE5dLmhKqj8mCDX13PZ7A==";
+
+    /**
+     * 支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。
+     */
+    private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhr8XuZtu7ytmPL907t0FeCppdF2+fHKn4nYBOV1eC6VlZh5TZ88Q8SAacj8FmkcWOyvAUwsF4ouQiuAxIGPLwklVVEwPc4xkdPMeiAStMqlHQreDdk33D4e9V6pkPmyNcA6ZTkUey1oaTB9lJ7S8oSbjiuMRwv8lxeSxjATjQsZoSryhl60oQj0qfEIjyttavWgpBiPRPLmwDOAIRAZC9Cm6gUnJFq3To3HyFnn81RzkowvvRp4rxZk28ZVPrBUM0TV8+Bn2m8MCeUVS1xt/dOrU2cUAru1iGKqJckiX1w+NV07euwDP1ekmze14i3oN0ZY5W/ZiAAcdF+eboPBouQIDAQAB";
+    /**
+     * 服务器异步通知页面路径  需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问
+     */
+    private String notifyUrl="http://localhost:7000/wallet/recharge/success";
+
+    /**\
+     * 页面跳转同步通知页面路径 需http://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问
+     */
+    private String returnUrl ="http://localhost:7000/wallet/recharge/success";
+
+    /**
+     * 签名方式
+     */
+    private String signType = "RSA2";
+
+    /**
+     * / 字符编码格式
+     */
+    private String charset ="utf-8";
+
+    /**
+     * / 支付宝网关
+     */
+    private String gatewayUrl = "https://openapi-sandbox.dl.alipaydev.com/gateway.do";
+
+
+}
+/* *
+ *类名：AlipayConfig
+ *功能：基础配置类
+ *详细：设置户有关信息及返回路径
+ *修改日期：2017-04-05
+ *说明：
+ *以下代码只是为了方便商户测试而提供的样例代码，商户可以根据自己网站的需要，按照技术文档编写,并非一定要使用该代码。
+ *该代码仅供学习和研究支付宝接口使用，只是提供一个参考。
+ */

doctor-modules/doctor-health/src/main/java/doctor/DoctorHealthApplication.java

@@ -3,8 +3,10 @@ package doctor;
 import doctor.common.security.annotation.EnableCustomConfig;
 import doctor.common.security.annotation.EnableRyFeignClients;
 import doctor.common.swagger.annotation.EnableCustomSwagger2;
+//import doctor.text.WebSocketServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
 
 @EnableCustomConfig
 @EnableCustomSwagger2
@@ -13,7 +15,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class DoctorHealthApplication {
     public static void main(String[] args)
     {
-        SpringApplication.run(DoctorHealthApplication.class, args);
+        ConfigurableApplicationContext applicationContext = SpringApplication.run(DoctorHealthApplication.class, args);
+//        WebSocketServer.setUserService(applicationContext);
         System.out.println("(♥◠‿◠)ﾉﾞ  健康服务启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
                 " |  _ _   \\      \\   \\   /  /    \n" +

doctor-modules/doctor-health/src/main/java/doctor/config/WebSocketConfig.java

@@ -0,0 +1,16 @@
+package doctor.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+// 配置开启WebSocket
+@Configuration
+public class WebSocketConfig {
+
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
+
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/CollectSickController.java

@@ -0,0 +1,362 @@
+package doctor.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.api.model.v2.Result;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import doctor.common.core.domain.HealthR;
+import doctor.domain.entity.SickCircleEntity;
+import doctor.service.CollectSickService;
+
+import doctor.util.HttpUtils;
+import doctor.util.OssUtil;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.http.HttpResponse;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.MessageDigest;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ClassName CollectSickController
+ * @Description 描述
+ * @Author 栗永斌
+ */
+@RestController
+@RequestMapping("/user/verify/v1")
+public class CollectSickController {
+    @Autowired
+    CollectSickService service;
+
+    /**
+     * 取消收藏病友圈
+     *
+     * @param sickCircleId
+     * @return
+     */
+    @DeleteMapping("/cancelSickCollection")
+    public HealthR<SickCircleEntity> cancelSickCollection(@RequestParam("sickCircleId") Integer sickCircleId) {
+        return service.cancelSickCollection(sickCircleId);
+    }
+
+    /**
+     * * @param sickCircleId
+     * 收藏病友圈
+     */
+    @PostMapping("/addUserSickCollection")
+    public HealthR<SickCircleEntity> addUserSickCollection(@RequestParam("sickCircleId") Integer sickCircleId) {
+        return service.addUserSickCollection(sickCircleId);
+    }
+
+    //-----------------------------------------------------------------------------------------------------------------------------------------
+
+
+    //-----------------------------------------------------------------------------------------------------------------------------------------
+    /**
+     *  orc身份证识别
+     * @param file
+     */
+    @PostMapping("/files")
+    public void file(MultipartFile file) {
+
+        String s = OssUtil.uploadMultipartFile(file);
+
+        String host = "https://cardnumber.market.alicloudapi.com";
+        String path = "/rest/160601/ocr/ocr_idcard.json";
+        String appcode = "94e0f9d0960f4931ad24eabfa187dcfe";
+        //String imgFile = "C:\\Users\\栗永斌\\Desktop\\aaaa.webp";
+        String imgFile = String.valueOf(s);
+        String method = "POST";
+
+        Map<String, String> headers = new HashMap<String, String>();
+        //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
+        headers.put("Authorization", "APPCODE " + appcode);
+        //根据API的要求，定义相对应的Content-Type
+        headers.put("Content-Type", "application/json; charset=UTF-8");
+
+        Map<String, String> querys = new HashMap<String, String>();
+        // 对图像进行base64编码
+        String imgBase64 = img_base64(imgFile);
+
+        //configure配置
+        JSONObject configObj = new JSONObject();
+        configObj.put("side", "face");
+
+        String config_str = configObj.toString();
+
+        // 拼装请求body的json字符串
+        JSONObject requestObj = new JSONObject();
+        requestObj.put("image", imgBase64);
+        if (configObj.size() > 0) {
+            requestObj.put("configure", config_str);
+        }
+        String bodys = requestObj.toString();
+
+        try {
+            /**
+             * 重要提示如下:
+             * HttpUtils请从
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java
+             * 下载
+             * 相应的依赖请参照
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
+             */
+            HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
+            int stat = response.getStatusLine().getStatusCode();
+            if (stat != 200) {
+                System.out.println("Http code: " + stat);
+                System.out.println("http header error msg: " + response.getFirstHeader("X-Ca-Error-Message"));
+                System.out.println("Http body error msg:" + EntityUtils.toString(response.getEntity()));
+                return;
+            }
+
+            String res = EntityUtils.toString(response.getEntity());
+            JSONObject res_obj = JSON.parseObject(res);
+
+            System.out.println(res_obj.toJSONString());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public static String img_base64(String path) {
+        /**
+         *  对path进行判断，如果是本地文件就二进制读取并base64编码，如果是url,则返回
+         */
+        String imgBase64 = "";
+        if (path.startsWith("http")) {
+            imgBase64 = path;
+        } else {
+            try {
+                File file = new File(path);
+                byte[] content = new byte[(int) file.length()];
+                FileInputStream finputstream = new FileInputStream(file);
+                finputstream.read(content);
+                finputstream.close();
+                imgBase64 = new String(Base64.encodeBase64(content));
+            } catch (IOException e) {
+                e.printStackTrace();
+                return imgBase64;
+            }
+        }
+        return imgBase64;
+    }
+
+
+
+    private static final String AES_KEY = "1234567890123456";
+
+    @PostMapping("file")
+    public HealthR<String> hao(@RequestParam("file") String hao){
+//        // 验证主机号长度
+//        if (hao.length() != 32) {
+//            HealthR.fail("主机号长度不合法，操作失败！");
+//        }
+//        // AES加密
+//        String encryptedHostNumber = encryptAES(hao, AES_KEY);
+//        // Base64编码
+//        String base64Encoded = java.util.Base64.getEncoder().encodeToString(encryptedHostNumber.getBytes(StandardCharsets.UTF_8));
+//        // MD5加密
+//        String md5Hash = generateMD5Hash(base64Encoded);
+
+        String s = OssUtil.uploadFile(hao);
+// 生成二维码（这里省略生成二维码的步骤）
+        try {
+            // 二维码内容
+            String qrCodeData =s;
+
+            // 设置二维码的宽度和高度
+            int width = 300;
+            int height = 300;
+
+            // 设置二维码图片保存路径
+            String filePath = "C:\\Users\\栗永斌\\Desktop\\二维码.png";//自己的
+
+
+            String endpoint="oss-cn-shanghai.aliyuncs.com";//自己的
+            String accessKeyId="LTAI5tLE4XbyvvbuT7D2stCk";//自己的
+            String accessKeySecret="W7ZeT4dMrMPP0c8BBwcyIPnhe3P4E8";//自己的
+            OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
+
+            try {
+                File file = new File(filePath);
+                String objectName = "身份证"; // OSS 对象名称
+
+                String bucketName="lyb1314";
+                // 上传文件
+                ossClient.putObject(bucketName, objectName, file);
+
+                System.out.println("文件上传成功！");
+
+                // 如果需要获取上传后的文件 URL，可以使用以下代码
+                String fileUrl = "https://" + bucketName + "." + endpoint + "/" + objectName;
+                System.out.println("文件访问地址：" + fileUrl);
+            } finally {
+                // 关闭 OSS 客户端
+                ossClient.shutdown();
+            }
+
+            //   存储到数据库
+//            saveToDatabase(hao, md5Hash,filePath);
+//            System.out.println("操作成功！生成的序列号为：" + md5Hash);
+
+            // 设置二维码图片格式
+            String fileType = "png";
+
+            // 创建 BitMatrix 对象
+            BitMatrix bitMatrix = new QRCodeWriter().encode(qrCodeData, BarcodeFormat.QR_CODE, width, height);
+
+            // 将 BitMatrix 转换为 BufferedImage
+            Path path = Paths.get(filePath);
+            CollectSickController.MatrixToImageWriter.writeToPath(bitMatrix, fileType, path);
+
+
+        } catch (WriterException e) {
+            throw new RuntimeException("生成二维码失败", e);
+        }
+
+        return  null;
+
+    }
+
+
+
+    public static class MatrixToImageWriter {
+        private static final int BLACK = 0xFF000000;
+        private static final int WHITE = 0xFFFFFFFF;
+
+        private MatrixToImageWriter() {}
+
+        public static void writeToPath(BitMatrix matrix, String format, Path path) {
+            try {
+                CollectSickController.MatrixToImageWriter.MatrixToImageConfig config = new CollectSickController.MatrixToImageWriter.MatrixToImageConfig(BLACK, WHITE);
+                CollectSickController.MatrixToImageWriter.writeToPath(matrix, format, path, config);
+            } catch (Exception e) {
+                throw new RuntimeException("写入二维码图片失败", e);
+            }
+        }
+
+        public static void writeToPath(BitMatrix matrix, String format, Path path, CollectSickController.MatrixToImageWriter.MatrixToImageConfig config) {
+            try {
+                BufferedImage image = toBufferedImage(matrix, config);
+                if (!ImageIO.write(image, format, path.toFile())) {
+                    throw new RuntimeException("写入二维码图片失败");
+                }
+            } catch (IOException e) {
+                throw new RuntimeException("写入二维码图片失败", e);
+            }
+        }
+
+        private static BufferedImage toBufferedImage(BitMatrix matrix, CollectSickController.MatrixToImageWriter.MatrixToImageConfig config) {
+            int width = matrix.getWidth();
+            int height = matrix.getHeight();
+            BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+            for (int x = 0; x < width; x++) {
+                for (int y = 0; y < height; y++) {
+                    image.setRGB(x, y, matrix.get(x, y) ? config.getPixelOnColor() : config.getPixelOffColor());
+                }
+            }
+            return image;
+        }
+
+        public static class MatrixToImageConfig {
+            private final int onColor;
+            private final int offColor;
+
+            public MatrixToImageConfig(int onColor, int offColor) {
+                this.onColor = onColor;
+                this.offColor = offColor;
+            }
+
+            public int getPixelOnColor() {
+                return onColor;
+            }
+
+            public int getPixelOffColor() {
+                return offColor;
+            }
+        }
+    }
+
+    private static void saveToDatabase(String hostNumber, String serialNumber,String filePath) {
+        try {
+            // 假设你有一个数据库连接，并且有一个表用于存储主机号和序列号
+            String jdbcUrl = "jdbc:mysql://101.34.77.101:3306/dome1";
+            String username = "root";
+            String password = "cbx@123";
+
+            Connection connection = DriverManager.getConnection(jdbcUrl, username, password);
+
+            // 插入数据
+            String sql = "INSERT INTO `dome1`.`t_list` ( `host_number`, `serial_number`,`img`) VALUES (?, ?,?)";
+
+
+            try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
+                preparedStatement.setString(1, hostNumber);
+                preparedStatement.setString(2, serialNumber);
+                preparedStatement.setString(3, filePath);
+                preparedStatement.executeUpdate();
+
+            }
+
+            connection.close();
+        } catch (Exception e) {
+            throw new RuntimeException("存储到数据库失败", e);
+        }
+    }
+
+
+    private static String encryptAES(String input, String key) {
+        try {
+            Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+            SecretKeySpec secretKey = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES");
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+            return new String(cipher.doFinal(input.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            throw new RuntimeException("AES加密失败", e);
+        }
+    }
+
+    private static String generateMD5Hash(String input) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            byte[] hashBytes = md.digest(input.getBytes(StandardCharsets.UTF_8));
+            StringBuilder hexString = new StringBuilder();
+            for (byte b : hashBytes) {
+                String hex = Integer.toHexString(0xFF & b);
+                if (hex.length() == 1) {
+                    hexString.append('0');
+                }
+                hexString.append(hex);
+            }
+            return hexString.toString();
+        } catch (Exception e) {
+            throw new RuntimeException("MD5加密失败", e);
+        }
+    }
+
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java

@@ -1,30 +0,0 @@
-package doctor.controller;
-
-import doctor.common.core.domain.HealthR;
-import doctor.common.core.domain.R;
-import doctor.domain.entity.Department;
-import doctor.service.DepartmentService;
-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;
-
-/**
- * @BelongsProject: Medical_Treatment
- * @BelongsPackage: doctor.controller
- * @Author: jpz
- * @CreateTime: 2024/1/10 16:49
- */
-@RestController
-@RequestMapping("/share/knowledgeBase/v1")
-public class DepartmentController {
-    @Autowired
-    private DepartmentService departmentService;
-    @GetMapping("/findDepartment")
-    public HealthR<List<Department>> findDepartment(){
-        List<Department> list=departmentService.findDepartment();
-        return HealthR.ok(list);
-    }
-}

doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java

@@ -1,33 +0,0 @@
-package doctor.controller;
-
-import doctor.common.core.domain.HealthR;
-import doctor.common.core.domain.R;
-import doctor.domain.entity.DiseaseCategory;
-import doctor.service.DiseaseCategoryService;
-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 javax.xml.transform.Result;
-import java.util.List;
-
-/**
- * @BelongsProject: Medical_Treatment
- * @BelongsPackage: doctor.controller
- * @Author: jpz
- * @CreateTime: 2024/1/10 17:16
- */
-@RestController
-@RequestMapping("/share/knowledgeBase/v1")
-public class DiseaseCategoryController {
-    @Autowired
-    private DiseaseCategoryService diseaseCategoryService;
-
-    @GetMapping("/findDiseaseCategory")
-    public HealthR<List<DiseaseCategory>> findDiseaseCategory(@RequestParam Integer departmentId){
-        List<DiseaseCategory> list=diseaseCategoryService.findDiseaseCategory(departmentId);
-        return HealthR.ok(list);
-    }
-}

doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java

@@ -4,7 +4,9 @@ package doctor.controller;
 import doctor.common.core.domain.HealthR;
 import doctor.common.core.domain.R;
 import doctor.domain.entity.*;
+import doctor.service.DiseaseCategoryService;
 import doctor.service.DiseaseKnowledgeService;
+import doctor.service.HealthJobTitleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -26,6 +28,15 @@ import static doctor.common.core.utils.PageUtils.startPage;
 public class DiseaseKnowledgeController {
     @Autowired
     private DiseaseKnowledgeService diseaseKnowledgeService;
+    @Autowired
+    private DiseaseCategoryService diseaseCategoryService;
+
+    @GetMapping("/findDepartment")
+    public HealthR<List<Department>> findDepartment(){
+        List<Department> departments= diseaseKnowledgeService.findDepartment();
+        return HealthR.ok(departments);
+    }
+
     //罕见病症详情
     @GetMapping("/findDiseaseKnowledge")
     public HealthR<List<DiseaseKnowledge>> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){
@@ -45,19 +56,23 @@ public class DiseaseKnowledgeController {
         List<DrugsCategory> list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId);
         return HealthR.ok(list);
     }
+
     @GetMapping("/findDrugsKnowledge")
     public HealthR <DrugsKnowledge> findDrugsKnowledge(@RequestParam Integer id){
         DrugsKnowledge list=diseaseKnowledgeService.findDrugsKnowledge(id);
         return HealthR.ok(list);
     }
+
     @GetMapping("/popularSearch")
     public HealthR<List<PopularSearchEntity>> popularSeach(){
         List<PopularSearchEntity> list=diseaseKnowledgeService.popularSeach();
         return HealthR.ok(list);
     }
-
-
-
+    @GetMapping("/findDiseaseCategory")
+    public HealthR<List<DiseaseCategory>> findDiseaseCategory(@RequestParam Integer departmentId){
+        List<DiseaseCategory> list=diseaseCategoryService.findDiseaseCategory(departmentId);
+        return HealthR.ok(list);
+    }
 
 
 

doctor-modules/doctor-health/src/main/java/doctor/controller/DoctorController.java

@@ -2,6 +2,7 @@ package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
 import doctor.domain.entity.DoctorEntity;
+import doctor.domain.vo.DoctorVo;
 import doctor.service.DoctorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.print.Doc;
 import java.util.List;
 
+import static com.github.pagehelper.page.PageMethod.startPage;
+
 /**
  * @BelongsProject: Medical_Treatment
  * @BelongsPackage: doctor.controller
@@ -24,13 +27,14 @@ public class DoctorController {
     @Autowired
     private DoctorService doctorService;
     @GetMapping("/findDoctorList")
-    public HealthR<List<DoctorEntity>> findDoctorList(@RequestParam Integer deptId,
-                                                      @RequestParam Integer condition,
-                                                      @RequestParam Integer sortBy,
-                                                      @RequestParam(value = "page",defaultValue = "1") Integer page,
-                                                      @RequestParam(value = "count",defaultValue = "5") Integer count
+    public HealthR<List<DoctorVo>> findDoctorList(@RequestParam Integer deptId,
+                                                  @RequestParam Integer condition,
+                                                  @RequestParam Integer sortBy,
+                                                  @RequestParam(value = "page",defaultValue = "1") Integer page,
+                                                  @RequestParam(value = "count",defaultValue = "5") Integer count
     ){
-        List<DoctorEntity> list=doctorService.findDoctorList(deptId);
+        startPage(page,count);
+        List<DoctorVo> list=doctorService.findDoctorList(deptId,condition,sortBy);
         return HealthR.ok(list);
     }
 }

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java

@@ -0,0 +1,62 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.entity.*;
+import doctor.service.DepartmentService;
+import doctor.service.DiseaseCategoryService;
+import doctor.service.DiseaseKnowledgeService;
+import doctor.service.HealthDepartmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static com.github.pagehelper.page.PageMethod.startPage;
+
+@RestController
+@RequestMapping("/knowledgeBase/v1")
+public class HealthDepartmentController {
+
+    @Autowired
+    private HealthDepartmentService healthV1Service;
+    @Autowired
+    private DiseaseCategoryService diseaseCategoryService;
+
+    @Autowired
+    private DiseaseKnowledgeService diseaseKnowledgeService;
+    //罕见病症详情
+    @GetMapping("/findDiseaseKnowledge")
+    public HealthR<List<DiseaseKnowledge>> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){
+        return HealthR.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId));
+    }
+
+    @GetMapping("/findDrugsCategoryList")
+    public HealthR<List<DrugsCategory>> findDrugsCategoryList(){
+        return HealthR.ok(diseaseKnowledgeService.findDrugsCategoryList());
+    }
+    @GetMapping("/findDrugsKnowledgeList")
+    public HealthR<List<DrugsCategory>> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId,
+                                                               @RequestParam(value = "page",defaultValue = "1") Integer page,
+                                                               @RequestParam(value = "count",defaultValue = "5") Integer count){
+
+        startPage(page,count);
+        List<DrugsCategory> list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId);
+        return HealthR.ok(list);
+    }
+
+
+    @GetMapping("/findDiseaseCategory")
+    public HealthR<List<DiseaseCategory>> findDiseaseCategory(@RequestParam Integer departmentId){
+        List<DiseaseCategory> list=diseaseCategoryService.findDiseaseCategory(departmentId);
+        return HealthR.ok(list);
+    }
+
+    @GetMapping("/findDepartment")
+    public HealthR<List<DepartmentEntity>> findDepartment(){
+        List<DepartmentEntity> departmentEntities=healthV1Service.findDepartment();
+        return HealthR.ok(departmentEntities);
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthInquiryVerifyController.java

@@ -0,0 +1,35 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.HistoryInquiryRecordVo;
+import doctor.domain.vo.InquiryRecordVo;
+import doctor.service.InquiryVerifyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/inquiry/verify/v1")
+public class HealthInquiryVerifyController {
+
+    @Autowired
+    private InquiryVerifyService inquiryVerifyService;
+
+    @GetMapping("/findInquiryRecordList")
+    public HealthR<List<InquiryRecordVo>> findInquiryRecordList(@RequestParam Integer page,
+                                                                @RequestParam Integer count,
+                                                                @RequestParam Integer recordId) {
+        List<InquiryRecordVo> inquiryRecordList = inquiryVerifyService.findInquiryRecordList();
+        return HealthR.ok(inquiryRecordList);
+    }
+
+    @GetMapping("/findHistoryInquiryRecord")
+    public HealthR<List<HistoryInquiryRecordVo>> findHistoryInquiryRecord(@RequestParam Integer page,
+                                                                          @RequestParam Integer count,
+                                                                          @RequestHeader Integer userId) {
+        List<HistoryInquiryRecordVo> inquiryRecordList = inquiryVerifyService.findHistoryInquiryRecord(page,count,userId);
+        return HealthR.ok(inquiryRecordList);
+    }
+
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java

@@ -0,0 +1,53 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.dto.ApplyJoinDto;
+import doctor.domain.entity.Banners;
+import doctor.domain.entity.DoctorJobTitleEntity;
+import doctor.domain.vo.DoctorVo;
+import doctor.domain.vo.FindImagePicVo;
+import doctor.service.BannersService;
+import doctor.service.HealthJobTitleService;
+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
+@RequestMapping("/v1")
+public class HealthJobTitleController {
+    @Autowired
+    private HealthJobTitleService healthJobTitleService;
+
+
+    @GetMapping("/findJobTitleList")
+    public HealthR<List<DoctorJobTitleEntity>> findJobTitleList() {
+        List<DoctorJobTitleEntity> doctorJobTitleEntities=healthJobTitleService.findJobTitleList();
+        return HealthR.ok(doctorJobTitleEntities);
+    }
+
+    @RequestMapping("/sendEmailCode")
+    public HealthR sendEmailCode(@RequestParam("email") String email) {
+        HealthR healthR= healthJobTitleService.sendEmailCode(email);
+        return HealthR.ok(healthR);
+    }
+
+    @PostMapping("/applyJoin")
+    public HealthR applyJoin(@RequestBody @Valid ApplyJoinDto applyJoinDto) {
+        HealthR healthR= healthJobTitleService.applyJoin(applyJoinDto);
+        return HealthR.ok(healthR);
+    }
+    @GetMapping("/findSystemImagePic")
+    public HealthR<List<FindImagePicVo>> findSystemImagePic() {
+        return HealthR.ok(healthJobTitleService.findSystemImagePic());
+    }
+
+    @PutMapping("/checkCode")
+    public HealthR checkCode(@RequestParam("email") String email,
+                             @RequestParam("code") String code) {
+        return HealthR.ok(healthJobTitleService.checkCode(email, code));
+    }
+
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthLoginController.java

@@ -1,6 +1,7 @@
 package doctor.controller;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import doctor.common.core.domain.HealthR;
 import doctor.common.core.domain.R;
 import doctor.system.api.domain.Doctor;
 import doctor.service.DoctorUserService;
@@ -12,7 +13,6 @@ import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/doctor")
-@DS("master")
 public class HealthLoginController {
 
     @Autowired

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthRVerifyController.java

@@ -0,0 +1,92 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.*;
+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;
+
+    @PostMapping("/chooseImagePic")
+    public HealthR chooseImagePic(@RequestParam String imagePic,
+                                                         @RequestHeader Integer doctorId) {
+        healthJobTitleService.upImagePicByDoctorId(imagePic,doctorId);
+        return HealthR.ok();
+    }
+
+    @GetMapping("/findDoctorSystemNoticeList")
+    public HealthR<List<DoctorSystemNoticeListVo>> findDoctorSystemNoticeList(
+            @RequestParam Integer page,@RequestParam Integer count) {
+        List<DoctorSystemNoticeListVo> list = healthJobTitleService.findDoctorSystemNoticeList(page,count);
+        return HealthR.ok(list);
+    }
+    @GetMapping("/findDoctorInquiryNoticeList")
+    public HealthR<List<DoctorSystemNoticeListVo>> findDoctorInquiryNoticeList(
+            @RequestParam Integer page,@RequestParam Integer count) {
+        List<DoctorSystemNoticeListVo> list = healthJobTitleService.findDoctorSystemNoticeList(page,count);
+        return HealthR.ok(list);
+    }
+    @GetMapping("/findDoctorHealthyCurrencyNoticeList")
+    public HealthR<List<DoctorSystemNoticeListVo>> findDoctorHealthyCurrencyNoticeList(
+            @RequestParam Integer page,@RequestParam Integer count) {
+        List<DoctorSystemNoticeListVo> list = healthJobTitleService.findDoctorSystemNoticeList(page,count);
+        return HealthR.ok(list);
+    }
+
+
+
+    @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);
+    }
+
+    @GetMapping("/findMyAdoptedCommentList")
+    public HealthR<List<MyAdoptedCommentListVo>> findMyAdoptedCommentList(@RequestHeader Integer doctorId,
+                                                                          @RequestHeader String sessionId,
+                                                                          @RequestParam Integer page,
+                                                                          @RequestParam Integer count) {
+        List<MyAdoptedCommentListVo> healthR = healthJobTitleService.findMyAdoptedCommentList(doctorId,page,count);
+        return HealthR.ok(healthR);
+    }
+
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/HealthShareController.java

@@ -1,7 +1,6 @@
 package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
-import doctor.common.core.domain.R;
 import doctor.domain.entity.Banners;
 import doctor.service.BannersService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,19 +10,13 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-/**
- * @BelongsProject: Medical_Treatment
- * @BelongsPackage: doctor.controller
- * @Author: jpz
- * @CreateTime: 2024/1/10 15:54
- */
 @RestController
-@RequestMapping("/share/v1")
+@RequestMapping("/share")
+public class HealthShareController {
 
-public class BannersController {
     @Autowired
     private BannersService bannersService;
-    @GetMapping("/bannersShow")
+    @GetMapping("/v1/bannersShow")
     public HealthR<List<Banners>> bannersShow(){
         List<Banners> banners = bannersService.bannersShow();
         return HealthR.ok(banners);

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;
@@ -26,10 +25,15 @@ public class HealthUserVideoController{
     }
 
     @GetMapping("/findVideoVoList")
-    public HealthR<List<VideoVo>> findVideoVoList(@RequestParam Integer categoryId,@RequestParam Integer page,@RequestParam Integer count){
+    public HealthR<List<VideoVo>> findVideoVoList(@RequestParam Integer categoryId,
+                                                  @RequestParam Integer page,
+                                                  @RequestParam Integer count,
+                                                  @RequestHeader Integer userId,
+                                                  @RequestHeader String sessionId){
         startPage(page,count);
-        List<VideoVo> List = healthUserVideoService.findVideoVoList(categoryId);
+        List<VideoVo> List = healthUserVideoService.findVideoVoList(categoryId,userId);
         return HealthR.ok(List);
     }
 
+
 }

doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java

@@ -19,7 +19,6 @@ import static com.github.pagehelper.page.PageMethod.startPage;
  */
 @RestController
 @RequestMapping("/share/information/v1")
-
 public class InformationController {
     @Autowired
     private InformationService informationService;

doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java

@@ -0,0 +1,77 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.DoctorVo;
+import doctor.domain.vo.InquiryDetailsRecordVo;
+import doctor.service.InquiryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static com.github.pagehelper.page.PageMethod.startPage;
+
+/**
+ * @ClassName : InquiryController
+ * @Description : 问诊
+ * @Author : FJJ
+ * @Date: 2024-01-12 19:09
+ */
+@RestController
+@RequestMapping("/user/inquiry")
+public class InquiryController {
+    @Autowired
+    private InquiryService inquiryService;
+    //历史问诊记录列表
+    @GetMapping("/verify/v1/findHistoryInquiryRecord")
+    public HealthR<List<InquiryDetailsRecordVo>> findHistoryInquiryRecord(@RequestParam Integer page,@RequestParam Integer count){
+        startPage(page,count);
+        List<InquiryDetailsRecordVo> inquiryDetailsRecordVoList = inquiryService.findHistoryInquiryRecord();
+        return HealthR.ok(inquiryDetailsRecordVoList);
+    }
+
+    @GetMapping("/v1/findDoctorInfo")
+    public HealthR<DoctorVo> findDoctorInfo(@RequestHeader Integer userId,
+                                            @RequestHeader String sessionId,
+                                            @RequestParam(value = "doctorId",defaultValue = "2") Integer doctorId) {
+        DoctorVo doctorVo = inquiryService.findDoctorInfo(doctorId);
+        return HealthR.ok(doctorVo);
+    }
+
+    //咨询医生
+    @PutMapping("/verify/v1/consultDoctor")
+    public HealthR consultDoctor(@RequestHeader Integer userId,
+                                                  @RequestHeader String sessionId,
+                                                  @RequestParam Integer doctorId){
+        String doctorUserName = inquiryService.consultDoctor(userId,doctorId);
+        return HealthR.ok(doctorUserName);
+    }
+
+    //关注医生
+    @PostMapping("/verify/v1/followDoctor")
+    public HealthR followDoctor(@RequestHeader Integer userId,
+                                @RequestHeader String sessionId,
+                                @RequestParam Integer doctorId) {
+        inquiryService.followDoctor(userId,doctorId);
+        return HealthR.ok();
+    }
+
+    //取消关注医生
+   @DeleteMapping("/verify/v1/cancelFollow")
+    public HealthR cancelFollow(@RequestHeader Integer userId,
+                                @RequestHeader String sessionId,
+                                @RequestParam Integer doctorId){
+        inquiryService.cancelFollow(userId,doctorId);
+        return HealthR.ok();
+   }
+
+   //结束问诊
+   @PutMapping("/verify/v1/endInquiry")
+    public HealthR endInquiry(@RequestHeader Integer userId,
+                                        @RequestHeader String sessionId,
+                                        @RequestParam Integer recordId) {
+        inquiryService.endInquiry(userId,recordId);
+        return HealthR.ok();
+   }
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java

@@ -0,0 +1,125 @@
+package doctor.controller;
+
+import com.alibaba.nacos.api.model.v2.Result;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import doctor.common.core.domain.HealthR;
+import doctor.domain.entity.SickCircleEntity;
+import doctor.domain.entity.SickCommentEntity;
+import doctor.domain.entity.SymptomEntity;
+import doctor.domain.vo.SearchSickCircleVo;
+import doctor.domain.vo.SickCircleVo;
+import doctor.domain.vo.SickCommentVo;
+import doctor.domain.vo.SickInfoVo;
+import doctor.service.PatientService;
+import doctor.service.SickCircleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @ClassName PatientController
+ * @Description 描述
+ * @Author 栗永斌
+ */
+@RestController
+@RequestMapping("/user/sickCircle/v1/")
+public class PatientController {
+
+    @Autowired
+    private PatientService patientService;
+
+    @Autowired
+    private SickCircleService sickCircleService;
+
+    /**
+     * 发表评论
+     */
+    @PostMapping("/publishComment")
+    public Result<SickCommentVo> publishComment(
+            @RequestParam("sickCircleId") Integer sickCircleId,
+            @RequestParam("content") String content) {
+
+        return sickCircleService.publishComment(sickCircleId, content);
+    }
+
+
+
+
+    /**
+     * 新增病友圈
+     */
+    @PostMapping("/publishSickCircle")
+    public HealthR<SickCircleEntity> publishSickCircle(@RequestBody SickCircleEntity sickCircleEntity) {
+
+        return sickCircleService.publishSickCircle(sickCircleEntity);
+    }
+
+    /**
+     * 病友圈列表
+     * @param departmentId
+     * @return
+     */
+    @GetMapping("/findSickCircleList")
+    public HealthR<List<SickCircleEntity>> sickCircleList(@RequestParam(value = "departmentId",required = false) Integer departmentId,
+                                                          @RequestParam(value = "page") Integer page,
+                                                          @RequestParam(value = "count") Integer count) {
+
+        return  patientService.sickCircleList(departmentId,page,count);
+    }
+
+    private PageInfo<SickCircleEntity> startPage(Integer page, Integer count) {
+        Page<SickCircleEntity> objects = PageHelper.startPage(page, count);
+         return  new PageInfo<>(objects);
+    }
+
+    /**
+     * 病友圈详情
+     */
+    @GetMapping("/findSickCircleInfo")
+    public HealthR<SickCircleEntity> findSickCircleInfo(@RequestParam("sickCircleId") Integer sickCircleId) {
+        SickCircleEntity sickCircleEntity = patientService.findSickCircleInfo(sickCircleId);
+        return HealthR.ok(sickCircleEntity);
+    }
+
+    /**
+     * 病症列表
+     */
+    @GetMapping("/symptomList")
+    public Result<List<SymptomEntity>> symptomList() {
+        return patientService.symptomList();
+    }
+
+
+    /**
+     * 病友圈评论列表
+     */
+    @GetMapping("/findSickCircleCommentList")
+    public HealthR<List<SickCommentEntity>> findSickCircleCommentList(@RequestParam(value = "sickCircleId",required = false) Integer sickCircleId,
+                                                                      @RequestParam(value = "page",defaultValue = "1") Integer page,
+                                                                      @RequestParam(value = "count",defaultValue = "10") Integer count) {
+         startPage(page, count);
+        return  patientService.findSickCircleCommentList(sickCircleId);
+    }
+
+
+    /**
+     * 搜索病友圈
+     * @param keyWord
+     * @return
+     */
+    @GetMapping("searchSickCircle")
+    public HealthR<List<SickCircleEntity>> searchSickCircle(@RequestParam(value = "keyWord",required = false) String keyWord){
+        return patientService.searchSickCircle(keyWord);
+    }
+
+    @GetMapping("/findPatientSickCircleList")
+    public HealthR<List<SickCircleEntity>> findPatientSickCircleList(@RequestParam(value = "patientUserId",required = false) Integer patientUserId,
+                                                          @RequestParam(value = "page") Integer page,
+                                                          @RequestParam(value = "count") Integer count) {
+
+        return  patientService.findPatientSickCircleList(patientUserId,page,count);
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/SickCircleController.java

@@ -0,0 +1,59 @@
+package doctor.controller;
+
+import com.alibaba.nacos.api.model.v2.Result;
+import doctor.common.core.domain.HealthR;
+import doctor.domain.entity.SickCircleEntity;
+import doctor.domain.vo.SickCommentVo;
+import doctor.service.SickCircleServer;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+/**
+ * @ClassName SickCircle
+ * @Description 新增病友圈
+ */
+@RestController
+@RequestMapping("/sickCircle/verify/v1/")
+public class SickCircleController {
+    @Autowired
+    SickCircleServer sickCircleServer;
+
+    /**
+     * 上传图片
+     *
+     * @param picture
+     * @return
+     */
+    @PostMapping("/uploadSickCirclePicture")
+    public Result upload(@RequestParam("picture") MultipartFile picture) {
+        return sickCircleServer.pictures(picture);
+    }
+
+
+    /**
+     * 发表评论
+     */
+    @PostMapping("/publishComment")
+    public Result<SickCommentVo> publishComment(
+            @RequestParam("sickCircleId") Integer sickCircleId,
+            @RequestParam("content") String content) {
+        return sickCircleServer.publishComment(sickCircleId, content);
+    }
+
+
+    /**
+     * 点采
+     * @param opinion
+     * @return
+     */
+    @PutMapping("expressOpinion")
+    public HealthR expressOpinion(@RequestParam("commentId") Integer commentId,
+                                  @RequestParam("opinion") Integer opinion){
+//        return sickCircleServer.expressOpinion(commentId, opinion);
+
+        return sickCircleServer.expressOpinion(commentId, opinion);
+    }
+
+
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/SickCircleV1Controller.java

@@ -0,0 +1,26 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.entity.SickCircleEntity;
+import doctor.service.PatientService;
+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 SickCircleV1Controller {
+    @Autowired
+    private PatientService patientService;
+    @GetMapping("/findSickCircleList")
+    public HealthR<List<SickCircleEntity>> findSickCircleList(@RequestParam(value = "departmentId",required = false) Integer departmentId,
+                                                              @RequestParam(value = "page") Integer page,
+                                                              @RequestParam(value = "count") Integer count) {
+        HealthR<List<SickCircleEntity>> listHealthR = patientService.sickCircleList(departmentId, page, count);
+        return listHealthR;
+    }
+}

doctor-modules/doctor-health/src/main/java/doctor/controller/UserSickCircleController.java

@@ -0,0 +1,34 @@
+package doctor.controller;
+
+import doctor.common.core.domain.HealthR;
+import doctor.domain.vo.SickCircleCommentVo;
+import doctor.domain.vo.UserSickCircleVo;
+import doctor.service.UserSickCircleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+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

@@ -1,15 +1,24 @@
 package doctor.controller;
 
-import doctor.common.core.domain.R;
-import doctor.domain.entity.UserVideoBuy;
-import doctor.domain.entity.UserVideoCollection;
-import doctor.domain.entity.UserWallet;
+import doctor.common.core.domain.HealthR;
+import doctor.domain.dto.UserArchivesDto;
+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 org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.List;
 
+import static com.github.pagehelper.page.PageMethod.startPage;
+
+
 /**
  * @ClassName : UserVideoController
  * @Description : 用户视频
@@ -24,35 +33,189 @@ public class UserVideoController {
 
     //用户视频收藏列表
     @GetMapping("/findVideoCollectionList")
-    public R<List<UserVideoCollection>>findVideoCollectionList(){
-        List<UserVideoCollection> userVideoCollectionList =userVideoService.findVideoCollectionList();
-        return R.ok(userVideoCollectionList);
+    public HealthR<List<UserVideoCollectionVo>> findVideoCollectionList(@RequestParam Integer page, @RequestParam Integer count,@RequestHeader Integer userId){
+        startPage(page,count);
+      List<UserVideoCollectionVo>  userVideoCollectionVos=userVideoService.findVideoCollectionList(userId);
+        return HealthR.ok(userVideoCollectionVos);
     }
     //用户取消视频收藏
-    @GetMapping("/cancelVideoCollection/{id}")
-    public R cancelVideoCollection(@PathVariable Integer id){
-        userVideoService.cancelVideoCollection(id);
-        return R.ok();
+    @DeleteMapping("/cancelVideoCollection")
+    public HealthR cancelVideoCollection(@RequestHeader Integer userId,@RequestHeader String sessionId,@RequestParam Integer videoId ){
+        userVideoService.cancelVideoCollection(userId,sessionId,videoId);
+        return HealthR.ok();
     }
     //用户购买视频列表
     @GetMapping("/findUserVideoBuyList")
-    public R<List<UserVideoBuy>>findUserVideoBuyList(){
-        List<UserVideoBuy> userVideoBuys =userVideoService.findUserVideoBuyList();
-        return R.ok(userVideoBuys);
+    public HealthR<List<UserVideoBuyVo>>findUserVideoBuyList(@RequestParam Integer page, @RequestParam Integer count){
+        startPage(page,count);
+        List<UserVideoBuyVo> userVideoCollectionVos =userVideoService.findUserVideoBuyList();
+        return HealthR.ok(userVideoCollectionVos);
     }
     //用户删除购买的视频
-    @DeleteMapping("/deleteVideoBuy/{id}")
-    public R deleteVideoBuy(@PathVariable Integer id){
-        userVideoService.deleteVideoBuy(id);
-        return R.ok();
+    @DeleteMapping("/deleteVideoBuy")
+    public HealthR deleteVideoBuy(@RequestParam Integer videoId){
+        userVideoService.deleteVideoBuy(videoId);
+        return HealthR.ok();
     }
 
     //我的钱包
     @GetMapping("/findUserWallet")
-    public R<List<UserWallet>> findUserWallet(){
-        List<UserWallet> userWallets = userVideoService.findUserWallet();
-        return R.ok(userWallets);
+    public HealthR findUserWallet(@RequestHeader Integer userId){
+        Integer i= userVideoService.findUserWallet(userId);
+        return HealthR.ok(i);
+    }
+    //用户消费记录
+    @GetMapping("/findUserConsumptionRecordList")
+    public HealthR<List<UserConsumptionRecordVo>> findUserConsumptionRecordList(@RequestParam Integer page,@RequestParam Integer count){
+        startPage(page,count);
+        List<UserConsumptionRecordVo> userConsumptionRecordVos = userVideoService.findUserConsumptionRecordList();
+        return HealthR.ok(userConsumptionRecordVos);
     }
 
+    //用户详情页面
+    @GetMapping("/whetherSignToday")
+    public HealthR<List<UserEntity>> whetherSignToday(@RequestHeader Integer userId){
+        List<UserEntity> userEntities = userVideoService.whetherSignToday(userId);
+        return HealthR.ok(userEntities);
+    }
+   // 用户资讯收藏列表
+    @GetMapping("/findUserInfoCollectionList")
+    public HealthR<List<UserInfoCollectionVo>> findUserInfoCollectionList(){
+        List<UserInfoCollectionVo> userInfoCollections = userVideoService.findUserInfoCollectionList();
+        return HealthR.ok(userInfoCollections);
+    }
+    //用户被采纳意见列表
+    @GetMapping("/findMyAdoptedCommentList")
+    public HealthR<List<UserAdoptCommentVo>> findMyAdoptedCommentList(@RequestParam Integer page,@RequestParam Integer count){
+        startPage(page,count);
+        List<UserAdoptCommentVo> userAdoptCommentEntities = userVideoService.findMyAdoptedCommentList();
+        return HealthR.ok(userAdoptCommentEntities);
+    }
+    //用户查看自己的档案
+    @GetMapping("/findUserArchives")
+    public HealthR<List<UserArchivesVo>> findUserArchives(@RequestHeader Integer userId){
+        List<UserArchivesVo> userArchivesVos = userVideoService.findUserArchives(userId);
+        return HealthR.ok(userArchivesVos);
+    }
+    //添加用户档案
+    @PostMapping("/addUserArchives")
+    public HealthR addUserArchives(@RequestBody  UserArchivesEntity userArchivesEntity, @RequestHeader Integer userId){
+        userVideoService.addUserArchives(userArchivesEntity,userId);
+        return HealthR.ok();
+    }
+    //上传用户档案图片
+    @PostMapping("/uploadArchivesPicture")
+    public HealthR uploadUserArchivesImg(@RequestParam("imagePic") MultipartFile imagePic,
+                                         @RequestHeader String sessionId,
+                                         @RequestParam Integer id
+                                            ){
+
+        return HealthR.ok(userVideoService.uploadUserArchivesImg(imagePic,sessionId,id));
+    }
+
+    //用户关注医生列表
+    @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<List<UserVo>> getUserInfoById(@RequestHeader Integer userId){
+        List<UserVo> userVos = userVideoService.getUserInfoById(userId);
+        return HealthR.ok(userVos);
+    }
+    //用户签到
+    @PostMapping("/addSign")
+    public HealthR addSign(){
+        userVideoService.addSign();
+        return HealthR.ok("签到成功");
+    }
+    //完善用户信息
+    @PutMapping("/perfectUserInfo")
+    public HealthR perfectUserInfo(@RequestParam Integer age,@RequestParam Integer height,@RequestParam  Integer weight,@RequestHeader Integer userId ){
+        userVideoService.perfectUserInfo(age,height,weight,userId);
+        return HealthR.ok("完善成功");
+    }
+    //修改用户性别
+    @PutMapping("/updateUserSex")
+    public HealthR updateUserSex(@RequestParam Integer sex,@RequestHeader Integer userId){
+        userVideoService.updateUserSex(sex,userId);
+        return HealthR.ok("修改成功");
+    }
+    //修改用户昵称
+    @PutMapping("/modifyNickName")
+    public HealthR modifyNickName(@RequestParam String nickName,@RequestHeader Integer userId){
+        userVideoService.modifyNickName(nickName,userId);
+        return HealthR.ok("修改成功");
+    }
+    //查询系统通知列表
+    @GetMapping("/findSystemNoticeList")
+    public HealthR<List<SystemNoticeEntity>> findSystemNoticeList(){
+        List<SystemNoticeEntity> systemNoticeEntities = userVideoService.findSystemNoticeList();
+        return HealthR.ok(systemNoticeEntities);
+    }
+    //查询用户问诊通知列表
+    @GetMapping("/findInquiryNoticeList")
+    public  HealthR<List<InquiryNoticeVo>> findInquiryNoticeList(@RequestHeader Integer userId,@RequestParam Integer page,@RequestParam Integer count){
+        startPage(page,count);
+        List<InquiryNoticeVo> inquiryRecordEntities = userVideoService.findInquiryNoticeList(userId);
+        return HealthR.ok(inquiryRecordEntities);
+    }
+    //查询用户货币通知列表
+    @GetMapping("/findHealthyCurrencyNoticeList")
+    public HealthR<List<HealthyCurrencyNoticeListVo>> findHealthyCurrencyNoticeList(@RequestHeader Integer userId,@RequestParam Integer page,@RequestParam Integer count) {
+        startPage(page,count);
+        List<HealthyCurrencyNoticeListVo> healthyCurrencyNoticeListVos = userVideoService.findHealthyCurrencyNoticeList(userId);
+        return HealthR.ok(healthyCurrencyNoticeListVos);
+    }
+
+    //查询用户未读数消息
+    @GetMapping("/findUserNoticeReadNum")
+    public HealthR<List<UserNoticeReadNumVo>> findUserNoticeReadNum(@RequestHeader Integer userId){
+        List<UserNoticeReadNumVo> userNoticeReadNumVos = userVideoService.findUserNoticeReadNum(userId);
+        return HealthR.ok(userNoticeReadNumVos);
+    }
+    //修改消息为已读
+    @PutMapping("/modifyAllStatus")
+    public HealthR modifyAllStatus(@RequestHeader Integer userId){
+        userVideoService.modifyAllStatus(userId);
+        return HealthR.ok("全部已读");
+    }
+    //充值
+    @PostMapping("/recharge")
+    public HealthR<String> pay(@RequestParam BigDecimal money,@RequestHeader Integer userId) {
+        String pay = userVideoService.Pay(money,userId);
+        System.err.println(pay);
+        return HealthR.ok(pay);
+    }
+
+    //提现
+    @PostMapping("/drawCash")
+    public HealthR drawCash(@RequestHeader Integer userId,@RequestParam BigDecimal money){
+        userVideoService.drawCash(userId,money);
+        return HealthR.ok("提现成功");
+    }
+
+    //病友圈评论列表查询
+    @GetMapping("/findUserSickCollectionList")
+    public HealthR<List<SickCircleCommentVo>> findSickCircleCommentList(@RequestHeader Integer userId,@RequestParam Integer page, @RequestParam Integer count){
+        startPage(page,count);
+        List<SickCircleCommentVo> sickCircleComments = userVideoService.findSickCircleCommentList(userId);
+        return HealthR.ok(sickCircleComments);
+    }
 
 }

doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java

@@ -1,7 +1,9 @@
 package doctor.controller;
 
+import doctor.common.core.domain.HealthR;
 import doctor.common.core.domain.R;
 import doctor.domain.entity.*;
+import doctor.domain.vo.VideoCommentVo;
 import doctor.service.VideoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,21 +23,32 @@ public class VideoController {
     private VideoService videoService;
     //收藏健康讲堂视频列表
     @PostMapping("/verify/v1/addUserVideoCollection")
-    public R addUserVideoCollection(@RequestBody UserVideoCollection userVideoCollection){
-        videoService.addUserVideoCollection(userVideoCollection);
-        return R.ok();
+    public HealthR addUserVideoCollection(@RequestParam  Integer videoId,@RequestHeader Integer userId){
+        videoService.addUserVideoCollection(videoId,userId);
+        return HealthR.ok();
     }
     //购买健康讲堂视频
     @PostMapping("/verify/v1/videoBuy")
-    public R videoBuy(@RequestBody UserVideoBuy userVideoBuy){
-        videoService.videoBuy(userVideoBuy);
-        return R.ok();
+    public HealthR videoBuy(@RequestHeader Integer userId,@RequestParam Integer videoId, @RequestParam Integer price){
+        videoService.videoBuy(userId,videoId,price);
+        return HealthR.ok();
     }
-    //视频评论列表
+
+
+    //评论列表
     @GetMapping("/v1/findVideoCommentList")
-    public R<List<VideoComment>> findVideoCommentList(){
-        List<VideoComment> videoCommentList = videoService.findVideoCommentList();
-        return R.ok(videoCommentList);
+    public HealthR<List<VideoCommentVo>> findVideoCommentList(@RequestParam Integer videoId) {
+        List<VideoCommentVo> videoCommentVoList = videoService.findVideoCommentList(videoId);
+        return HealthR.ok(videoCommentVoList);
+    }
+
+    @PostMapping("/verify/v1/addVideoComment")
+    public HealthR<VideoCommentVo> addVideoComment(@RequestHeader Integer userId,
+                                                   @RequestHeader String sessionId,
+                                                   @RequestParam Integer videoId,
+                                                   @RequestParam String content) {
+        videoService.addVideoComment(userId,sessionId,videoId,content);
+        return HealthR.ok();
     }
 
 }

doctor-modules/doctor-health/src/main/java/doctor/convert/DoctorConvert.java

@@ -0,0 +1,25 @@
+package doctor.convert;
+
+import doctor.domain.entity.DoctorEntity;
+import doctor.domain.vo.DoctorVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface DoctorConvert {
+
+    DoctorConvert INSTANCE = Mappers.getMapper(DoctorConvert.class);
+
+    DoctorEntity doctorVoToDoctorEntity(DoctorVo doctorVo);
+    @Mappings({
+            @Mapping(source = "id", target = "id")
+    })
+    DoctorVo doctorEntityToDoctorVo(DoctorEntity doctorEntity);
+    List<DoctorVo> doctorEntityListToDoctorVoList(List<DoctorEntity> doctorEntityList);
+
+    List<DoctorEntity> doctorVoListToDoctorEntityList(List<DoctorVo> doctorVoList);
+}

doctor-modules/doctor-health/src/main/java/doctor/convert/VideoConvert.java

@@ -0,0 +1,21 @@
+package doctor.convert;
+
+import doctor.domain.entity.VideoEntity;
+import doctor.domain.vo.VideoVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface VideoConvert {
+    VideoConvert INSTANCE = Mappers.getMapper(VideoConvert.class);
+
+    VideoVo videoEntityToVideoVo(VideoEntity videoEntity);
+
+    VideoEntity videoVoToVideoEntity(VideoVo videoVo);
+
+    List<VideoEntity> videoVoListToVideoEntityList(List<VideoVo> videoVoList);
+
+    List<VideoVo> videoEntityListToVideoVoList(List<VideoEntity> videoEntityList);
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/dto/ApplyJoinDto.java

@@ -0,0 +1,39 @@
+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 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

@@ -0,0 +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;
+
+}

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/DepartmentEntity.java

@@ -0,0 +1,20 @@
+package doctor.domain.entity;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DepartmentEntity {
+    private Integer id;
+
+    private String departmentName;
+
+    private String pic;
+
+    private Integer rank;
+
+    private Date createTime;
+
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorAskCount.java

@@ -0,0 +1,24 @@
+package doctor.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.entity
+ * @Author: jpz
+ * @CreateTime: 2024/1/19 11:41
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DoctorAskCount {
+    private Integer id;
+    private Integer doctorAskCount;
+    private Integer number;
+    private Date updateTime;
+    private Date createTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCharge.java

@@ -0,0 +1,24 @@
+package doctor.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.entity
+ * @Author: jpz
+ * @CreateTime: 2024/1/18 18:33
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DoctorCharge {
+    private Integer id;
+    private Integer doctorId;
+    private Integer cost;
+    private Date updateTime;
+    private Date createTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorCommentCount.java

@@ -0,0 +1,24 @@
+package doctor.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @BelongsProject: Medical_Treatment
+ * @BelongsPackage: doctor.domain.entity
+ * @Author: jpz
+ * @CreateTime: 2024/1/18 18:48
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DoctorCommentCount {
+    private Integer id;
+    private Integer doctorId;
+    private Integer praiseNum;
+    private Integer badNum;
+    private Date createTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorEntity.java

@@ -24,6 +24,7 @@ public class DoctorEntity {
     private String phone;
     private String pwd;
     private String name;
+    private String jobTitle;
     private String imagePic;
     private String inauguralHospital;
     private String personalProfile;

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/DoctorJobTitleEntity.java

@@ -0,0 +1,18 @@
+package doctor.domain.entity;
+
+
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class DoctorJobTitleEntity {
+
+    private Integer id;
+
+
+    private String jobTitle;
+
+
+    private Date createTime;
+
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorSystemReplyEntity.java

@@ -0,0 +1,13 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DoctorSystemReplyEntity {
+    private Integer id;
+    private String content;
+    private Date createTime;
+
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorUserEntity.java

@@ -1,9 +1,8 @@
 package doctor.domain.entity;
 
-import java.security.Timestamp;
 import java.util.Date;
 
-public class DoctorUser {
+public class DoctorUserEntity {
 
     private int id;
     private String phone;

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/InquiryDetailsRecord.java

@@ -0,0 +1,19 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class InquiryDetailsRecord {
+    private Integer id;
+    private Integer inquiryId;
+    private Integer userId;
+    private Integer doctorId;
+    private String askContent;
+    private String askImage;
+    private String voiceChat;
+    private Integer direction;
+    private Date askTime;
+    private Date createTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/MySickEntity.java

@@ -0,0 +1,92 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName MySickEntity
+ * @Description 描述
+ * @Author 栗永斌
+ */
+@Data
+public class MySickEntity {
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 整个治疗案例的详细信息
+     */
+    private Integer sickCircleId;
+    /**
+     * 该治疗案例所属用户的ID
+     */
+    private Long userId;
+    /**
+     * 治疗案例的标题
+     */
+    private String title;
+    /**
+     * 该治疗案例所属部门的ID
+     */
+    private Integer departmentId;
+    /**
+     * 采纳的评论的ID，如果该治疗案例被采纳了
+     */
+    private Integer adoptCommentId;
+    /**
+     * 患者所患病症
+     */
+    private String disease;
+    /**
+     * 治疗案例的详细描述
+     */
+    private String detail;
+    /**
+     * 治疗医院的名称
+     */
+    private String treatmentHospital;
+    /**
+     * 治疗开始时间
+     */
+    private Date treatmentStartTime;
+    /**
+     * 治疗结束时间
+     */
+    private Date treatmentEndTime;
+    /**
+     * 治疗过程描述
+     */
+    private String treatmentProcess;
+    /**
+     * 该治疗案例所附图片的ID，如果有
+     */
+    private String picture;
+    /**
+     * 治疗案例发布的日期和时间
+     */
+    private Date releaseTime;
+    /**
+     * 该治疗案例被采纳的日期和时间，如果是采纳的案例
+     */
+    private Date adoptTime;
+    /**
+     * 治疗案例中包含的药品数量
+     */
+    private Integer amount;
+    /**
+     * 治疗案例创建的日期和时间
+     */
+    private Date createTime;
+    /**
+     * 治疗案例的收藏数量
+     */
+    private Integer collectionNum;
+    /**
+     * 治疗案例的评论数量
+     */
+    private Integer commentNum;
+
+
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleCommentEntity.java

@@ -0,0 +1,23 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName : SickCircleCommentEntity
+ * @Description : 病友圈评论表
+ * @Author : FJJ
+ * @Date: 2024-01-12 19:57
+ */
+@Data
+public class SickCircleCommentEntity {
+    private Integer id;
+    private Integer sickCircleId;
+    private Integer userId;
+    private String content;
+    private Date commentTime;
+    private Integer whetherDoctor;
+    private Date createTime;
+
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleEntity.java

@@ -0,0 +1,107 @@
+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 {
+    /**
+     * 病例ID
+     */
+    private Integer sickCircleId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 病例标题
+     */
+    private String title;
+
+    /**
+     * 部门ID
+     */
+    private Integer departmentId;
+
+    /**
+     * 采纳评论ID
+     */
+    private Integer adoptCommentId;
+
+    /**
+     * 疾病名称
+     */
+    private String disease;
+
+    /**
+     * 病例详情
+     */
+    private String detail;
+
+    /**
+     * 治疗医院
+     */
+    private String treatmentHospital;
+
+    /**
+     * 治疗开始时间
+     */
+    private Date treatmentStartTime;
+
+    /**
+     * 治疗结束时间
+     */
+    private Date treatmentEndTime;
+
+    /**
+     * 治疗过程
+     */
+    private String treatmentProcess;
+
+    /**
+     * 图片
+     */
+    private String picture;
+
+    /**
+     * 发布时间
+     */
+    private Date releaseTime;
+
+    /**
+     * 采纳时间
+     */
+    private Date adoptTime;
+
+    /**
+     * 治愈人数
+     */
+    private Integer amount;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 收藏数
+     */
+    private Integer collectionNum;
+
+    /**
+     * 评论数
+     */
+    private Integer commentNum;
+
+    /**
+     * 科室名称
+     */
+    private String department;
+
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCommentEntity.java

@@ -0,0 +1,42 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName SickConmentEntity
+ * @Description 评论表
+ * @Author 栗永斌
+ */
+@Data
+public class SickCommentEntity {
+
+//   // 私有变量，评论的ID
+//   private String id;
+//   // 私有变量，评论所属的圈子ID
+//   private String sickCircleId;
+//   // 私有变量，评论的用户ID
+//   private String patientUserId;
+//   // 私有变量，评论的内容
+//   private String content;
+//   // 私有变量，评论的评论时间
+//   private String commentTime;
+//   // 私有变量，是否为医生评论
+//   private String whetherDoctor;
+//   // 私有变量，评论的创建时间
+//   private String createTime;
+
+
+   private String content;
+   private Date createTime;
+   private Integer patientUserId;
+   private Integer whetherDoctor;
+   private Integer commentUserId;
+   private Integer opposeNum;
+   private Integer supportNum;
+   private Integer opinion;
+   private String headPic;
+
+
+}

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/SymptomEntity.java

@@ -0,0 +1,78 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName SymptomEntity
+ * @Description 描述
+ * @Author 栗永斌
+ */
+@Data
+public class SymptomEntity {
+
+   /**
+    * 私有变量，药品ID
+    */
+   private Integer id;
+   /**
+    * 私有变量，药品分类ID
+    */
+   private Integer drugsCategoryId;
+   /**
+    * 私有变量，药品名称
+    */
+   private String name;
+   /**
+    * 私有变量，药品图片
+    */
+   private String picture;
+   /**
+    * 私有变量，药品功效
+    */
+   private String effect;
+   /**
+    * 私有变量，药品禁忌
+    */
+   private String taboo;
+   /**
+    * 私有变量，药品形状
+    */
+   private String shape;
+   /**
+    * 私有变量，药品包装
+    */
+   private String packing;
+   /**
+    * 私有变量，药品成分
+    */
+   private String component;
+   /**
+    * 私有变量，药品用法
+    */
+   private String usage;
+   /**
+    * 私有变量，药品副作用
+    */
+   private String sideEffects;
+   /**
+    * 私有变量，药品存储
+    */
+   private String storage;
+   /**
+    * 私有变量，药品注意事项
+    */
+   private String mindMatter;
+   /**
+    * 私有变量，药品批准文号
+    */
+   private String approvalNumber;
+   /**
+    * 私有变量，药品创建时间
+    */
+   private Date createTime;
+
+
+
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SystemNoticeEntity.java

@@ -0,0 +1,22 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName : SystemNoticeEntity
+ * @Description : 系统通知表
+ * @Author : FJJ
+ * @Date: 2024-01-18 10:57
+ */
+@Data
+public class SystemNoticeEntity {
+    private Integer id;
+    private Integer reciveUserId;
+    private String content;
+    private String noticeType;
+    private String pushType;
+    private Integer status;
+    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/User.java

@@ -1,140 +0,0 @@
-package doctor.domain.entity;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @ClassName : User
- * @Description : 用户表
- * @Author : FJJ
- * @Date: 2024-01-10 20:46
- */
-public class User {
-    private Integer id;
-    private String phone;
-    private String pwd;
-    private String email;
-    private String nickName;
-    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;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getPwd() {
-        return pwd;
-    }
-
-    public void setPwd(String pwd) {
-        this.pwd = pwd;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    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 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 String getHeight() {
-        return height;
-    }
-
-    public void setHeight(String height) {
-        this.height = height;
-    }
-
-    public String getWeight() {
-        return weight;
-    }
-
-    public void setWeight(String weight) {
-        this.weight = weight;
-    }
-
-    public String getInvitationCode() {
-        return invitationCode;
-    }
-
-    public void setInvitationCode(String invitationCode) {
-        this.invitationCode = invitationCode;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = 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;
 
@@ -14,10 +15,18 @@ import java.util.Date;
 public class UserArchivesEntity {
     private Integer id;
     private Integer userId;
-    private String bankCardNumber;
-    private String bankName;
-    private Integer bankCardType;
+    private String diseaseMain;
+    private String diseaseNow;
+    private String diseaseBefore;
+    private String treatmentHospitalRecent;
+    private String treatmentProcess;
+    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() {
@@ -36,28 +45,68 @@ public class UserArchivesEntity {
         this.userId = userId;
     }
 
-    public String getBankCardNumber() {
-        return bankCardNumber;
+    public String getDiseaseMain() {
+        return diseaseMain;
     }
 
-    public void setBankCardNumber(String bankCardNumber) {
-        this.bankCardNumber = bankCardNumber;
+    public void setDiseaseMain(String diseaseMain) {
+        this.diseaseMain = diseaseMain;
     }
 
-    public String getBankName() {
-        return bankName;
+    public String getDiseaseNow() {
+        return diseaseNow;
     }
 
-    public void setBankName(String bankName) {
-        this.bankName = bankName;
+    public void setDiseaseNow(String diseaseNow) {
+        this.diseaseNow = diseaseNow;
     }
 
-    public Integer getBankCardType() {
-        return bankCardType;
+    public String getDiseaseBefore() {
+        return diseaseBefore;
     }
 
-    public void setBankCardType(Integer bankCardType) {
-        this.bankCardType = bankCardType;
+    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;
+    }
+
+    public String getPicture() {
+        return picture;
+    }
+
+    public void setPicture(String picture) {
+        this.picture = picture;
     }
 
     public Date getUpdateTime() {

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserBankCard.java

@@ -0,0 +1,20 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+/**
+ * @ClassName : UserBankCard
+ * @Description : 银行卡表
+ * @Author : FJJ
+ * @Date: 2024-01-19 10:22
+ */
+@Data
+public class UserBankCard {
+    private Integer id;
+    private Integer userId;
+    private String  bankCardNumber;
+    private String bankName;
+    private Integer bankCardType;
+    private Data updateTime;
+    private Data createTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserDoctorFollowEntity.java

@@ -1,6 +1,8 @@
 package doctor.domain.entity;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
@@ -10,42 +12,16 @@ import java.util.Date;
  * @Author: jpz
  * @CreateTime: 2024/1/8 21:49
  */
-
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class UserDoctorFollowEntity {
     private Integer id;
-    private Integer userId;
+    private Long userId;
     private Integer doctorId;
     private Date createTime;
 
-    public Integer getId() {
-        return id;
-    }
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
 
-    public Integer getUserId() {
-        return userId;
-    }
 
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getDoctorId() {
-        return doctorId;
-    }
-
-    public void setDoctorId(Integer doctorId) {
-        this.doctorId = doctorId;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java

@@ -1,141 +1,55 @@
 package doctor.domain.entity;
 
+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;
 
 /**
- * @BelongsProject: Medical_Treatment
- * @BelongsPackage: doctor.entity
- * @Author: jpz
- * @CreateTime: 2024/1/8 20:59
+ * @ClassName : UserEntity
+ * @Description : 用户表
+ * @Author : FJJ
+ * @Date: 2024-01-10 20:46
  */
-
-public class UserEntity {
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+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 Integer height;
     private Integer weight;
-    private String invitationCode;
+    private String  invitationCode;
     private Date updateTime;
     private Date createTime;
 
-    public Integer getId() {
-        return id;
-    }
 
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getPwd() {
-        return pwd;
-    }
-
-    public void setPwd(String pwd) {
-        this.pwd = pwd;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    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 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 getInvitationCode() {
-        return invitationCode;
-    }
-
-    public void setInvitationCode(String invitationCode) {
-        this.invitationCode = invitationCode;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserRechargeRecordEntity.java

@@ -0,0 +1,23 @@
+package doctor.domain.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName : UserRechargeRecordEntity
+ * @Description : 用户充值
+ * @Author : FJJ
+ * @Date: 2024-01-18 20:51
+ */
+@Data
+public class UserRechargeRecordEntity {
+    private Integer id;
+    private String orderId;
+    private Integer userId;
+    private Integer money;
+    private Integer payType;
+    private Integer payStatus;
+    private Date rechargeTime;
+    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/UserVideoBuy.java

@@ -1,56 +0,0 @@
-package doctor.domain.entity;
-
-/**
- * @ClassName : UserVideoBuy
- * @Description : 用户购买视频表
- * @Author : FJJ
- * @Date: 2024-01-10 15:20
- */
-public class UserVideoBuy {
-    private Integer id;
-    private Integer userId;
-    private Integer videoId;
-    private Long createTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getVideoId() {
-        return videoId;
-    }
-
-    public void setVideoId(Integer videoId) {
-        this.videoId = videoId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public UserVideoBuy(Integer id, Integer userId, Integer videoId, Long createTime) {
-        this.id = id;
-        this.userId = userId;
-        this.videoId = videoId;
-        this.createTime = createTime;
-    }
-
-    public UserVideoBuy() {
-    }
-}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoBuyEntity.java

@@ -0,0 +1,27 @@
+package doctor.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @ClassName : UserVideoBuyEntity
+ * @Description : 用户购买视频表
+ * @Author : FJJ
+ * @Date: 2024-01-10 15:20
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserVideoBuyEntity {
+    private Integer id;
+    private Integer userId;
+    private Integer videoId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date createTime;
+}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoCollection.java

@@ -1,62 +0,0 @@
-package doctor.domain.entity;
-
-import io.swagger.models.auth.In;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @ClassName : UserVideoCollection
- * @Description : 用户视频收藏表
- * @Author : FJJ
- * @Date: 2024-01-10 14:28
- */
-
-public class UserVideoCollection {
-    private Integer id;
-    private Integer userId;
-    private Integer videoId;
-    private Long createTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getVideoId() {
-        return videoId;
-    }
-
-    public void setVideoId(Integer videoId) {
-        this.videoId = videoId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public UserVideoCollection(Integer id, Integer userId, Integer videoId, Long createTime) {
-        this.id = id;
-        this.userId = userId;
-        this.videoId = videoId;
-        this.createTime = createTime;
-    }
-
-    public UserVideoCollection() {
-    }
-}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoCollectionEntity.java

@@ -1,21 +1,25 @@
 package doctor.domain.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
 /**
- * @ClassName : VideoComment
- * @Description : 评论表
+ * @ClassName : UserVideoCollectionEntity
+ * @Description : 用户视频收藏表
  * @Author : FJJ
- * @Date: 2024-01-10 21:54
+ * @Date: 2024-01-10 14:28
  */
-public class VideoComment {
-    private Integer id;
 
+public class UserVideoCollectionEntity {
+    private Integer id;
     private Integer userId;
     private Integer videoId;
-    private String  content;
+
+    private  String original;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     public Integer getId() {
@@ -42,14 +46,6 @@ public class VideoComment {
         this.videoId = videoId;
     }
 
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -57,4 +53,12 @@ public class VideoComment {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public String getOriginal() {
+        return original;
+    }
+
+    public void setOriginal(String original) {
+        this.original = original;
+    }
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserWalletEntity.java

@@ -1,16 +1,12 @@
 package doctor.domain.entity;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
 /**
- * @ClassName : UserWallet
+ * @ClassName : UserWalletEntity
  * @Description : 用户钱包
  * @Author : FJJ
  * @Date: 2024-01-10 20:30
  */
-public class UserWallet {
+public class UserWalletEntity {
     private Integer id;
     private Integer userId;
     private Integer balance;

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Video.java

@@ -1,110 +0,0 @@
-package doctor.domain.entity;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @ClassName : Video
- * @Description : 健康课堂视频表
- * @Author : FJJ
- * @Date: 2024-01-10 15:59
- */
-public class Video {
-    private Integer id;
-    private String title;
-    private Integer categoryId;
-    private String shearUrl;
-    private String abstracts;
-    private String originalUrl;
-    private Integer duration;
-    private Integer price;
-    private Long createTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Integer getCategoryId() {
-        return categoryId;
-    }
-
-    public void setCategoryId(Integer categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    public String getShearUrl() {
-        return shearUrl;
-    }
-
-    public void setShearUrl(String shearUrl) {
-        this.shearUrl = shearUrl;
-    }
-
-    public String getAbstracts() {
-        return abstracts;
-    }
-
-    public void setAbstracts(String abstracts) {
-        this.abstracts = abstracts;
-    }
-
-    public String getOriginalUrl() {
-        return originalUrl;
-    }
-
-    public void setOriginalUrl(String originalUrl) {
-        this.originalUrl = originalUrl;
-    }
-
-    public Integer getDuration() {
-        return duration;
-    }
-
-    public void setDuration(Integer duration) {
-        this.duration = duration;
-    }
-
-    public Integer getPrice() {
-        return price;
-    }
-
-    public void setPrice(Integer price) {
-        this.price = price;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Video(Integer id, String title, Integer categoryId, String shearUrl, String abstracts, String originalUrl, Integer duration, Integer price, Long createTime) {
-        this.id = id;
-        this.title = title;
-        this.categoryId = categoryId;
-        this.shearUrl = shearUrl;
-        this.abstracts = abstracts;
-        this.originalUrl = originalUrl;
-        this.duration = duration;
-        this.price = price;
-        this.createTime = createTime;
-    }
-
-    public Video() {
-    }
-}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java

@@ -1,22 +1,63 @@
 package doctor.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
+/**
+ * @ClassName : VideoCommentEntity
+ * @Description : 评论表
+ * @Author : FJJ
+ * @Date: 2024-01-10 21:54
+ */
 public class VideoCommentEntity {
     private Integer id;
+
     private Integer userId;
     private Integer videoId;
-    private String content;
+    private String  content;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getVideoId() {
+        return videoId;
+    }
+
+    public void setVideoId(Integer videoId) {
+        this.videoId = videoId;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
 }

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCount.java

@@ -1,70 +0,0 @@
-package doctor.domain.entity;
-
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @ClassName : VideoCount
- * @Description : 视频数
- * @Author : FJJ
- * @Date: 2024-01-10 16:24
- */
-public class VideoCount {
-    private Integer id;
-    private Integer videoId;
-    private Integer buyNum;
-    private Integer collectionNum;
-    private Integer commentNum;
-    private Date createTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getVideoId() {
-        return videoId;
-    }
-
-    public void setVideoId(Integer videoId) {
-        this.videoId = videoId;
-    }
-
-    public Integer getBuyNum() {
-        return buyNum;
-    }
-
-    public void setBuyNum(Integer buyNum) {
-        this.buyNum = buyNum;
-    }
-
-    public Integer getCollectionNum() {
-        return collectionNum;
-    }
-
-    public void setCollectionNum(Integer collectionNum) {
-        this.collectionNum = collectionNum;
-    }
-
-    public Integer getCommentNum() {
-        return commentNum;
-    }
-
-    public void setCommentNum(Integer commentNum) {
-        this.commentNum = commentNum;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-
-}

doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java

@@ -1,5 +1,11 @@
 package doctor.domain.entity;
 
+/**
+ * @ClassName : VideoEntity
+ * @Description : 健康课堂视频表
+ * @Author : FJJ
+ * @Date: 2024-01-10 15:59
+ */
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;

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/Comment.java

@@ -0,0 +1,15 @@
+package doctor.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Comment {
+    private String nickName;
+    private String headPic;
+    private String content;
+    private Long commentTime;
+}

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/DoctorReceiveGift.java

@@ -0,0 +1,16 @@
+package doctor.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DoctorReceiveGift {
+    private Integer worth;
+    private Integer receiveNum;
+    private String giftPic;
+    private String giftName;
+    private String meaning;
+}

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

@@ -0,0 +1,12 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DoctorSystemNoticeListVo {
+    private Integer id;
+    private String content;
+    private Date createTime;
+}

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

@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * @BelongsProject: Medical_Treatment
  * @BelongsPackage: doctor.domain.vo
@@ -14,14 +16,13 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class DoctorVo {
-    private Integer doctorId;
-    private String doctorName;
+    private Integer id;
+    private Integer departmentId;
+    private String departmentName;
+    private String goodField;
     private String imagePic;
-    private String jobTitle;
     private String inauguralHospital;
-    private double praise;
-    private Integer serverNum;
-    private Integer servicePrice;
-    private Integer praiseNum;
-    private Integer badNum;
+    private String jobTitle;
+    private String name;
+    private String personalProfile;
 }

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

@@ -0,0 +1,8 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class FindImagePicVo {
+    private String imagePic;
+}

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

@@ -0,0 +1,18 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName : HealthyCurrencyNoticeListVo
+ * @Description : 用户H币通知列表
+ * @Author : FJJ
+ * @Date: 2024-01-18 15:57
+ */
+@Data
+public class HealthyCurrencyNoticeListVo {
+    private Integer id;
+    private String content;
+    private Date createTime;
+}

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

@@ -0,0 +1,16 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class HistoryInquiryRecordVo {
+    private Integer recordId;
+    private Integer userId;
+    private String uerHeadPic;
+    private String doctorHeadPic;
+    private String nickName;
+    private Date inquiryTime;
+    private Integer status;
+}

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

@@ -0,0 +1,100 @@
+package doctor.domain.vo;
+
+/**
+ * @ClassName : InquiryDetailsRecordVo
+ * @Description : 历史问诊记录
+ * @Author : FJJ
+ * @Date: 2024-01-12 19:02
+ */
+public class InquiryDetailsRecordVo {
+    private Integer recordId;
+    private Integer doctorId;
+    private String imagePic;
+    private String doctorName;
+    private String department;
+    private String jobTitle;
+    private Integer evaluateStatus;
+    private String userName;
+    private String jiGuangPwd;
+    private Long inquiryTime;
+
+    public Integer getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(Integer recordId) {
+        this.recordId = recordId;
+    }
+
+    public Integer getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Integer doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public String getImagePic() {
+        return imagePic;
+    }
+
+    public void setImagePic(String imagePic) {
+        this.imagePic = imagePic;
+    }
+
+    public String getDoctorName() {
+        return doctorName;
+    }
+
+    public void setDoctorName(String doctorName) {
+        this.doctorName = doctorName;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getJobTitle() {
+        return jobTitle;
+    }
+
+    public void setJobTitle(String jobTitle) {
+        this.jobTitle = jobTitle;
+    }
+
+    public Integer getEvaluateStatus() {
+        return evaluateStatus;
+    }
+
+    public void setEvaluateStatus(Integer evaluateStatus) {
+        this.evaluateStatus = evaluateStatus;
+    }
+
+    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 Long getInquiryTime() {
+        return inquiryTime;
+    }
+
+    public void setInquiryTime(Long inquiryTime) {
+        this.inquiryTime = inquiryTime;
+    }
+}

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

@@ -0,0 +1,18 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @ClassName : InquiryNotice
+ * @Description : 用户问诊通知表
+ * @Author : FJJ
+ * @Date: 2024-01-18 11:33
+ */
+@Data
+public class InquiryNoticeVo {
+    private Integer id;
+    private String content;
+    private Date createTime;
+}

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/MyAdoptedCommentListVo.java

@@ -0,0 +1,13 @@
+package doctor.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class MyAdoptedCommentListVo {
+    private Integer releaseUserId;
+    private String releaseUserNickName;
+    private String title;
+    private String disease;
+    private String content;
+    private String adoptTime;
+}

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