From 227ba63d995966d81327be27d1e6bd8c5f4df1ee Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Thu, 11 Jan 2024 22:26:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=90=88=E5=B9=B61?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/doctor/system/api/domain/Doctor.java | 10 +++++----- .../java/doctor/auth/service/HealthDoctorService.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Doctor.java b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Doctor.java index 99c9769..f97c181 100644 --- a/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Doctor.java +++ b/doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Doctor.java @@ -12,7 +12,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; @@ -82,12 +82,12 @@ public class Doctor { this.phone = phone; } - public String getPassword() { - return password; + public String getPwd() { + return pwd; } - public void setPassword(String password) { - this.password = password; + public void setPwd(String pwd) { + this.pwd = pwd; } public String getName() { diff --git a/doctor-auth/src/main/java/doctor/auth/service/HealthDoctorService.java b/doctor-auth/src/main/java/doctor/auth/service/HealthDoctorService.java index eed8814..0494e68 100644 --- a/doctor-auth/src/main/java/doctor/auth/service/HealthDoctorService.java +++ b/doctor-auth/src/main/java/doctor/auth/service/HealthDoctorService.java @@ -31,7 +31,7 @@ public class HealthDoctorService { } catch (Exception e) { throw new RuntimeException(e); } - if (s.equals(data.getSysUser().getPassword())){ + if (s.equals(data.getDoctor().getPwd())){ Map token = tokenService.createToken(data); String accessToken = (String) token.get("access_token"); doctorVo.setSessionId(accessToken); From a49d47c6ae7eb6472188b1ca5ef099d2a435d78e Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Fri, 12 Jan 2024 19:47:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/doctor/ConvertUtil.java | 53 +++++++++ .../doctor/controller/InquiryController.java | 35 ++++++ .../controller/UserVideoController.java | 40 ++++--- .../doctor/controller/VideoController.java | 27 ++--- ...{DoctorUser.java => DoctorUserEntity.java} | 3 +- .../entity/InquiryDetailsRecordEntity.java | 106 ++++++++++++++++++ .../entity/{User.java => UserEntity.java} | 6 +- ...rVideoBuy.java => UserVideoBuyEntity.java} | 8 +- ...on.java => UserVideoCollectionEntity.java} | 13 +-- ...{UserWallet.java => UserWalletEntity.java} | 8 +- ...eoComment.java => VideoCommentEntity.java} | 6 +- ...{VideoCount.java => VideoCountEntity.java} | 6 +- .../entity/{Video.java => VideoEntity.java} | 12 +- .../domain/vo/InquiryDetailsRecordVo.java | 100 +++++++++++++++++ .../java/doctor/domain/vo/UserArchivesVo.java | 11 ++ .../java/doctor/domain/vo/UserVideoBuyVo.java | 64 +++++++++++ .../domain/vo/UserVideoCollectionVo.java | 91 +++++++++++++++ .../java/doctor/mapper/DoctorUserMapper.java | 3 +- .../java/doctor/mapper/InquiryMapper.java | 17 +++ .../java/doctor/mapper/UserVideoMapper.java | 12 +- .../main/java/doctor/mapper/VideoMapper.java | 17 ++- .../java/doctor/service/InquiryService.java | 15 +++ .../java/doctor/service/UserVideoService.java | 16 ++- .../java/doctor/service/VideoService.java | 6 +- .../service/impl/InquiryServiceImpl.java | 29 +++++ .../service/impl/UserVideoServiceImpl.java | 27 +++-- .../doctor/service/impl/VideoServiceImpl.java | 39 +++---- .../resources/mapper/doctor/InquiryMapper.xml | 12 ++ .../mapper/doctor/UserVideoMapper.xml | 10 +- .../resources/mapper/doctor/VideoMapper.xml | 19 +--- 30 files changed, 670 insertions(+), 141 deletions(-) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/ConvertUtil.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java rename doctor-modules/doctor-health/src/main/java/doctor/domain/entity/{DoctorUser.java => DoctorUserEntity.java} (97%) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InquiryDetailsRecordEntity.java rename doctor-modules/doctor-health/src/main/java/doctor/domain/entity/{User.java => UserEntity.java} (96%) rename doctor-modules/doctor-health/src/main/java/doctor/domain/entity/{UserVideoBuy.java => UserVideoBuyEntity.java} (82%) rename doctor-modules/doctor-health/src/main/java/doctor/domain/entity/{UserVideoCollection.java => UserVideoCollectionEntity.java} (74%) rename doctor-modules/doctor-health/src/main/java/doctor/domain/entity/{UserWallet.java => UserWalletEntity.java} (89%) rename doctor-modules/doctor-health/src/main/java/doctor/domain/entity/{VideoComment.java => VideoCommentEntity.java} (89%) rename doctor-modules/doctor-health/src/main/java/doctor/domain/entity/{VideoCount.java => VideoCountEntity.java} (91%) rename doctor-modules/doctor-health/src/main/java/doctor/domain/entity/{Video.java => VideoEntity.java} (86%) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryDetailsRecordVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserArchivesVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVideoBuyVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVideoCollectionVo.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java create mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml diff --git a/doctor-modules/doctor-health/src/main/java/doctor/ConvertUtil.java b/doctor-modules/doctor-health/src/main/java/doctor/ConvertUtil.java new file mode 100644 index 0000000..e0d53da --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/ConvertUtil.java @@ -0,0 +1,53 @@ +package doctor; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + + +/** + * @Author ifredom + * @Description 类型转换: Entity - Vo转换 + * @Date 2022/5/10 15:59 + * @Param [params] + **/ +public class ConvertUtil { + public static final Logger logger = LoggerFactory.getLogger(ConvertUtil.class); + + public static T entityToVo(Object source, Class target) { + if (source == null) { + return null; + } + T targetObject = null; + try { + targetObject = target.newInstance(); + BeanUtils.copyProperties(source, targetObject); + } catch (Exception e) { + e.printStackTrace(); + } + return targetObject; + } + + public static List entityToVoList(Collection sourceList, Class target) { + if (sourceList == null) { + return null; + } + List targetList = new ArrayList<>(sourceList.size()); + + try { + for (Object source : sourceList) { + T targetObject = target.newInstance(); + BeanUtils.copyProperties(source, targetObject); + targetList.add(targetObject); + } + } catch (Exception e) { + logger.error("convert error ", e); + } + return targetList; + } +} + diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java new file mode 100644 index 0000000..814704b --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/InquiryController.java @@ -0,0 +1,35 @@ +package doctor.controller; + +import doctor.common.core.domain.HealthR; +import doctor.domain.vo.InquiryDetailsRecordVo; +import doctor.service.InquiryService; +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 : InquiryController + * @Description : 问诊 + * @Author : FJJ + * @Date: 2024-01-12 19:09 + */ +@RestController +@RequestMapping("/user/inquiry/verify/v1") +public class InquiryController { + @Autowired + private InquiryService inquiryService; + //历史问诊记录列表 + @GetMapping("/findHistoryInquiryRecord") + public HealthR> findHistoryInquiryRecord(@RequestParam Integer page,@RequestParam Integer count){ + startPage(page,count); + List inquiryDetailsRecordVoList = inquiryService.findHistoryInquiryRecord(); + return HealthR.ok(inquiryDetailsRecordVoList); + } + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java index 410f514..436d7fe 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java @@ -1,15 +1,21 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; -import doctor.domain.entity.UserVideoBuy; -import doctor.domain.entity.UserVideoCollection; -import doctor.domain.entity.UserWallet; +import doctor.domain.entity.UserVideoBuyEntity; +import doctor.domain.entity.UserVideoCollectionEntity; +import doctor.domain.entity.UserWalletEntity; +import doctor.domain.vo.UserVideoBuyVo; +import doctor.domain.vo.UserVideoCollectionVo; import doctor.service.UserVideoService; 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 : UserVideoController * @Description : 用户视频 @@ -24,34 +30,36 @@ public class UserVideoController { //用户视频收藏列表 @GetMapping("/findVideoCollectionList") - public R>findVideoCollectionList(){ - List userVideoCollectionList =userVideoService.findVideoCollectionList(); - return R.ok(userVideoCollectionList); + public HealthR> findVideoCollectionList(@RequestParam Integer page,@RequestParam Integer count){ + startPage(page,count); + List userVideoCollectionVos=userVideoService.findVideoCollectionList(); + return HealthR.ok(userVideoCollectionVos); } //用户取消视频收藏 @GetMapping("/cancelVideoCollection/{id}") - public R cancelVideoCollection(@PathVariable Integer id){ + public HealthR cancelVideoCollection(@PathVariable Integer id){ userVideoService.cancelVideoCollection(id); - return R.ok(); + return HealthR.ok(); } //用户购买视频列表 @GetMapping("/findUserVideoBuyList") - public R>findUserVideoBuyList(){ - List userVideoBuys =userVideoService.findUserVideoBuyList(); - return R.ok(userVideoBuys); + public HealthR>findUserVideoBuyList(@RequestParam Integer page, @RequestParam Integer count){ + startPage(page,count); + List userVideoCollectionVos =userVideoService.findUserVideoBuyList(); + return HealthR.ok(userVideoCollectionVos); } //用户删除购买的视频 @DeleteMapping("/deleteVideoBuy/{id}") - public R deleteVideoBuy(@PathVariable Integer id){ + public HealthR deleteVideoBuy(@PathVariable Integer id){ userVideoService.deleteVideoBuy(id); - return R.ok(); + return HealthR.ok(); } //我的钱包 @GetMapping("/findUserWallet") - public R> findUserWallet(){ - List userWallets = userVideoService.findUserWallet(); - return R.ok(userWallets); + public HealthR> findUserWallet(){ + List userWallets = userVideoService.findUserWallet(); + return HealthR.ok(userWallets); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java index 4cc9573..fd029d0 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java @@ -1,5 +1,6 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.*; import doctor.service.VideoService; @@ -20,22 +21,22 @@ public class VideoController { @Autowired private VideoService videoService; //收藏健康讲堂视频列表 - @PostMapping("/verify/v1/addUserVideoCollection") - public R addUserVideoCollection(@RequestBody UserVideoCollection userVideoCollection){ - videoService.addUserVideoCollection(userVideoCollection); - return R.ok(); + @PostMapping("/verify/v1/addUserVideoCollection/{videoId}") + public HealthR addUserVideoCollection(@RequestParam Integer videoId){ + videoService.addUserVideoCollection(videoId); + return HealthR.ok(); } //购买健康讲堂视频 @PostMapping("/verify/v1/videoBuy") - public R videoBuy(@RequestBody UserVideoBuy userVideoBuy){ - videoService.videoBuy(userVideoBuy); - return R.ok(); - } - //视频评论列表 - @GetMapping("/v1/findVideoCommentList") - public R> findVideoCommentList(){ - List videoCommentList = videoService.findVideoCommentList(); - return R.ok(videoCommentList); + public HealthR videoBuy(@RequestParam Integer videoId, @RequestParam Integer price){ + videoService.videoBuy(videoId,price); + return HealthR.ok(); } +// //视频评论列表 +// @GetMapping("/v1/findVideoCommentList") +// public R> findVideoCommentList(){ +// List videoCommentList = videoService.findVideoCommentList(); +// return R.ok(videoCommentList); +// } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorUser.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorUserEntity.java similarity index 97% rename from doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorUser.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorUserEntity.java index ee7dfe0..0fbc91a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorUser.java +++ b/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; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InquiryDetailsRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InquiryDetailsRecordEntity.java new file mode 100644 index 0000000..b4e379a --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InquiryDetailsRecordEntity.java @@ -0,0 +1,106 @@ +package doctor.domain.entity; + +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @ClassName : InquiryDetailsRecordEntity + * @Description : 查询详情记录表 + * @Author : FJJ + * @Date: 2024-01-12 17:26 + */ +public class InquiryDetailsRecordEntity { + private Integer id; + private Integer inquiryId; + private Integer userId; + private Integer friendId; + private String askContent; + private String askImage; + private String voiceChat; + private Integer direction; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date askTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getInquiryId() { + return inquiryId; + } + + public void setInquiryId(Integer inquiryId) { + this.inquiryId = inquiryId; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getFriendId() { + return friendId; + } + + public void setFriendId(Integer friendId) { + this.friendId = friendId; + } + + public String getAskContent() { + return askContent; + } + + public void setAskContent(String askContent) { + this.askContent = askContent; + } + + public String getAskImage() { + return askImage; + } + + public void setAskImage(String askImage) { + this.askImage = askImage; + } + + public String getVoiceChat() { + return voiceChat; + } + + public void setVoiceChat(String voiceChat) { + this.voiceChat = voiceChat; + } + + public Integer getDirection() { + return direction; + } + + public void setDirection(Integer direction) { + this.direction = direction; + } + + public Date getAskTime() { + return askTime; + } + + public void setAskTime(Date askTime) { + this.askTime = askTime; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/User.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java similarity index 96% rename from doctor-modules/doctor-health/src/main/java/doctor/domain/entity/User.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java index 6f0f2cb..b4974f0 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/User.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java @@ -1,16 +1,14 @@ package doctor.domain.entity; -import org.springframework.format.annotation.DateTimeFormat; - import java.util.Date; /** - * @ClassName : User + * @ClassName : UserEntity * @Description : 用户表 * @Author : FJJ * @Date: 2024-01-10 20:46 */ -public class User { +public class UserEntity { private Integer id; private String phone; private String pwd; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoBuy.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoBuyEntity.java similarity index 82% rename from doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoBuy.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoBuyEntity.java index 5903ee7..d6e4cf0 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoBuy.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoBuyEntity.java @@ -1,12 +1,12 @@ package doctor.domain.entity; /** - * @ClassName : UserVideoBuy + * @ClassName : UserVideoBuyEntity * @Description : 用户购买视频表 * @Author : FJJ * @Date: 2024-01-10 15:20 */ -public class UserVideoBuy { +public class UserVideoBuyEntity { private Integer id; private Integer userId; private Integer videoId; @@ -44,13 +44,13 @@ public class UserVideoBuy { this.createTime = createTime; } - public UserVideoBuy(Integer id, Integer userId, Integer videoId, Long createTime) { + public UserVideoBuyEntity(Integer id, Integer userId, Integer videoId, Long createTime) { this.id = id; this.userId = userId; this.videoId = videoId; this.createTime = createTime; } - public UserVideoBuy() { + public UserVideoBuyEntity() { } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoCollection.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoCollectionEntity.java similarity index 74% rename from doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoCollection.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoCollectionEntity.java index b9ab680..063f7c6 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoCollection.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserVideoCollectionEntity.java @@ -1,18 +1,13 @@ package doctor.domain.entity; -import io.swagger.models.auth.In; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - /** - * @ClassName : UserVideoCollection + * @ClassName : UserVideoCollectionEntity * @Description : 用户视频收藏表 * @Author : FJJ * @Date: 2024-01-10 14:28 */ -public class UserVideoCollection { +public class UserVideoCollectionEntity { private Integer id; private Integer userId; private Integer videoId; @@ -50,13 +45,13 @@ public class UserVideoCollection { this.createTime = createTime; } - public UserVideoCollection(Integer id, Integer userId, Integer videoId, Long createTime) { + public UserVideoCollectionEntity(Integer id, Integer userId, Integer videoId, Long createTime) { this.id = id; this.userId = userId; this.videoId = videoId; this.createTime = createTime; } - public UserVideoCollection() { + public UserVideoCollectionEntity() { } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserWallet.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserWalletEntity.java similarity index 89% rename from doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserWallet.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserWalletEntity.java index 1da779d..978e108 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserWallet.java +++ b/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; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoComment.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java similarity index 89% rename from doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoComment.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java index 84db8bf..9ab5ec2 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoComment.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java @@ -1,16 +1,14 @@ package doctor.domain.entity; -import org.springframework.format.annotation.DateTimeFormat; - import java.util.Date; /** - * @ClassName : VideoComment + * @ClassName : VideoCommentEntity * @Description : 评论表 * @Author : FJJ * @Date: 2024-01-10 21:54 */ -public class VideoComment { +public class VideoCommentEntity { private Integer id; private Integer userId; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCount.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCountEntity.java similarity index 91% rename from doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCount.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCountEntity.java index c2e626c..af8087e 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCount.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCountEntity.java @@ -1,16 +1,14 @@ package doctor.domain.entity; -import org.springframework.format.annotation.DateTimeFormat; - import java.util.Date; /** - * @ClassName : VideoCount + * @ClassName : VideoCountEntity * @Description : 视频数 * @Author : FJJ * @Date: 2024-01-10 16:24 */ -public class VideoCount { +public class VideoCountEntity { private Integer id; private Integer videoId; private Integer buyNum; diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Video.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java similarity index 86% rename from doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Video.java rename to doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java index a09e715..4668148 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Video.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java @@ -1,16 +1,12 @@ package doctor.domain.entity; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - /** - * @ClassName : Video + * @ClassName : VideoEntity * @Description : 健康课堂视频表 * @Author : FJJ * @Date: 2024-01-10 15:59 */ -public class Video { +public class VideoEntity { private Integer id; private String title; private Integer categoryId; @@ -93,7 +89,7 @@ public class Video { this.createTime = createTime; } - public Video(Integer id, String title, Integer categoryId, String shearUrl, String abstracts, String originalUrl, Integer duration, Integer price, Long createTime) { + public VideoEntity(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; @@ -105,6 +101,6 @@ public class Video { this.createTime = createTime; } - public Video() { + public VideoEntity() { } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryDetailsRecordVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/InquiryDetailsRecordVo.java new file mode 100644 index 0000000..a51a641 --- /dev/null +++ b/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; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserArchivesVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserArchivesVo.java new file mode 100644 index 0000000..2605ce7 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserArchivesVo.java @@ -0,0 +1,11 @@ +package doctor.domain.vo; + +/** + * @ClassName : UserArchivesVo + * @Description : 历史问诊 + * @Author : FJJ + * @Date: 2024-01-12 18:52 + */ +public class UserArchivesVo { + private Integer recordId; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVideoBuyVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVideoBuyVo.java new file mode 100644 index 0000000..54352d4 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVideoBuyVo.java @@ -0,0 +1,64 @@ +package doctor.domain.vo; + +/** + * @ClassName : UserVideoBuyVo + * @Description : 购买视频表 + * @Author : FJJ + * @Date: 2024-01-12 16:37 + */ +public class UserVideoBuyVo { + private Integer id; + private Integer videoId; + private String title; + private String original; + private Integer duration; + private Long 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 String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getOriginal() { + return original; + } + + public void setOriginal(String original) { + this.original = original; + } + + public Integer getDuration() { + return duration; + } + + public void setDuration(Integer duration) { + this.duration = duration; + } + + public Long getCreateTime() { + return createTime; + } + + public void setCreateTime(Long createTime) { + this.createTime = createTime; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVideoCollectionVo.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVideoCollectionVo.java new file mode 100644 index 0000000..784595e --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/vo/UserVideoCollectionVo.java @@ -0,0 +1,91 @@ +package doctor.domain.vo; + +/** + * @ClassName : UserVideoCollectionVo + * @Description : 用户视频收藏表 + * @Author : FJJ + * @Date: 2024-01-12 16:11 + */ +public class UserVideoCollectionVo { + private Integer id; + private String title; + private String shearUrl; + private String original; + private Integer price; + private Integer duration; + 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; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorUserMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorUserMapper.java index 74c9d21..0ec23f4 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorUserMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DoctorUserMapper.java @@ -3,10 +3,11 @@ package doctor.mapper; import doctor.system.api.domain.Department; import doctor.system.api.domain.Doctor; import doctor.system.api.domain.User; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.mybatis.spring.annotation.MapperScan; -@MapperScan +@Mapper public interface DoctorUserMapper { User selectUserByEmail(@Param("email") String email); diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java new file mode 100644 index 0000000..081f354 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InquiryMapper.java @@ -0,0 +1,17 @@ +package doctor.mapper; + +import doctor.domain.entity.InquiryDetailsRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @ClassName : InquiryMapper + * @Description : + * @Author : FJJ + * @Date: 2024-01-12 19:18 + */ +@Mapper +public interface InquiryMapper { + List findHistoryInquiryRecord(); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java index 32bb5d3..a71cd12 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java @@ -1,8 +1,8 @@ package doctor.mapper; -import doctor.domain.entity.UserVideoBuy; -import doctor.domain.entity.UserVideoCollection; -import doctor.domain.entity.UserWallet; +import doctor.domain.entity.UserVideoBuyEntity; +import doctor.domain.entity.UserVideoCollectionEntity; +import doctor.domain.entity.UserWalletEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,13 +16,13 @@ import java.util.List; */ @Mapper public interface UserVideoMapper { - List findVideoCollectionList(); + List findVideoCollectionList(); void cancelVideoCollection(@Param("id") Integer id); - List findUserVideoBuyList(); + List findUserVideoBuyList(); void deleteVideoBuy(@Param("id") Integer id); - List findUserWallet(); + List findUserWallet(); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/VideoMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/VideoMapper.java index 6c886cb..3d235d7 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/VideoMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/VideoMapper.java @@ -16,24 +16,23 @@ import java.util.List; public interface VideoMapper { - void addUserVideoCollection(UserVideoCollection userVideoCollection); + void addUserVideoCollection(@Param("userId") Integer userId, @Param("videoId") Integer videoId); - Video findById(@Param("videoId") Integer videoId); + VideoEntity findById(@Param("videoId") Integer videoId); - VideoCount FindVideoId(@Param("id") Integer id); + VideoCountEntity FindVideoId(@Param("id") Integer id); - void updateVideoCount(VideoCount videoCount); + void updateVideoCount(VideoCountEntity videoCount); - User FindById(@Param("userId") Integer userId); + UserEntity FindById(@Param("userId") Integer userId); - UserWallet FindUserWallet(@Param("id") Integer id); + UserWalletEntity FindUserWallet(@Param("id") Integer id); - Video findByVideoId(@Param("videoId") Integer videoId); void updateUserWallet(@Param("newblance") int newblance, @Param("id") Integer id); - List findVideoCommentList(); -// UserWallet FindById(@Param("userId") Integer userId); + +// UserWalletEntity FindById(@Param("userId") Integer userId); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java new file mode 100644 index 0000000..41e58c6 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/InquiryService.java @@ -0,0 +1,15 @@ +package doctor.service; + +import doctor.domain.vo.InquiryDetailsRecordVo; + +import java.util.List; + +/** + * @ClassName : InquiryService + * @Description : + * @Author : FJJ + * @Date: 2024-01-12 19:18 + */ +public interface InquiryService { + List findHistoryInquiryRecord(); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java index b024c7e..c9a8fb7 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java @@ -1,8 +1,10 @@ package doctor.service; -import doctor.domain.entity.UserVideoBuy; -import doctor.domain.entity.UserVideoCollection; -import doctor.domain.entity.UserWallet; +import doctor.domain.entity.UserVideoBuyEntity; +import doctor.domain.entity.UserVideoCollectionEntity; +import doctor.domain.entity.UserWalletEntity; +import doctor.domain.vo.UserVideoBuyVo; +import doctor.domain.vo.UserVideoCollectionVo; import java.util.List; @@ -13,13 +15,15 @@ import java.util.List; * @Date: 2024-01-10 14:33 */ public interface UserVideoService { - List findVideoCollectionList(); + void cancelVideoCollection(Integer id); - List findUserVideoBuyList(); + List findUserVideoBuyList(); void deleteVideoBuy(Integer id); - List findUserWallet(); + List findUserWallet(); + + List findVideoCollectionList(); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/VideoService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/VideoService.java index bab5ee1..1892009 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/VideoService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/VideoService.java @@ -12,10 +12,10 @@ import java.util.List; */ public interface VideoService { - void addUserVideoCollection(UserVideoCollection userVideoCollection); + void addUserVideoCollection(Integer videoId); - void videoBuy(UserVideoBuy userVideoBuy); + void videoBuy(Integer videoId,Integer price); + - List findVideoCommentList(); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java new file mode 100644 index 0000000..f0ba559 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InquiryServiceImpl.java @@ -0,0 +1,29 @@ +package doctor.service.impl; + +import doctor.ConvertUtil; +import doctor.domain.entity.InquiryDetailsRecordEntity; +import doctor.domain.vo.InquiryDetailsRecordVo; +import doctor.mapper.InquiryMapper; +import doctor.service.InquiryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName : InquiryServiceImpl + * @Description : + * @Author : FJJ + * @Date: 2024-01-12 19:19 + */ +@Service +public class InquiryServiceImpl implements InquiryService { + @Autowired + private InquiryMapper inquiryMapper; + @Override + public List findHistoryInquiryRecord() { + List inquiryDetailsRecordEntity = inquiryMapper.findHistoryInquiryRecord(); + List inquiryDetailsRecordVos = ConvertUtil.entityToVoList(inquiryDetailsRecordEntity, InquiryDetailsRecordVo.class); + return inquiryDetailsRecordVos; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java index 74708ca..efd4466 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java @@ -1,8 +1,11 @@ package doctor.service.impl; -import doctor.domain.entity.UserVideoBuy; -import doctor.domain.entity.UserVideoCollection; -import doctor.domain.entity.UserWallet; +import doctor.ConvertUtil; +import doctor.domain.entity.UserVideoBuyEntity; +import doctor.domain.entity.UserVideoCollectionEntity; +import doctor.domain.entity.UserWalletEntity; +import doctor.domain.vo.UserVideoBuyVo; +import doctor.domain.vo.UserVideoCollectionVo; import doctor.mapper.UserVideoMapper; import doctor.service.UserVideoService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +23,13 @@ import java.util.List; public class UserVideoServiceImpl implements UserVideoService { @Autowired private UserVideoMapper userVideoMapper; + + @Override - public List findVideoCollectionList() { - return userVideoMapper.findVideoCollectionList(); + public List findVideoCollectionList() { + List userVideoCollectionEntityList=userVideoMapper.findVideoCollectionList(); + List userVideoCollectionVoList = ConvertUtil.entityToVoList(userVideoCollectionEntityList, UserVideoCollectionVo.class); + return userVideoCollectionVoList; } @Override @@ -31,8 +38,10 @@ public class UserVideoServiceImpl implements UserVideoService { } @Override - public List findUserVideoBuyList() { - return userVideoMapper.findUserVideoBuyList(); + public List findUserVideoBuyList() { + List userVideoCollectionEntityList=userVideoMapper.findUserVideoBuyList(); + List userVideoBuyList = ConvertUtil.entityToVoList(userVideoCollectionEntityList, UserVideoBuyVo.class); + return userVideoBuyList; } @Override @@ -41,7 +50,9 @@ public class UserVideoServiceImpl implements UserVideoService { } @Override - public List findUserWallet() { + public List findUserWallet() { return userVideoMapper.findUserWallet(); } + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/VideoServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/VideoServiceImpl.java index 1c45fe1..c559e88 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/VideoServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/VideoServiceImpl.java @@ -1,11 +1,13 @@ package doctor.service.impl; +import doctor.common.core.utils.JwtUtils; import doctor.domain.entity.*; import doctor.mapper.VideoMapper; import doctor.service.VideoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -18,39 +20,38 @@ import java.util.List; public class VideoServiceImpl implements VideoService { @Autowired private VideoMapper videoMapper; - + @Autowired + private HttpServletRequest request; @Override - public void addUserVideoCollection(UserVideoCollection userVideoCollection) { + public void addUserVideoCollection(Integer videoId) { + //获取用户id + String token = request.getHeader("token"); + Integer userId = Integer.valueOf(JwtUtils.getUserId(token)); // 添加收藏 - videoMapper.addUserVideoCollection(userVideoCollection); + videoMapper.addUserVideoCollection(userId,videoId); // 更新视频收藏数 - Video video = videoMapper.findById(userVideoCollection.getVideoId()); - VideoCount videoCount = videoMapper.FindVideoId(video.getId()); + VideoEntity video = videoMapper.findById(videoId); + VideoCountEntity videoCount = videoMapper.FindVideoId(video.getId()); videoMapper.updateVideoCount(videoCount); } @Override - public void videoBuy(UserVideoBuy userVideoBuy) { + public void videoBuy(Integer videoId,Integer price) { + //获取用户id + String token = request.getHeader("token"); + Integer userId = Integer.valueOf(JwtUtils.getUserId(token)); //查询用户信息 - User user = videoMapper.FindById(userVideoBuy.getUserId()); - //查询视频信息 - Video video = videoMapper.findByVideoId(userVideoBuy.getVideoId()); + UserEntity user = videoMapper.FindById(userId); //查询用户钱包 - UserWallet userWallet = videoMapper.FindUserWallet(user.getId()); + UserWalletEntity userWallet = videoMapper.FindUserWallet(user.getId()); //判断用户钱包是否足够 - if (userWallet.getBalance() >= video.getPrice()) { + if (userWallet.getBalance() >= price) { //更新用户钱包 - int newblance=userWallet.getBalance() - video.getPrice(); + int newblance = userWallet.getBalance() -price; //更新用户钱包 - videoMapper.updateUserWallet(newblance,userWallet.getId()); + videoMapper.updateUserWallet(newblance, userWallet.getId()); } - - } - @Override - public List findVideoCommentList() { - return videoMapper.findVideoCommentList(); - } } diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml new file mode 100644 index 0000000..0da48d0 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InquiryMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml index cb586ad..2201c0c 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml @@ -6,22 +6,22 @@ delete from user_video_collection - where id = #{id} + where video_id = #{id} delete from user_video_buy - where id = #{id} + where video_id = #{id} - select * from user_video_collection - select * from user_video_buy - select * from user_wallet diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/VideoMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/VideoMapper.xml index 7903f85..21fd79e 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/VideoMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/VideoMapper.xml @@ -24,38 +24,29 @@ where id=#{id} - SELECT user_video_collection.* FROM user_video_collection LEFT JOIN video ON user_video_collection.video_id = video.id WHERE video.id = #{videoId} - select * from video_count where id = #{id} - SELECT user.* FROM user_video_buy LEFT JOIN user ON user.id = user_video_buy.user_id WHERE user_video_buy.user_id = #{userId} - SELECT user.* FROM user_wallet LEFT JOIN user ON user.id = user_wallet.user_id WHERE user_wallet.user_id==#{id} - - + From 33d722d0b27493379a78cfd9d2d1a49007ece06e Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Fri, 12 Jan 2024 21:31:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SickCircleCommentEntity.java | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleCommentEntity.java diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleCommentEntity.java new file mode 100644 index 0000000..e7f67e7 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/SickCircleCommentEntity.java @@ -0,0 +1,75 @@ +package doctor.domain.entity; + +import java.util.Date; + +/** + * @ClassName : SickCircleCommentEntity + * @Description : 病友圈评论表 + * @Author : FJJ + * @Date: 2024-01-12 19:57 + */ +public class SickCircleCommentEntity { + private Integer id; + private Integer sickCircleId; + private Integer userId; + private String content; + private Date commentTime; + private Integer whetherDoctor; + private Long createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getSickCircleId() { + return sickCircleId; + } + + public void setSickCircleId(Integer sickCircleId) { + this.sickCircleId = sickCircleId; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public Date getCommentTime() { + return commentTime; + } + + public void setCommentTime(Date commentTime) { + this.commentTime = commentTime; + } + + public Integer getWhetherDoctor() { + return whetherDoctor; + } + + public void setWhetherDoctor(Integer whetherDoctor) { + this.whetherDoctor = whetherDoctor; + } + + public Long getCreateTime() { + return createTime; + } + + public void setCreateTime(Long createTime) { + this.createTime = createTime; + } +} From a3dbe5e0c5ce0281df251b0483624980bd0823b3 Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Sat, 13 Jan 2024 08:42:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doctor-auth/src/main/resources/bootstrap.yml | 4 +- .../common/core/constant/Constants.java | 3 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../controller/SysDoctorController.java | 40 ----- .../java/doctor/domain/entity/UserEntity.java | 141 +----------------- .../doctor/domain/entity/VideoEntity.java | 90 ----------- .../java/doctor/mapper/IDoctorUserMapper.java | 10 -- .../doctor/service/IDoctorUserService.java | 8 - .../service/impl/IDoctorUserServiceImpl.java | 19 --- .../src/main/resources/bootstrap.yml | 4 +- .../doctor/IDoctorUserServiceMapper.xml | 11 -- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 16 files changed, 24 insertions(+), 330 deletions(-) delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java delete mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index 7f241e4..80f11fd 100644 --- a/doctor-auth/src/main/resources/bootstrap.yml +++ b/doctor-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java index 5dcfec9..a651960 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java +++ b/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"; + /** * 失败标记 diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index e0b9071..d3e056c 100644 --- a/doctor-gateway/src/main/resources/bootstrap.yml +++ b/doctor-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml index 400e098..66f9597 100644 --- a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml index 9b8484d..81bc32c 100644 --- a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java deleted file mode 100644 index 746fd64..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java +++ /dev/null @@ -1,40 +0,0 @@ -package doctor.controller; - -import com.baomidou.dynamic.datasource.annotation.DS; -import doctor.common.core.domain.R; -import doctor.domain.entity.DoctorUser; -import doctor.service.IDoctorUserService; -import doctor.system.api.domain.SysUser; -import doctor.system.api.model.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/doctor") -@DS("master") -public class SysDoctorController { - - @Autowired - private IDoctorUserService iDoctorUserService; - - @PostMapping("/getUser") - public R getUser(String email) { - DoctorUser user = iDoctorUserService.getUser(email); - LoginUser loginUser = new LoginUser(); - SysUser sysUser = new SysUser(); - sysUser.setUserId(Long.valueOf(user.getId())); - sysUser.setNickName(user.getNickName()); - sysUser.setUserName(user.getUserName()); - sysUser.setPhonenumber(user.getPhone()); - sysUser.setPassword(user.getPwd()); - if (user.getSex()==0){ - sysUser.setSex("男"); - }else { - sysUser.setSex("女"); - } - loginUser.setSysUser(sysUser); - return R.ok(loginUser); - } -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java index 088253f..f37475a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java @@ -1,5 +1,9 @@ package doctor.domain.entity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.util.Date; /** @@ -8,6 +12,9 @@ import java.util.Date; * @Author : FJJ * @Date: 2024-01-10 20:46 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class UserEntity { private Integer id; private String phone; @@ -24,139 +31,5 @@ public class UserEntity { 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; - } - -<<<<<<< HEAD - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { -======= - public Integer getHeight() { - return height; - } - - public void setHeight(Integer height) { - this.height = height; - } - - public Integer getWeight() { - return weight; - } - - public void setWeight(Integer weight) { ->>>>>>> 16030f8df7026b88eca021372724f5ad3641a7be - 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; - } - -<<<<<<< HEAD - public Long getCreateTime() { - return createTime; - } - - public void setCreateTime(Long createTime) { -======= - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { ->>>>>>> 16030f8df7026b88eca021372724f5ad3641a7be - this.createTime = createTime; - } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java index 65faf6a..b11e957 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java @@ -27,94 +27,4 @@ public class VideoEntity { 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 VideoEntity(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 VideoEntity() { - } - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date createTime; } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java deleted file mode 100644 index 8d7f5e3..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package doctor.mapper; - -import doctor.domain.entity.DoctorUser; -import org.apache.ibatis.annotations.Param; -import org.mybatis.spring.annotation.MapperScan; - -@MapperScan -public interface IDoctorUserMapper { - DoctorUser selectDoctorUserByEmail(@Param("email") String email); -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java deleted file mode 100644 index b967765..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java +++ /dev/null @@ -1,8 +0,0 @@ -package doctor.service; - -import doctor.domain.entity.DoctorUser; -import doctor.system.api.model.LoginUser; - -public interface IDoctorUserService { - DoctorUser getUser(String email); -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java deleted file mode 100644 index 193c931..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package doctor.service.impl; - -import doctor.mapper.IDoctorUserMapper; -import doctor.domain.entity.DoctorUser; -import doctor.service.IDoctorUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class IDoctorUserServiceImpl implements IDoctorUserService { - @Autowired - private IDoctorUserMapper iDoctorUserMapper; - - @Override - public DoctorUser getUser(String email) { - DoctorUser doctorUser = iDoctorUserMapper.selectDoctorUserByEmail(email); - return doctorUser; - } -} diff --git a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml index 691386c..203e553 100644 --- a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml deleted file mode 100644 index 41b82ff..0000000 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index 687623f..ab123c4 100644 --- a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml index 632b0bd..14e7505 100644 --- a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml index f378a98..d94bf20 100644 --- a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml +++ b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 From 0d16cc8f0e87f283e0a836f15e2134b9da62a6e0 Mon Sep 17 00:00:00 2001 From: fjj <–1066869486@qq.com> Date: Sat, 13 Jan 2024 09:15:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doctor-auth/src/main/resources/bootstrap.yml | 4 +- .../common/core/constant/Constants.java | 3 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../controller/SysDoctorController.java | 40 ----- .../java/doctor/domain/entity/UserEntity.java | 141 +----------------- .../doctor/domain/entity/VideoEntity.java | 90 ----------- .../java/doctor/mapper/IDoctorUserMapper.java | 10 -- .../doctor/service/IDoctorUserService.java | 8 - .../service/impl/IDoctorUserServiceImpl.java | 19 --- .../src/main/resources/bootstrap.yml | 4 +- .../doctor/IDoctorUserServiceMapper.xml | 11 -- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 16 files changed, 24 insertions(+), 330 deletions(-) delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java delete mode 100644 doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java delete mode 100644 doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml diff --git a/doctor-auth/src/main/resources/bootstrap.yml b/doctor-auth/src/main/resources/bootstrap.yml index 7f241e4..80f11fd 100644 --- a/doctor-auth/src/main/resources/bootstrap.yml +++ b/doctor-auth/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java index 5dcfec9..a651960 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java +++ b/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"; + /** * 失败标记 diff --git a/doctor-gateway/src/main/resources/bootstrap.yml b/doctor-gateway/src/main/resources/bootstrap.yml index e0b9071..d3e056c 100644 --- a/doctor-gateway/src/main/resources/bootstrap.yml +++ b/doctor-gateway/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml index 400e098..66f9597 100644 --- a/doctor-modules/doctor-file/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-file/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml index 9b8484d..81bc32c 100644 --- a/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-gen/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java deleted file mode 100644 index 746fd64..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/SysDoctorController.java +++ /dev/null @@ -1,40 +0,0 @@ -package doctor.controller; - -import com.baomidou.dynamic.datasource.annotation.DS; -import doctor.common.core.domain.R; -import doctor.domain.entity.DoctorUser; -import doctor.service.IDoctorUserService; -import doctor.system.api.domain.SysUser; -import doctor.system.api.model.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/doctor") -@DS("master") -public class SysDoctorController { - - @Autowired - private IDoctorUserService iDoctorUserService; - - @PostMapping("/getUser") - public R getUser(String email) { - DoctorUser user = iDoctorUserService.getUser(email); - LoginUser loginUser = new LoginUser(); - SysUser sysUser = new SysUser(); - sysUser.setUserId(Long.valueOf(user.getId())); - sysUser.setNickName(user.getNickName()); - sysUser.setUserName(user.getUserName()); - sysUser.setPhonenumber(user.getPhone()); - sysUser.setPassword(user.getPwd()); - if (user.getSex()==0){ - sysUser.setSex("男"); - }else { - sysUser.setSex("女"); - } - loginUser.setSysUser(sysUser); - return R.ok(loginUser); - } -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java index 088253f..f37475a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java @@ -1,5 +1,9 @@ package doctor.domain.entity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.util.Date; /** @@ -8,6 +12,9 @@ import java.util.Date; * @Author : FJJ * @Date: 2024-01-10 20:46 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class UserEntity { private Integer id; private String phone; @@ -24,139 +31,5 @@ public class UserEntity { 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; - } - -<<<<<<< HEAD - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - - public String getWeight() { - return weight; - } - - public void setWeight(String weight) { -======= - public Integer getHeight() { - return height; - } - - public void setHeight(Integer height) { - this.height = height; - } - - public Integer getWeight() { - return weight; - } - - public void setWeight(Integer weight) { ->>>>>>> 16030f8df7026b88eca021372724f5ad3641a7be - 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; - } - -<<<<<<< HEAD - public Long getCreateTime() { - return createTime; - } - - public void setCreateTime(Long createTime) { -======= - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { ->>>>>>> 16030f8df7026b88eca021372724f5ad3641a7be - this.createTime = createTime; - } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java index 65faf6a..b11e957 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java @@ -27,94 +27,4 @@ public class VideoEntity { 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 VideoEntity(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 VideoEntity() { - } - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private Date createTime; } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java deleted file mode 100644 index 8d7f5e3..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/IDoctorUserMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package doctor.mapper; - -import doctor.domain.entity.DoctorUser; -import org.apache.ibatis.annotations.Param; -import org.mybatis.spring.annotation.MapperScan; - -@MapperScan -public interface IDoctorUserMapper { - DoctorUser selectDoctorUserByEmail(@Param("email") String email); -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java deleted file mode 100644 index b967765..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/IDoctorUserService.java +++ /dev/null @@ -1,8 +0,0 @@ -package doctor.service; - -import doctor.domain.entity.DoctorUser; -import doctor.system.api.model.LoginUser; - -public interface IDoctorUserService { - DoctorUser getUser(String email); -} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java deleted file mode 100644 index 193c931..0000000 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/IDoctorUserServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package doctor.service.impl; - -import doctor.mapper.IDoctorUserMapper; -import doctor.domain.entity.DoctorUser; -import doctor.service.IDoctorUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class IDoctorUserServiceImpl implements IDoctorUserService { - @Autowired - private IDoctorUserMapper iDoctorUserMapper; - - @Override - public DoctorUser getUser(String email) { - DoctorUser doctorUser = iDoctorUserMapper.selectDoctorUserByEmail(email); - return doctorUser; - } -} diff --git a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml index 691386c..203e553 100644 --- a/doctor-modules/doctor-health/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-health/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml deleted file mode 100644 index 41b82ff..0000000 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/IDoctorUserServiceMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml index 687623f..ab123c4 100644 --- a/doctor-modules/doctor-job/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-job/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml index 632b0bd..14e7505 100644 --- a/doctor-modules/doctor-system/src/main/resources/bootstrap.yml +++ b/doctor-modules/doctor-system/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml index f378a98..d94bf20 100644 --- a/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml +++ b/doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml @@ -15,11 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 config: # 配置中心地址 server-addr: 101.34.77.101:8848 - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 09dff3e2-9790-4d4f-beb6-9baeb01ae040 # 配置文件格式 file-extension: yml # 共享配置