doctor-auth/src/main/java/doctor/auth/controller/HealthDoctorController.java

@@ -4,9 +4,6 @@ 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;
@@ -15,15 +12,13 @@ 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) {
-    public HealthR<?> login(@RequestParam @ApiParam("email") String email, @RequestParam @ApiParam("pwd") String pwd) {
         DoctorVo userInfo = healthDoctorService.login(email,pwd);
         if (userInfo!=null){
             return HealthR.ok(userInfo,"登录成功");

doctor-auth/src/main/java/doctor/auth/form/LoginBody.java

@@ -1,27 +1,39 @@
 package doctor.auth.form;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
 /**
  * 用户登录对象
- *
+ * 
  * @author ruoyi
  */
-@Data
-@ApiModel("用户登录")
 public class LoginBody
 {
-    @NotBlank(message = "用户名不能为空")
+    /**
-    @ApiModelProperty("姓名")
+     * 用户名
+     */
     private String username;
 
-    @NotBlank(message = "密码不能为空")
+    /**
-    @Size(min = 1, message = "密码长度不能小于1")
+     * 用户密码
-    @ApiModelProperty("密码")
+     */
     private String password;
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
 }

doctor-auth/src/main/java/doctor/auth/vo/DoctorVo.java

@@ -1,58 +1,112 @@
 package doctor.auth.vo;
 
-import io.swagger.annotations.ApiModelProperty;
+public class DoctorVo {
-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,53 +1,130 @@
 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-auth/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-common/doctor-common-core/src/main/java/doctor/common/core/WebConfig.java

@@ -1,38 +0,0 @@
-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/Constants.java

@@ -54,8 +54,7 @@ public class Constants
     /**
      * 维度健康成功标识
      */
-//    public static final String SUCCESS_HEALTH = "0000";
+
-//    public static final String FAIL_HEALTH = "9001";
 
     /**
      * 失败标记

doctor-gateway/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-file/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-gen/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-health/pom.xml

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

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

@@ -1,18 +1,20 @@
 package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
+import doctor.common.core.web.controller.BaseController;
+import doctor.common.security.utils.SecurityUtils;
 import doctor.domain.dto.ApplyJoinDto;
+import doctor.domain.dto.CheckCodeDto;
 import doctor.domain.entity.Banners;
 import doctor.domain.entity.DoctorJobTitleEntity;
-import doctor.domain.vo.DoctorVo;
+import doctor.domain.vo.*;
-import doctor.domain.vo.FindImagePicVo;
 import doctor.service.BannersService;
 import doctor.service.HealthJobTitleService;
+import doctor.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.Valid;
 import java.util.List;
 
 @RestController
@@ -23,35 +25,60 @@ public class HealthJobTitleController {
 
     @Autowired
     private BannersService bannersService;
+
+
+    @GetMapping("/findHistoryInquiryRecord")
+    public HealthR<List<DoctorHistoryInquiryVo>> findHistoryInquiryRecord(@RequestHeader Integer doctorId,
+                                                                          @RequestHeader String sessionId,
+                                                                          @RequestParam Integer page,
+                                                                          @RequestParam Integer size) {
+        HealthR<List<DoctorHistoryInquiryVo>> healthR = healthJobTitleService.findHistoryInquiryRecord(page, size);
+        return null;
+    }
+
+
+    @PostMapping("/drawCash")
+    public HealthR drawCash(@RequestHeader Integer doctorId,
+                            @RequestHeader String sessionId,
+                            @RequestParam Integer money) {
+        HealthR healthR = healthJobTitleService.drawCash(doctorId, money);
+        return healthR;
+    }
+
+
+
     @GetMapping("/bannersShow")
-    public HealthR<List<Banners>> bannersShow(){
+    public HealthR<List<Banners>> bannersShow() {
         List<Banners> banners = bannersService.bannersShow();
         return HealthR.ok(banners);
     }
 
     @GetMapping("/findJobTitleList")
     public HealthR<List<DoctorJobTitleEntity>> findJobTitleList() {
-        List<DoctorJobTitleEntity> doctorJobTitleEntities=healthJobTitleService.findJobTitleList();
+        List<DoctorJobTitleEntity> doctorJobTitleEntities = healthJobTitleService.findJobTitleList();
         return HealthR.ok(doctorJobTitleEntities);
     }
 
-    @PostMapping("/sendEmailCode")
+    @RequestMapping("/sendEmailCode")
     public HealthR sendEmailCode(@RequestParam("email") String email) {
-        HealthR healthR= healthJobTitleService.sendEmailCode(email);
+        HealthR healthR = healthJobTitleService.sendEmailCode(email);
         return HealthR.ok(healthR);
     }
 
     @PostMapping("/applyJoin")
-    public HealthR applyJoin(@RequestBody @Valid ApplyJoinDto applyJoinDto) {
+    public HealthR applyJoin(@RequestBody ApplyJoinDto applyJoinDto) {
-        HealthR healthR= healthJobTitleService.applyJoin(applyJoinDto);
+        HealthR healthR = healthJobTitleService.applyJoin(applyJoinDto);
         return HealthR.ok(healthR);
     }
 
-    @GetMapping("/findDoctorById")
+    @PostMapping("/checkCode")
-    public HealthR<DoctorVo> findDoctorById(@RequestHeader Integer doctorId,
+    public HealthR checkCode(@RequestBody CheckCodeDto checkCodeDto) {
-                                            @RequestHeader String sessionId) {
+        String email = checkCodeDto.getEmail();
-        return HealthR.ok(healthJobTitleService.findDoctorById(doctorId));
+        String code = checkCodeDto.getCode();
+        HealthR healthR = healthJobTitleService.checkCode(email, code);
+        return healthR;
     }
+
     @GetMapping("/findSystemImagePic")
     public HealthR<List<FindImagePicVo>> findSystemImagePic() {
         return HealthR.ok(healthJobTitleService.findSystemImagePic());

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

@@ -1,58 +0,0 @@
-package doctor.controller;
-
-import doctor.common.core.domain.HealthR;
-import doctor.domain.vo.DoctorIncomeRecordVo;
-import doctor.domain.vo.DoctorVo;
-import doctor.domain.vo.NoticeReadNumVo;
-import doctor.domain.vo.WalletVo;
-import doctor.service.HealthJobTitleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/verify/v1")
-public class HealthRVerifyController {
-    @Autowired
-    private HealthJobTitleService healthJobTitleService;
-
-    @GetMapping("/findDoctorWallet")
-    public HealthR<WalletVo> findDoctorWallet(@RequestHeader Integer doctorId,
-                                              @RequestHeader String sessionId) {
-
-        WalletVo healthR = healthJobTitleService.findDoctorWallet(doctorId);
-        return HealthR.ok(healthR);
-    }
-
-    @PostMapping("/uploadImagePic")
-    public HealthR uploadImagePic(@RequestParam("imagePic") MultipartFile imagePic,
-                                  @RequestHeader String sessionId,
-                                  @RequestHeader Integer doctorId) {
-        return HealthR.ok(healthJobTitleService.uploadImagePic(imagePic, doctorId, sessionId));
-    }
-
-    @GetMapping("/findDoctorIncomeRecordList")
-    public HealthR<List<DoctorIncomeRecordVo>> findDoctorIncomeRecordList(@RequestHeader Integer doctorId,
-                                                                          @RequestHeader String sessionId,
-                                                                          @RequestParam Integer page,
-                                                                          @RequestParam Integer count) {
-        List<DoctorIncomeRecordVo> doctorIncomeRecordEntities = healthJobTitleService.findDoctorIncomeRecordList(doctorId, page, count);
-        return HealthR.ok(doctorIncomeRecordEntities);
-    }
-
-    @GetMapping("/findDoctorById")
-    public HealthR<DoctorVo> findDoctorById(@RequestHeader Integer doctorId,
-                                            @RequestHeader String sessionId) {
-        return HealthR.ok(healthJobTitleService.findDoctorById(doctorId));
-    }
-
-    @GetMapping("/findDoctorNoticeReadNum")
-    public HealthR<List<NoticeReadNumVo>> findDoctorNoticeReadNum(@RequestHeader Integer doctorId,
-                                                                  @RequestHeader String sessionId) {
-        List<NoticeReadNumVo> healthR = healthJobTitleService.findDoctorNoticeReadNum(doctorId);
-        return HealthR.ok(healthR);
-    }
-
-}

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

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

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

@@ -1,35 +0,0 @@
-package doctor.controller;
-
-import doctor.common.core.domain.HealthR;
-import doctor.domain.vo.UserSickCircleVo;
-import doctor.service.UserSickCircleService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-import static com.github.pagehelper.page.PageMethod.startPage;
-
-/**
- * @ClassName : SickCircleController
- * @Description : 病友圈
- * @Author : FJJ
- * @Date: 2024-01-16 22:08
- */
-@RestController
-@RequestMapping("/user/sickCircle/verify/v1")
-public class UserSickCircleController {
-    @Autowired
-    private UserSickCircleService userSickCircleService;
-    //查看我的病友圈
-    @GetMapping("/findMySickCircleList")
-    public HealthR<List<UserSickCircleVo>> findMySickCircleList(@RequestParam Integer page, @RequestParam Integer count){
-        startPage(page,count);
-        List<UserSickCircleVo> userFriendCircles = userSickCircleService.findMySickCircleList();
-        return HealthR.ok(userFriendCircles);
-    }
-
-}

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

@@ -1,14 +1,13 @@
 package doctor.controller;
 
 import doctor.common.core.domain.HealthR;
-import doctor.domain.dto.UserArchivesDto;
+import doctor.domain.entity.UserWalletEntity;
-import doctor.domain.entity.*;
+import doctor.domain.vo.UserVideoBuyVo;
-import doctor.domain.vo.*;
+import doctor.domain.vo.UserVideoCollectionVo;
 import doctor.service.UserVideoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 
 import static com.github.pagehelper.page.PageMethod.startPage;
@@ -28,15 +27,15 @@ public class UserVideoController {
 
     //用户视频收藏列表
     @GetMapping("/findVideoCollectionList")
-    public HealthR<List<UserVideoCollectionVo>> findVideoCollectionList(@RequestParam Integer page, @RequestParam Integer count,@RequestHeader Integer userId){
+    public HealthR<List<UserVideoCollectionVo>> findVideoCollectionList(@RequestParam Integer page, @RequestParam Integer count){
         startPage(page,count);
-      List<UserVideoCollectionVo>  userVideoCollectionVos=userVideoService.findVideoCollectionList(userId);
+      List<UserVideoCollectionVo>  userVideoCollectionVos=userVideoService.findVideoCollectionList();
         return HealthR.ok(userVideoCollectionVos);
     }
     //用户取消视频收藏
-    @DeleteMapping("/cancelVideoCollection")
+    @GetMapping("/cancelVideoCollection/{id}")
-    public HealthR cancelVideoCollection(@RequestHeader Integer userId,@RequestHeader String sessionId,@RequestParam Integer videoId ){
+    public HealthR cancelVideoCollection(@PathVariable Integer id){
-        userVideoService.cancelVideoCollection(userId,sessionId,videoId);
+        userVideoService.cancelVideoCollection(id);
         return HealthR.ok();
     }
     //用户购买视频列表
@@ -47,9 +46,9 @@ public class UserVideoController {
         return HealthR.ok(userVideoCollectionVos);
     }
     //用户删除购买的视频
-    @DeleteMapping("/deleteVideoBuy}")
+    @DeleteMapping("/deleteVideoBuy/{id}")
-    public HealthR deleteVideoBuy(@RequestParam Integer videoId){
+    public HealthR deleteVideoBuy(@PathVariable Integer id){
-        userVideoService.deleteVideoBuy(videoId);
+        userVideoService.deleteVideoBuy(id);
         return HealthR.ok();
     }
 
@@ -59,52 +58,6 @@ public class UserVideoController {
         List<UserWalletEntity> userWallets = userVideoService.findUserWallet();
         return HealthR.ok(userWallets);
     }
-    //用户消费记录
-    @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 Integer id){
-        userVideoService.uploadUserArchivesImg(id);
-        return HealthR.ok();
-    }
-
-    //用户关注医生列表
 
 }

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

@@ -3,7 +3,6 @@ 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.*;
@@ -22,9 +21,9 @@ public class VideoController {
     @Autowired
     private VideoService videoService;
     //收藏健康讲堂视频列表
-    @PostMapping("/verify/v1/addUserVideoCollection")
+    @PostMapping("/verify/v1/addUserVideoCollection/{videoId}")
-    public HealthR addUserVideoCollection(@RequestParam  Integer videoId,@RequestHeader Integer userId){
+    public HealthR addUserVideoCollection(@RequestParam Integer videoId){
-        videoService.addUserVideoCollection(videoId,userId);
+        videoService.addUserVideoCollection(videoId);
         return HealthR.ok();
     }
     //购买健康讲堂视频
@@ -33,12 +32,11 @@ public class VideoController {
         videoService.videoBuy(videoId,price);
         return HealthR.ok();
     }
-
+//    //视频评论列表
-    //评论列表
+//    @GetMapping("/v1/findVideoCommentList")
-    @GetMapping("/v1/findVideoCommentList")
+//    public R<List<VideoCommentEntity>> findVideoCommentList(){
-    public HealthR<List<VideoCommentVo>> findVideoCommentList(@RequestParam Integer videoId) {
+//        List<VideoCommentEntity> videoCommentList = videoService.findVideoCommentList();
-        List<VideoCommentVo> videoCommentVoList = videoService.findVideoCommentList(videoId);
+//        return R.ok(videoCommentList);
-        return HealthR.ok(videoCommentVoList);
+//    }
-    }
 
 }

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

@@ -2,37 +2,15 @@ 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 {
+public class ApplyJoinDto {
-    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/UserArchivesDto.java

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

@@ -1,25 +0,0 @@
-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,22 +4,11 @@ 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;
-    @NotNull(message = "页码不能为空")
+    private Integer count=1;
-    @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/TaskEntity.java

@@ -1,20 +0,0 @@
-package doctor.domain.entity;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @ClassName : TaskEntity
- * @Description : 任务表
- * @Author : FJJ
- * @Date: 2024-01-17 10:59
- */
-@Data
-public class TaskEntity {
-    private Integer id;
-    private String taskName;
-    private String taskType;
-    private String reward;
-    private Date createTime;
-}

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

@@ -1,7 +1,6 @@
 package doctor.domain.entity;
 
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -15,18 +14,10 @@ import java.util.Date;
 public class UserArchivesEntity {
     private Integer id;
     private Integer userId;
-    private String diseaseMain;
+    private String bankCardNumber;
-    private String diseaseNow;
+    private String bankName;
-    private String diseaseBefore;
+    private Integer bankCardType;
-    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() {
@@ -45,68 +36,28 @@ public class UserArchivesEntity {
         this.userId = userId;
     }
 
-    public String getDiseaseMain() {
+    public String getBankCardNumber() {
-        return diseaseMain;
+        return bankCardNumber;
     }
 
-    public void setDiseaseMain(String diseaseMain) {
+    public void setBankCardNumber(String bankCardNumber) {
-        this.diseaseMain = diseaseMain;
+        this.bankCardNumber = bankCardNumber;
     }
 
-    public String getDiseaseNow() {
+    public String getBankName() {
-        return diseaseNow;
+        return bankName;
     }
 
-    public void setDiseaseNow(String diseaseNow) {
+    public void setBankName(String bankName) {
-        this.diseaseNow = diseaseNow;
+        this.bankName = bankName;
     }
 
-    public String getDiseaseBefore() {
+    public Integer getBankCardType() {
-        return diseaseBefore;
+        return bankCardType;
     }
 
-    public void setDiseaseBefore(String diseaseBefore) {
+    public void setBankCardType(Integer bankCardType) {
-        this.diseaseBefore = diseaseBefore;
+        this.bankCardType = bankCardType;
-    }
-
-    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/UserEntity.java

@@ -4,11 +4,6 @@ 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;
 
 /**
@@ -20,29 +15,19 @@ import java.util.Date;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class UserEntity implements Serializable {
+public class UserEntity {
-    @NotBlank(message = "用户ID不能为空")
     private Integer id;
-
-    @NotBlank(message = "手机号不能为空")
-    @Pattern(regexp = "^1[0-9]{10}$", message = "请输入有效的手机号")
     private String phone;
-
-    @NotBlank(message = "密码不能为空")
-    @Size(min = 1, message = "密码长度不能小于1")
     private String pwd;
-
-    @NotBlank(message = "邮箱不能为空")
-    @Email(message = "请输入有效的邮箱地址")
     private String email;
-
-    @NotBlank(message = "昵称不能为空")
     private String nickName;
-
-    @NotBlank(message = "用户名不能为空")
     private String userName;
-
+    private String headPic;
-
+    private Integer sex;
+    private Integer age;
+    private String height;
+    private String weight;
+    private String invitationCode;
     private Date updateTime;
     private Long createTime;
 

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

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

@@ -1,21 +0,0 @@
-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/UserVideoBuyEntity.java

@@ -1,27 +1,56 @@
 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")
+    private Long createTime;
-    @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 Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public UserVideoBuyEntity(Integer id, Integer userId, Integer videoId, Long createTime) {
+        this.id = id;
+        this.userId = userId;
+        this.videoId = videoId;
+        this.createTime = createTime;
+    }
+
+    public UserVideoBuyEntity() {
+    }
 }

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

@@ -1,10 +1,5 @@
 package doctor.domain.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
 /**
  * @ClassName : UserVideoCollectionEntity
  * @Description : 用户视频收藏表
@@ -16,11 +11,7 @@ public class UserVideoCollectionEntity {
     private Integer id;
     private Integer userId;
     private Integer videoId;
-
+    private Long createTime;
-    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() {
         return id;
@@ -46,19 +37,21 @@ public class UserVideoCollectionEntity {
         this.videoId = videoId;
     }
 
-    public Date getCreateTime() {
+    public Long getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(Long createTime) {
         this.createTime = createTime;
     }
 
-    public String getOriginal() {
+    public UserVideoCollectionEntity(Integer id, Integer userId, Integer videoId, Long createTime) {
-        return original;
+        this.id = id;
+        this.userId = userId;
+        this.videoId = videoId;
+        this.createTime = createTime;
     }
 
-    public void setOriginal(String original) {
+    public UserVideoCollectionEntity() {
-        this.original = original;
     }
 }

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

@@ -1,8 +1,5 @@
 package doctor.domain.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
 import java.util.Date;
 
 /**
@@ -17,8 +14,6 @@ public class VideoCommentEntity {
     private Integer userId;
     private Integer videoId;
     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() {

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

@@ -26,7 +26,5 @@ public class VideoEntity {
     private String originalUrl;
     private Integer duration;
     private Integer price;
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Long createTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Date createTime;
 }

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

@@ -4,8 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * @BelongsProject: Medical_Treatment
  * @BelongsPackage: doctor.domain.vo
@@ -17,7 +15,6 @@ import javax.validation.constraints.NotNull;
 @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/UserAdoptCommentVo.java

@@ -1,73 +0,0 @@
-package doctor.domain.vo;
-
-/**
- * @ClassName : UserAdoptCommentVo
- * @Description : 用户被采纳的建议
- * @Author : FJJ
- * @Date: 2024-01-15 19:46
- */
-public class UserAdoptCommentVo {
-    private Integer releaseUserId;
-    private String releaseUserNickName;
-    private String releaseUserHeadPic;
-    private String title;
-    private String disease;
-    private long  adoptTime;
-    private String   content;
-
-    public Integer getReleaseUserId() {
-        return releaseUserId;
-    }
-
-    public void setReleaseUserId(Integer releaseUserId) {
-        this.releaseUserId = releaseUserId;
-    }
-
-    public String getReleaseUserNickName() {
-        return releaseUserNickName;
-    }
-
-    public void setReleaseUserNickName(String releaseUserNickName) {
-        this.releaseUserNickName = releaseUserNickName;
-    }
-
-    public String getReleaseUserHeadPic() {
-        return releaseUserHeadPic;
-    }
-
-    public void setReleaseUserHeadPic(String releaseUserHeadPic) {
-        this.releaseUserHeadPic = releaseUserHeadPic;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getDisease() {
-        return disease;
-    }
-
-    public void setDisease(String disease) {
-        this.disease = disease;
-    }
-
-    public long getAdoptTime() {
-        return adoptTime;
-    }
-
-    public void setAdoptTime(long adoptTime) {
-        this.adoptTime = adoptTime;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-}

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

@@ -7,14 +7,5 @@ package doctor.domain.vo;
  * @Date: 2024-01-12 18:52
  */
 public class UserArchivesVo {
-    private Integer userId;
+    private Integer recordId;
-    private Integer archivesId;
-    private String diseaseMain;
-    private String diseaseNow;
-    private String diseaseBefore;
-    private String treatmentHospitalRecent;
-    private String treatmentProcess;
-    private long treatmentStartTime;
-    private long treatmentEndTime;
-    private String picture;
 }

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

@@ -1,55 +0,0 @@
-package doctor.domain.vo;
-
-/**
- * @ClassName : UserConsumptionRecordVo
- * @Description : 消费记录表
- * @Author : FJJ
- * @Date: 2024-01-14 15:30
- */
-public class UserConsumptionRecordVo {
-    private Integer direction;
-    private Integer type;
-    private Integer changeNum;
-    private String remark;
-    private long createTime;
-
-    public Integer getDirection() {
-        return direction;
-    }
-
-    public void setDirection(Integer direction) {
-        this.direction = direction;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getChangeNum() {
-        return changeNum;
-    }
-
-    public void setChangeNum(Integer changeNum) {
-        this.changeNum = changeNum;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(long createTime) {
-        this.createTime = createTime;
-    }
-}

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

@@ -1,24 +0,0 @@
-package doctor.domain.vo;
-
-import lombok.Data;
-
-/**
- * @ClassName : UserDoctorFollowVo
- * @Description : 用户关注医生
- * @Author : FJJ
- * @Date: 2024-01-16 22:20
- */
-@Data
-public class UserDoctorFollowVo {
-    private Integer id;
-    private Integer doctorId;
-    private String name;
-    private String imagePic;
-    private String jobTitle;
-    private String inauguralHospital;
-    private Integer departmentId;
-    private String departmentName;
-    private Integer praiseNum;
-    private Integer badNum;
-    private Integer number;
-}

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

@@ -1,57 +0,0 @@
-package doctor.domain.vo;
-
-import java.util.Date;
-
-/**
- * @ClassName : UserInfoCollectionVo
- * @Description : 用户资讯列表
- * @Author : FJJ
- * @Date: 2024-01-15 11:52
- */
-public class UserInfoCollectionVo {
-    private Integer id;
-    private Integer infoId;
-    private String title;
-    private String thumbnail;
-    private Date createTime;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getInfoId() {
-        return infoId;
-    }
-
-    public void setInfoId(Integer infoId) {
-        this.infoId = infoId;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getThumbnail() {
-        return thumbnail;
-    }
-
-    public void setThumbnail(String thumbnail) {
-        this.thumbnail = thumbnail;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-}

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

@@ -1,20 +0,0 @@
-package doctor.domain.vo;
-
-import lombok.Data;
-
-/**
- * @ClassName : UserSickCircleVo
- * @Description : 患者朋友圈
- * @Author : FJJ
- * @Date: 2024-01-16 22:04
- */
-@Data
-public class UserSickCircleVo {
-    private Integer sickCircleId;
-    private String title;
-    private String detail;
-    private Integer amount;
-    private Integer collectionNum;
-    private Integer commentNum;
-    private long releaseTime;
-}

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

@@ -1,19 +0,0 @@
-package doctor.domain.vo;
-
-import lombok.Data;
-
-/**
- * @ClassName : UserTaskRecordVo
- * @Description : 用户任务
- * @Author : FJJ
- * @Date: 2024-01-17 10:50
- */
-@Data
-public class UserTaskRecordVo {
-    private Integer id;
-    private String taskName;
-    private Integer taskType;
-    private Integer reward;
-    private Integer whetherFinish;
-    private Integer whetherReceive;
-}

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

@@ -1,21 +1,13 @@
 package doctor.domain.vo;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 /**
  * @ClassName : UserVideoCollectionVo
  * @Description : 用户视频收藏表
  * @Author : FJJ
  * @Date: 2024-01-12 16:11
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 public class UserVideoCollectionVo {
     private Integer id;
-    private Integer videoId;
     private String title;
     private String shearUrl;
     private String original;
@@ -24,4 +16,76 @@ public class UserVideoCollectionVo {
     private Integer whetherBuy;
     private Integer buyNum;
     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 String getShearUrl() {
+        return shearUrl;
+    }
+
+    public void setShearUrl(String shearUrl) {
+        this.shearUrl = shearUrl;
+    }
+
+    public String getOriginal() {
+        return original;
+    }
+
+    public void setOriginal(String original) {
+        this.original = original;
+    }
+
+    public Integer getPrice() {
+        return price;
+    }
+
+    public void setPrice(Integer price) {
+        this.price = price;
+    }
+
+    public Integer getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Integer duration) {
+        this.duration = duration;
+    }
+
+    public Integer getWhetherBuy() {
+        return whetherBuy;
+    }
+
+    public void setWhetherBuy(Integer whetherBuy) {
+        this.whetherBuy = whetherBuy;
+    }
+
+    public Integer getBuyNum() {
+        return buyNum;
+    }
+
+    public void setBuyNum(Integer buyNum) {
+        this.buyNum = buyNum;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
 }

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

@@ -3,11 +3,6 @@ package doctor.domain.vo;
 import lombok.Data;
 import org.apache.catalina.User;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
 /**
  * @BelongsProject: Medical_Treatment
  * @BelongsPackage: doctor.vo
@@ -16,19 +11,15 @@ import javax.validation.constraints.Size;
  */
 @Data
 public class UserVo {
-    @NotBlank(message = "密码不能为空")
-    @Size(min = 4, message = "密码长度不能小于4")
     private String pwd;
-
+    //邮箱
-    @NotBlank(message = "邮箱不能为空")
-    @Email(message = "请输入有效的邮箱地址")
     private String email;
-
+    //昵称
-    @NotBlank(message = "昵称不能为空")
     private String nickName;
-
+    //验证码
-    @NotBlank(message = "验证码不能为空")
-    @Pattern(regexp = "\\d{4}", message = "验证码必须是6位数字")
     private String code;
 
+    public static User toUser(UserVo userVo) {
+        return null;
+    }
 }

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

@@ -1,13 +0,0 @@
-package doctor.domain.vo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class VideoCommentVo {
-    private Integer id;
-    private String content;
-}

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

@@ -1,10 +1,10 @@
 package doctor.mapper;
 
 
-import doctor.domain.entity.UserVideoBuyEntity;
+import doctor.domain.dto.VideoDto;
-import doctor.domain.entity.UserVideoCollectionEntity;
 import doctor.domain.entity.VideoCategoryEntity;
 import doctor.domain.entity.VideoEntity;
+import doctor.domain.vo.VideoCategoryVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -13,10 +13,4 @@ public interface HealthUserVideoMapper {
     List<VideoCategoryEntity> findVideoCategoryList();
 
     List<VideoEntity> findVideoVoList(@Param("categoryId") Integer categoryId);
-
-    UserVideoCollectionEntity selectWhetherCollectionByUserIdAndVideoId(@Param("userId") Integer userId, @Param("id") Integer id);
-
-    UserVideoBuyEntity selectWhetherBuyByUserIdAndVideoId(@Param("userId") Integer userId, @Param("id") Integer id);
-
-    Integer selectVideoBuyNum(@Param("id") Integer id);
 }

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

@@ -1,17 +0,0 @@
-package doctor.mapper;
-
-import doctor.domain.entity.UserSickCircleEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * @ClassName : UserSickCircleMapper
- * @Description :
- * @Author : FJJ
- * @Date: 2024-01-16 22:09
- */
-@Mapper
-public interface UserSickCircleMapper {
-    List<UserSickCircleEntity> findUserSickCircleList();
-}

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

@@ -1,7 +1,8 @@
 package doctor.mapper;
 
-import doctor.domain.dto.UserArchivesDto;
+import doctor.domain.entity.UserVideoBuyEntity;
-import doctor.domain.entity.*;
+import doctor.domain.entity.UserVideoCollectionEntity;
+import doctor.domain.entity.UserWalletEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,29 +16,13 @@ import java.util.List;
  */
 @Mapper
 public interface UserVideoMapper {
-    List<UserVideoCollectionEntity> findVideoCollectionList(@Param("userId") Integer userId);
+    List<UserVideoCollectionEntity> findVideoCollectionList();
 
-    void cancelVideoCollection(@Param("videoId") Integer videoId);
+    void cancelVideoCollection(@Param("id") Integer id);
 
     List<UserVideoBuyEntity> findUserVideoBuyList();
 
-    void deleteVideoBuy(@Param("videoId") Integer videoId);
+    void deleteVideoBuy(@Param("id") Integer id);
 
     List<UserWalletEntity> findUserWallet();
-
-    List<UserConsumptionRecordEntity> findUserConsumptionRecordList();
-
-    List<UserEntity> findUserEntityList(@Param("userId") Integer userId);
-
-    List<UserInfoCollectionEntity> findUserInfoCollectionList();
-
-    List<UserAdoptCommentEntity> findMyAdoptedCommentList();
-
-    List<UserArchivesEntity> findUserArchives(@Param("userId") Integer userId);
-
-    void addUserArchives(UserArchivesEntity userArchivesEntity, @Param("userId") Integer userId);
-
-    void uploadUserArchivesImg(@Param("id") Integer id);
-
-
 }

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

@@ -31,7 +31,7 @@ public interface VideoMapper {
 
     void updateUserWallet(@Param("newblance") int newblance, @Param("id") Integer id);
 
-    List<VideoCommentEntity> findVideoCommentList(@Param("videoId") Integer videoId);
+
 
 
 //    UserWalletEntity FindById(@Param("userId") Integer userId);

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

@@ -2,6 +2,9 @@ package doctor.service;
 
 
 
+import doctor.domain.dto.VideoDto;
+import doctor.domain.entity.VideoCategoryEntity;
+import doctor.domain.entity.VideoEntity;
 import doctor.domain.vo.VideoCategoryVo;
 import doctor.domain.vo.VideoVo;
 
@@ -10,5 +13,5 @@ import java.util.List;
 public interface HealthUserVideoService {
     List<VideoCategoryVo> findVideoCategoryList();
 
-    List<VideoVo> findVideoVoList(Integer categoryId, Integer userId);
+    List<VideoVo> findVideoVoList(Integer categoryId);
 }

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

@@ -1,16 +0,0 @@
-package doctor.service;
-
-import doctor.domain.vo.UserSickCircleVo;
-
-import java.util.List;
-
-/**
- * @ClassName : UserSickCircleService
- * @Description :
- * @Author : FJJ
- * @Date: 2024-01-16 22:09
- */
-public interface UserSickCircleService {
-
-    List<UserSickCircleVo> findMySickCircleList();
-}

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

@@ -1,11 +1,10 @@
 package doctor.service;
 
-import doctor.domain.dto.UserArchivesDto;
+import doctor.domain.entity.UserVideoBuyEntity;
-import doctor.domain.entity.UserAdoptCommentEntity;
+import doctor.domain.entity.UserVideoCollectionEntity;
-import doctor.domain.entity.UserArchivesEntity;
-import doctor.domain.entity.UserEntity;
 import doctor.domain.entity.UserWalletEntity;
-import doctor.domain.vo.*;
+import doctor.domain.vo.UserVideoBuyVo;
+import doctor.domain.vo.UserVideoCollectionVo;
 
 import java.util.List;
 
@@ -18,30 +17,13 @@ import java.util.List;
 public interface UserVideoService {
 
 
-
+    void cancelVideoCollection(Integer id);
 
     List<UserVideoBuyVo> findUserVideoBuyList();
 
-    void deleteVideoBuy(Integer videoId);
+    void deleteVideoBuy(Integer id);
 
     List<UserWalletEntity> findUserWallet();
 
-    List<UserVideoCollectionVo> findVideoCollectionList(Integer userId);
+    List<UserVideoCollectionVo> findVideoCollectionList();
-
-    void cancelVideoCollection(Integer userId, String sessionId, Integer videoId);
-
-    List<UserConsumptionRecordVo> findUserConsumptionRecordList();
-
-    List<UserEntity> whetherSignToday(Integer userId);
-
-    List<UserInfoCollectionVo> findUserInfoCollectionList();
-
-    List<UserAdoptCommentVo> findMyAdoptedCommentList();
-
-    List<UserArchivesVo> findUserArchives(Integer userId);
-
-    void addUserArchives(UserArchivesEntity userArchivesEntity, Integer userId);
-
-    void uploadUserArchivesImg(Integer id);
-
 }

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

@@ -1,7 +1,6 @@
 package doctor.service;
 
 import doctor.domain.entity.*;
-import doctor.domain.vo.VideoCommentVo;
 
 import java.util.List;
 
@@ -13,11 +12,10 @@ import java.util.List;
  */
 public interface VideoService {
 
-    void addUserVideoCollection(Integer videoId,Integer userId);
+    void addUserVideoCollection(Integer videoId);
 
 
     void videoBuy(Integer videoId,Integer price);
 
 
-    List<VideoCommentVo> findVideoCommentList(Integer videoId);
 }

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

@@ -1,10 +1,7 @@
 package doctor.service.impl;
 
 
-import doctor.common.security.service.TokenService;
+import doctor.domain.dto.VideoDto;
-import doctor.common.security.utils.SecurityUtils;
-import doctor.domain.entity.UserVideoBuyEntity;
-import doctor.domain.entity.UserVideoCollectionEntity;
 import doctor.domain.entity.VideoCategoryEntity;
 import doctor.domain.entity.VideoEntity;
 import doctor.domain.vo.VideoCategoryVo;
@@ -12,10 +9,10 @@ import doctor.domain.vo.VideoVo;
 import doctor.mapper.HealthUserVideoMapper;
 import doctor.service.HealthUserVideoService;
 import doctor.util.ConvertUtil;
+import io.netty.util.internal.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Service
@@ -23,9 +20,6 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService {
     @Autowired
     private HealthUserVideoMapper healthUserVideoMapper;
 
-    @Autowired
-    private TokenService tokenService;
-
     @Override
     public List<VideoCategoryVo> findVideoCategoryList() {
 
@@ -35,26 +29,9 @@ public class HealthUserVideoServiceImpl implements HealthUserVideoService {
     }
 
     @Override
-    public List<VideoVo> findVideoVoList(Integer categoryId, Integer userId) {
+    public List<VideoVo> findVideoVoList(Integer categoryId) {
         List<VideoEntity> videoVoList = healthUserVideoMapper.findVideoVoList(categoryId);
         List<VideoVo> videoVos = ConvertUtil.entityToVoList(videoVoList, VideoVo.class);
-        videoVos.forEach(video -> {
-            UserVideoCollectionEntity userVideoCollection = healthUserVideoMapper.selectWhetherCollectionByUserIdAndVideoId(userId,video.getId());
-            if(userVideoCollection!=null){
-                video.setWhetherCollection(1);
-            }else {
-                video.setWhetherCollection(2);
-            }
-            UserVideoBuyEntity userVideoBuy  = healthUserVideoMapper.selectWhetherBuyByUserIdAndVideoId(userId,video.getId());
-            if(userVideoBuy!=null){
-                video.setWhetherBuy(1);
-            }else {
-                video.setWhetherBuy(2);
-            }
-            Integer buyNum = healthUserVideoMapper.selectVideoBuyNum(video.getId());
-            video.setBuyNum(buyNum);
-        });
-
         return videoVos;
     }
 }

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

@@ -1,30 +0,0 @@
-package doctor.service.impl;
-
-import doctor.domain.entity.UserSickCircleEntity;
-import doctor.domain.vo.UserSickCircleVo;
-import doctor.mapper.UserSickCircleMapper;
-import doctor.mapper.UserVideoMapper;
-import doctor.service.UserSickCircleService;
-import doctor.util.ConvertUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @ClassName : UserSickCircleServiceImpl
- * @Description :
- * @Author : FJJ
- * @Date: 2024-01-16 22:10
- */
-@Service
-public class UserSickCircleServiceImpl implements UserSickCircleService {
-    @Autowired
-    private UserSickCircleMapper userSickCircleMapper;
-    @Override
-    public List<UserSickCircleVo> findMySickCircleList() {
-        List<UserSickCircleEntity> userSickCircleEntityList=userSickCircleMapper.findUserSickCircleList();
-        List<UserSickCircleVo> userSickCircleVoList = ConvertUtil.entityToVoList(userSickCircleEntityList, UserSickCircleVo.class);
-        return userSickCircleVoList;
-    }
-}

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

@@ -1,8 +1,10 @@
 package doctor.service.impl;
 
-import doctor.domain.dto.UserArchivesDto;
+import doctor.domain.entity.UserVideoBuyEntity;
-import doctor.domain.entity.*;
+import doctor.domain.entity.UserVideoCollectionEntity;
-import doctor.domain.vo.*;
+import doctor.domain.entity.UserWalletEntity;
+import doctor.domain.vo.UserVideoBuyVo;
+import doctor.domain.vo.UserVideoCollectionVo;
 import doctor.mapper.UserVideoMapper;
 import doctor.service.UserVideoService;
 import doctor.util.ConvertUtil;
@@ -24,64 +26,17 @@ public class UserVideoServiceImpl implements UserVideoService {
 
 
     @Override
-    public List<UserVideoCollectionVo> findVideoCollectionList(Integer userId) {
+    public List<UserVideoCollectionVo> findVideoCollectionList() {
-        List<UserVideoCollectionEntity> userVideoCollectionEntityList=userVideoMapper.findVideoCollectionList(userId);
+        List<UserVideoCollectionEntity> userVideoCollectionEntityList=userVideoMapper.findVideoCollectionList();
         List<UserVideoCollectionVo> userVideoCollectionVoList = ConvertUtil.entityToVoList(userVideoCollectionEntityList, UserVideoCollectionVo.class);
         return userVideoCollectionVoList;
     }
 
     @Override
-    public void cancelVideoCollection(Integer userId, String sessionId, Integer videoId) {
+    public void cancelVideoCollection(Integer id) {
-        userVideoMapper.cancelVideoCollection(videoId);
+        userVideoMapper.cancelVideoCollection(id);
     }
 
-    @Override
-    public List<UserConsumptionRecordVo> findUserConsumptionRecordList() {
-        List<UserConsumptionRecordEntity> userConsumptionRecordEntityList=userVideoMapper.findUserConsumptionRecordList();
-        List<UserConsumptionRecordVo> userConsumptionRecordVoList = ConvertUtil.entityToVoList(userConsumptionRecordEntityList, UserConsumptionRecordVo.class);
-        return userConsumptionRecordVoList;
-    }
-
-    @Override
-    public List<UserEntity> whetherSignToday(Integer userId) {
-        List<UserEntity> userEntityList=userVideoMapper.findUserEntityList(userId);
-        return userEntityList;
-    }
-
-    @Override
-    public List<UserInfoCollectionVo> findUserInfoCollectionList() {
-        List<UserInfoCollectionEntity> userVideoCollectionEntityList=userVideoMapper.findUserInfoCollectionList();
-        List<UserInfoCollectionVo> userVideoCollectionVoList = ConvertUtil.entityToVoList(userVideoCollectionEntityList, UserInfoCollectionVo.class);
-        return userVideoCollectionVoList;
-    }
-
-    @Override
-    public List<UserAdoptCommentVo> findMyAdoptedCommentList() {
-        List<UserAdoptCommentEntity> userAdoptCommentEntityList=userVideoMapper.findMyAdoptedCommentList();
-        List<UserAdoptCommentVo> userAdoptCommentVoList = ConvertUtil.entityToVoList(userAdoptCommentEntityList, UserAdoptCommentVo.class);
-        return userAdoptCommentVoList;
-    }
-
-    @Override
-    public List<UserArchivesVo> findUserArchives(Integer userId) {
-        List<UserArchivesEntity> userArchivesEntityList=userVideoMapper.findUserArchives(userId);
-        List<UserArchivesVo> userArchivesVoList = ConvertUtil.entityToVoList(userArchivesEntityList, UserArchivesVo.class);
-        return userArchivesVoList;
-    }
-
-    @Override
-    public void addUserArchives(UserArchivesEntity userArchivesEntity,Integer userId) {
-        userVideoMapper.addUserArchives(userArchivesEntity,userId);
-    }
-
-    @Override
-    public void uploadUserArchivesImg(Integer id) {
-        userVideoMapper.uploadUserArchivesImg(id);
-    }
-
-
-
-
     @Override
     public List<UserVideoBuyVo> findUserVideoBuyList() {
         List<UserVideoBuyEntity> userVideoCollectionEntityList=userVideoMapper.findUserVideoBuyList();
@@ -90,8 +45,8 @@ public class UserVideoServiceImpl implements UserVideoService {
     }
 
     @Override
-    public void deleteVideoBuy(Integer videoId) {
+    public void deleteVideoBuy(Integer id) {
-        userVideoMapper.deleteVideoBuy(videoId);
+        userVideoMapper.deleteVideoBuy(id);
     }
 
     @Override

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

@@ -2,10 +2,8 @@ package doctor.service.impl;
 
 import doctor.common.core.utils.JwtUtils;
 import doctor.domain.entity.*;
-import doctor.domain.vo.VideoCommentVo;
 import doctor.mapper.VideoMapper;
 import doctor.service.VideoService;
-import doctor.util.ConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,7 +23,10 @@ public class VideoServiceImpl implements VideoService {
     @Autowired
     private HttpServletRequest request;
     @Override
-    public void addUserVideoCollection(Integer videoId,Integer userId) {
+    public void addUserVideoCollection(Integer videoId) {
+        //获取用户id
+        String token = request.getHeader("token");
+        Integer userId = Integer.valueOf(JwtUtils.getUserId(token));
         // 添加收藏
         videoMapper.addUserVideoCollection(userId,videoId);
         // 更新视频收藏数
@@ -52,12 +53,5 @@ public class VideoServiceImpl implements VideoService {
         }
     }
 
-    @Override
-    public List<VideoCommentVo> findVideoCommentList(Integer videoId) {
-        List<VideoCommentEntity> videoCommentEntityList = videoMapper.findVideoCommentList(videoId);
-        List<VideoCommentVo> videoCommentVoList = ConvertUtil.entityToVoList(videoCommentEntityList, VideoCommentVo.class);
-        return videoCommentVoList;
-    }
-
 
 }

doctor-modules/doctor-health/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -11,14 +11,5 @@
     <select id="findVideoVoList" resultType="doctor.domain.entity.VideoEntity">
         select * from video where category_id=#{categoryId}
     </select>
-    <select id="selectWhetherCollectionByUserIdAndVideoId" resultType="doctor.domain.entity.UserVideoCollectionEntity">
-        select * from user_video_collection where user_id=#{userId} and video_id=#{id}
-    </select>
-    <select id="selectWhetherBuyByUserIdAndVideoId" resultType="doctor.domain.entity.UserVideoBuyEntity">
-        select * from user_video_buy where user_id=#{userId} and video_id=#{id}
-    </select>
-    <select id="selectVideoBuyNum" resultType="java.lang.Integer">
-        select count(*) buyNum from user_video_buy where video_id=#{id}
-    </select>
 
 </mapper>

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

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

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

@@ -3,50 +3,19 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="doctor.mapper.UserVideoMapper">
-    <insert id="addUserArchives">
-        insert into user_archives (
-                user_id,
-disease_main,
-disease_now,
-disease_before,
-treatment_hospital_recent,
-treatment_process,
-treatment_start_time,
-treatment_end_time,
-picture,
-create_time
-
-        )
-        values (
-                #{userId},
-                #{diseaseMain},
-                #{diseaseNow},
-                #{diseaseBefore},
-                #{treatmentHospitalRecent},
-                #{treatmentProcess},
-                #{treatmentStartTime},
-                #{treatmentEndTime},
-                #{picture},
-                now()
-               );
-    </insert>
-    <update id="uploadUserArchivesImg">
-        update user_archives
-        set picture = #{picture}
-        where id=#{id}
-    </update>
     <delete id="cancelVideoCollection">
         delete
         from user_video_collection
-        where video_id = #{videoId}
+        where video_id = #{id}
     </delete>
     <delete id="deleteVideoBuy">
         delete
         from user_video_buy
-        where video_id = #{videoId}
+        where video_id = #{id}
     </delete>
     <select id="findVideoCollectionList" resultType="doctor.domain.entity.UserVideoCollectionEntity">
-        SELECT user_video_collection.*,video.original_url original FROM user_video_collection LEFT JOIN video ON video.id=user_video_collection.video_id where user_id=#{userId}
+        select *
+        from user_video_collection
     </select>
     <select id="findUserVideoBuyList" resultType="doctor.domain.entity.UserVideoBuyEntity">
         select *
@@ -56,24 +25,4 @@ create_time
         select *
         from user_wallet
     </select>
-    <select id="findUserConsumptionRecordList" resultType="doctor.domain.entity.UserConsumptionRecordEntity">
-        select *
-        from user_consumption_record
-    </select>
-    <select id="findUserEntityList" resultType="doctor.domain.entity.UserEntity">
-        select *
-        from user where id=#{userId}
-    </select>
-    <select id="findUserInfoCollectionList" resultType="doctor.domain.entity.UserInfoCollectionEntity">
-        SELECT user_info_collection.*,information.title,information.content,information.source FROM user_info_collection LEFT JOIN information ON user_info_collection.info_id =information.id
-    </select>
-    <select id="findMyAdoptedCommentList" resultType="doctor.domain.entity.UserAdoptCommentEntity">
-        select *
-        from user_adopt_comment
-    </select>
-    <select id="findUserArchives" resultType="doctor.domain.entity.UserArchivesEntity">
-        select *
-        from user_archives where user_id=#{userId}
-    </select>
-
 </mapper>

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

@@ -47,9 +47,6 @@
                  LEFT JOIN user ON user.id = user_wallet.user_id
         WHERE user_wallet.user_id==#{id}
     </select>
-    <select id="findVideoCommentList" resultType="doctor.domain.entity.VideoCommentEntity">
-        select * from video_comment where video_id=#{videoId}
-    </select>
 
 
 </mapper>

doctor-modules/doctor-job/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-modules/doctor-system/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
       config:
         # 配置中心地址
         server-addr: 101.34.77.101:8848
-        namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040
+        namespace: 9de208a6-cb30-41ae-a880-78196c99c050
         # 配置文件格式
         file-extension: yml
         # 共享配置

pom.xml

@@ -206,22 +206,6 @@
                 <version>${doctor.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-validation</artifactId>
-                <version>2.7.18</version>
-            </dependency>
-
-            <dependency>
-                <groupId>com.github.xiaoymin</groupId>
-                <artifactId>knife4j-spring-boot-starter</artifactId>
-                <version>2.0.9</version>
-            </dependency>
-
-
-
-
-
         </dependencies>
     </dependencyManagement>