diff --git a/pom.xml b/pom.xml index e1592b4..6b66e22 100644 --- a/pom.xml +++ b/pom.xml @@ -85,4 +85,22 @@ + + + menghang-public + menghang-public + http://47.120.41.128:8081/repository/maven-public/ + + + + + + menghang-releases + menghang-releases + http://47.120.41.128:8081/repository/maven-releases/ + + + + + diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java index 8133868..b2a6c04 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java @@ -5,7 +5,7 @@ import java.util.Date; /** * 详情表中的收藏表 */ -public class DetailCollection { +public class DetailCollection { /** * 详情表中的收藏id @@ -23,9 +23,14 @@ public class DetailCollection { private Date collectionTime; /** - * 收藏人 + * 收藏人id */ - private String collector; + private Long collectorId; + + /** + * 收藏状态 + */ + private Integer detailCollectionStatus; /** * 创建人 @@ -39,6 +44,43 @@ public class DetailCollection { */ private Date detailCollectionFounderTime; + /** + * 修改人 + * @return + */ + private String detailCollectionModificator; + + /** + * 修改时间 + * @return + */ + private Date detailCollectionModificatorTime; + + + @Override + public String toString() { + return "DetailCollection{" + + "detailCollectionId=" + detailCollectionId + + ", detailsPatientCircleId=" + detailsPatientCircleId + + ", collectionTime=" + collectionTime + + ", collectorId=" + collectorId + + ", detailCollectionStatus=" + detailCollectionStatus + + ", detailCollectionFounder='" + detailCollectionFounder + '\'' + + ", detailCollectionFounderTime=" + detailCollectionFounderTime + + ", detailCollectionModificator='" + detailCollectionModificator + '\'' + + ", detailCollectionModificatorTime=" + detailCollectionModificatorTime + + '}'; + } + + public Integer getDetailCollectionStatus() { + return detailCollectionStatus; + } + + public void setDetailCollectionStatus(Integer detailCollectionStatus) { + this.detailCollectionStatus = detailCollectionStatus; + } + + public String getDetailCollectionFounder() { return detailCollectionFounder; } @@ -71,17 +113,7 @@ public class DetailCollection { this.detailCollectionModificatorTime = detailCollectionModificatorTime; } - /** - * 修改人 - * @return - */ - private String detailCollectionModificator; - /** - * 修改时间 - * @return - */ - private Date detailCollectionModificatorTime; public Long getDetailCollectionId() { return detailCollectionId; @@ -107,13 +139,6 @@ public class DetailCollection { this.collectionTime = collectionTime; } - public String getCollector() { - return collector; - } - - public void setCollector(String collector) { - this.collector = collector; - } public DetailCollection() { } @@ -122,6 +147,13 @@ public class DetailCollection { this.detailCollectionId = detailCollectionId; this.detailsPatientCircleId = detailsPatientCircleId; this.collectionTime = collectionTime; - this.collector = collector; + } + + public Long getCollectorId() { + return collectorId; + } + + public void setCollectorId(Long collectorId) { + this.collectorId = collectorId; } } diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java b/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java new file mode 100644 index 0000000..171df37 --- /dev/null +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java @@ -0,0 +1,50 @@ +package com.four.common.duck.communitypatients; + +/** + * @program: four-common-duck + * @author: spc + * @create: 2023-10-27 16:26 + * @Version 1.0 + **/ + +import lombok.Data; + +import java.util.Date; + +/** + * 收藏记录表 + */ + +@Data +public class DetailCollectionRecord { + /** + * 收藏记录id + */ + private Long detailCollectionRecordId; + + /** + * 收藏记录人 + */ + private String detailCollectionRecordUser; + + /** + * 收藏病友圈 + */ + private Long detailsPatientCircleId; + + /** + * 收藏时间 + */ + private Date detailCollectionRecordTime; + + /** + * 创建者 + */ + private String detailCollectionRecordFounder; + + /** + * 创建时间 + */ + private Date detailCollectionRecordFounderTime; +} + diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java index 35196cd..484a720 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java @@ -41,7 +41,13 @@ public class DetailedReview { * 评论内容 * @return */ - private String name; + private String detailedReviewName; + + + /** + * 状态1：未采纳；状态2：采纳 + */ + private Integer detailedReviewStatus; /** *创建人 @@ -58,6 +64,11 @@ public class DetailedReview { */ private String detailedReviewModificator; + /** + * 修改时间 + */ + private Date detailedReviewModificatorTime; + public String getDetailedReviewFounder() { return detailedReviewFounder; } @@ -90,10 +101,7 @@ public class DetailedReview { this.detailedReviewModificatorTime = detailedReviewModificatorTime; } - /** - * 修改时间 - */ - private Date detailedReviewModificatorTime; + public DetailedReview(Long detailedReviewId, Long detailsPatientCircleId, Date commentTime, Long reviewerId, Long numberLikes, Long tauntCount, String name) { this.detailedReviewId = detailedReviewId; @@ -102,7 +110,7 @@ public class DetailedReview { this.reviewerId = reviewerId; this.numberLikes = numberLikes; this.tauntCount = tauntCount; - this.name = name; + this.detailedReviewName = detailedReviewName; } public Long getDetailedReviewId() { @@ -157,10 +165,36 @@ public class DetailedReview { } public String getName() { - return name; + return detailedReviewName; } public void setName(String name) { - this.name = name; + this.detailedReviewName = name; + } + + public Integer getDetailedReviewStatus() { + return detailedReviewStatus; + } + + public void setDetailedReviewStatus(Integer detailedReviewStatus) { + this.detailedReviewStatus = detailedReviewStatus; + } + + @Override + public String toString() { + return "DetailedReview{" + + "detailedReviewId=" + detailedReviewId + + ", detailsPatientCircleId=" + detailsPatientCircleId + + ", commentTime=" + commentTime + + ", reviewerId=" + reviewerId + + ", numberLikes=" + numberLikes + + ", tauntCount=" + tauntCount + + ", name='" + detailedReviewName + '\'' + + ", detailedReviewStatus=" + detailedReviewStatus + + ", detailedReviewFounder='" + detailedReviewFounder + '\'' + + ", detailedReviewFounderTime=" + detailedReviewFounderTime + + ", detailedReviewModificator='" + detailedReviewModificator + '\'' + + ", detailedReviewModificatorTime=" + detailedReviewModificatorTime + + '}'; } } diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailsPatientCircle.java b/src/main/java/com/four/common/duck/communitypatients/DetailsPatientCircle.java index bf81c3b..85cb031 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailsPatientCircle.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailsPatientCircle.java @@ -72,6 +72,11 @@ public class DetailsPatientCircle { */ private Long numberComments; + /** + * 状态1：未采纳，状态2：已采纳 + */ + private Integer detailsPatientCircleStatus; + /** * 创建人 */ @@ -91,29 +96,6 @@ public class DetailsPatientCircle { return detailsPatientCircleFounder; } - @Override - public String toString() { - return "DetailsPatientCircle{" + - "detailsPatientCircleId=" + detailsPatientCircleId + - ", title='" + title + '\'' + - ", publisherId=" + publisherId + - ", diseaseId=" + diseaseId + - ", departmentId=" + departmentId + - ", detailsSymptoms='" + detailsSymptoms + '\'' + - ", treatmentExperienceStartTime=" + treatmentExperienceStartTime + - ", treatmentExperienceEndTime=" + treatmentExperienceEndTime + - ", treatmentExperience='" + treatmentExperience + '\'' + - ", relatedPictures='" + relatedPictures + '\'' + - ", rewardAmount=" + rewardAmount + - ", collectionQuantity=" + collectionQuantity + - ", numberComments=" + numberComments + - ", detailsPatientCircleFounder='" + detailsPatientCircleFounder + '\'' + - ", detailsPatientCircleFounderTime=" + detailsPatientCircleFounderTime + - ", detailsPatientCircleModificator='" + detailsPatientCircleModificator + '\'' + - ", detailsPatientCircleModificatorTime=" + detailsPatientCircleModificatorTime + - '}'; - } - public void setDetailsPatientCircleFounder(String detailsPatientCircleFounder) { this.detailsPatientCircleFounder = detailsPatientCircleFounder; } @@ -269,4 +251,35 @@ public class DetailsPatientCircle { public void setNumberComments(Long numberComments) { this.numberComments = numberComments; } + public Integer getDetailsPatientCircleStatus() { + return detailsPatientCircleStatus; + } + + public void setDetailsPatientCircleStatus(Integer detailsPatientCircleStatus) { + this.detailsPatientCircleStatus = detailsPatientCircleStatus; + } + + @Override + public String toString() { + return "DetailsPatientCircle{" + + "detailsPatientCircleId=" + detailsPatientCircleId + + ", title='" + title + '\'' + + ", publisherId=" + publisherId + + ", diseaseId=" + diseaseId + + ", departmentId=" + departmentId + + ", detailsSymptoms='" + detailsSymptoms + '\'' + + ", treatmentExperienceStartTime=" + treatmentExperienceStartTime + + ", treatmentExperienceEndTime=" + treatmentExperienceEndTime + + ", treatmentExperience='" + treatmentExperience + '\'' + + ", relatedPictures='" + relatedPictures + '\'' + + ", rewardAmount=" + rewardAmount + + ", collectionQuantity=" + collectionQuantity + + ", numberComments=" + numberComments + + ", detailsPatientCircleStatus=" + detailsPatientCircleStatus + + ", detailsPatientCircleFounder='" + detailsPatientCircleFounder + '\'' + + ", detailsPatientCircleFounderTime=" + detailsPatientCircleFounderTime + + ", detailsPatientCircleModificator='" + detailsPatientCircleModificator + '\'' + + ", detailsPatientCircleModificatorTime=" + detailsPatientCircleModificatorTime + + '}'; + } } diff --git a/src/main/java/com/four/common/duck/communitypatients/SymptomsDrugs.java b/src/main/java/com/four/common/duck/communitypatients/SymptomsDrugs.java index ad250ee..6fbf90a 100644 --- a/src/main/java/com/four/common/duck/communitypatients/SymptomsDrugs.java +++ b/src/main/java/com/four/common/duck/communitypatients/SymptomsDrugs.java @@ -1,5 +1,9 @@ package com.four.common.duck.communitypatients; +import com.four.common.duck.request.SymptomsDrugsRequest; + +import java.util.List; + /** * 常见病症+常见药品表 */ @@ -20,6 +24,11 @@ public class SymptomsDrugs { */ private Long pid; + /** + * 病症+药品 + */ + private List departmentList; + private String aname; private String bname; @@ -45,17 +54,6 @@ public class SymptomsDrugs { */ private String img; - public SymptomsDrugs() { - } - - public SymptomsDrugs(Long id, String name,String aname,String bname, Long pid, String img) { - this.id = id; - this.name = name; - this.pid = pid; - this.img = img; - this.aname = aname; - this.bname = bname; - } public Long getId() { return id; @@ -80,4 +78,33 @@ public class SymptomsDrugs { public void setPid(Long pid) { this.pid = pid; } + + public List getDepartmentList() { + return departmentList; + } + + public void setDepartmentList(List departmentList) { + this.departmentList = departmentList; + } + + public String getImg() { + return img; + } + + public void setImg(String img) { + this.img = img; + } + + public SymptomsDrugs() { + } + + public SymptomsDrugs(Long id, String name, Long pid, List departmentList, String aname, String bname, String img) { + this.id = id; + this.name = name; + this.pid = pid; + this.departmentList = departmentList; + this.aname = aname; + this.bname = bname; + this.img = img; + } } diff --git a/src/main/java/com/four/common/duck/communitypatients/UserSign.java b/src/main/java/com/four/common/duck/communitypatients/UserSign.java new file mode 100644 index 0000000..b11443f --- /dev/null +++ b/src/main/java/com/four/common/duck/communitypatients/UserSign.java @@ -0,0 +1,36 @@ +package com.four.common.duck.communitypatients; + +import lombok.Data; + +import java.util.Date; + +/** + * @program: four-common-duck + * @author: spc + * @create: 2023-11-02 19:08 + * @Version 1.0 + **/ + +@Data +public class UserSign { + /** + *主键ID + */ + private Long userSignId; + + /** + * 用户ID + */ + private Long userId; + + /** + * 签到日期 + */ + private Date signDate; + + /** + * 签到天数 + */ + private Integer signAmount; +} + diff --git a/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java b/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java index b7728f7..96dfecd 100644 --- a/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java +++ b/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java @@ -20,20 +20,10 @@ public class CertifiedBankCard { */ private String realName; - /** - * 性别 - */ - private String realGender; - - /** - * 真实籍贯 - */ - private String trueNativePlace; - /** * 身份证号 */ - private Long idNumber; + private String idNumber; /** * 开户行：银行名称 @@ -46,23 +36,56 @@ public class CertifiedBankCard { private String bankCardNumber; /** - * 状态：1身份证号 2银行卡号 + * 身份证照片路径 */ - private Long certifiedBankCardStatus; + private String cardUrl; + /** + * 银行卡照片路径 + */ + private String bankUrl; - public CertifiedBankCard() { + @Override + public String toString() { + return "CertifiedBankCard{" + + "certifiedBankCardId=" + certifiedBankCardId + + ", userId=" + userId + + ", realName='" + realName + '\'' + + ", idNumber='" + idNumber + '\'' + + ", bankName='" + bankName + '\'' + + ", bankCardNumber='" + bankCardNumber + '\'' + + ", cardUrl='" + cardUrl + '\'' + + ", bankUrl='" + bankUrl + '\'' + + '}'; } - public CertifiedBankCard(Long certifiedBankCardId, Long userId, String realName, String realGender, String trueNativePlace, Long idNumber, String bankName, String bankCardNumber, Long certifiedBankCardStatus) { + public String getCardUrl() { + return cardUrl; + } + + public void setCardUrl(String cardUrl) { + this.cardUrl = cardUrl; + } + + public String getBankUrl() { + return bankUrl; + } + + public void setBankUrl(String bankUrl) { + this.bankUrl = bankUrl; + } + + public CertifiedBankCard(Long certifiedBankCardId, Long userId, String realName, String idNumber, String bankName, String bankCardNumber, String cardUrl, String bankUrl) { this.certifiedBankCardId = certifiedBankCardId; this.userId = userId; this.realName = realName; - this.realGender = realGender; - this.trueNativePlace = trueNativePlace; this.idNumber = idNumber; this.bankName = bankName; this.bankCardNumber = bankCardNumber; - this.certifiedBankCardStatus = certifiedBankCardStatus; + this.cardUrl = cardUrl; + this.bankUrl = bankUrl; + } + + public CertifiedBankCard() { } public Long getCertifiedBankCardId() { @@ -89,27 +112,11 @@ public class CertifiedBankCard { this.realName = realName; } - public String getRealGender() { - return realGender; - } - - public void setRealGender(String realGender) { - this.realGender = realGender; - } - - public String getTrueNativePlace() { - return trueNativePlace; - } - - public void setTrueNativePlace(String trueNativePlace) { - this.trueNativePlace = trueNativePlace; - } - - public Long getIdNumber() { + public String getIdNumber() { return idNumber; } - public void setIdNumber(Long idNumber) { + public void setIdNumber(String idNumber) { this.idNumber = idNumber; } @@ -129,11 +136,12 @@ public class CertifiedBankCard { this.bankCardNumber = bankCardNumber; } - public Long getCertifiedBankCardStatus() { - return certifiedBankCardStatus; - } - - public void setCertifiedBankCardStatus(Long certifiedBankCardStatus) { - this.certifiedBankCardStatus = certifiedBankCardStatus; + public CertifiedBankCard(Long certifiedBankCardId, Long userId, String realName, String idNumber, String bankName, String bankCardNumber) { + this.certifiedBankCardId = certifiedBankCardId; + this.userId = userId; + this.realName = realName; + this.idNumber = idNumber; + this.bankName = bankName; + this.bankCardNumber = bankCardNumber; } } diff --git a/src/main/java/com/four/common/duck/domain/GiftRecord.java b/src/main/java/com/four/common/duck/domain/GiftRecord.java index 470809f..7b380a3 100644 --- a/src/main/java/com/four/common/duck/domain/GiftRecord.java +++ b/src/main/java/com/four/common/duck/domain/GiftRecord.java @@ -17,6 +17,13 @@ public class GiftRecord { */ private Long giverId; + + /** + *收礼人id + */ + private Long registrationInformationId; + + /** * 礼物id */ @@ -30,9 +37,10 @@ public class GiftRecord { public GiftRecord() { } - public GiftRecord(Long giftRecordId, Long giverId, Long giftId, Date giftGivingTime) { + public GiftRecord(Long giftRecordId, Long giverId, Long registrationInformationId, Long giftId, Date giftGivingTime) { this.giftRecordId = giftRecordId; this.giverId = giverId; + this.registrationInformationId = registrationInformationId; this.giftId = giftId; this.giftGivingTime = giftGivingTime; } @@ -68,4 +76,12 @@ public class GiftRecord { public void setGiftGivingTime(Date giftGivingTime) { this.giftGivingTime = giftGivingTime; } + + public Long getRegistrationInformationId() { + return registrationInformationId; + } + + public void setRegistrationInformationId(Long registrationInformationId) { + this.registrationInformationId = registrationInformationId; + } } diff --git a/src/main/java/com/four/common/duck/domain/RechargeWithdrawCash.java b/src/main/java/com/four/common/duck/domain/RechargeWithdrawCash.java index fe0c630..3834fd1 100644 --- a/src/main/java/com/four/common/duck/domain/RechargeWithdrawCash.java +++ b/src/main/java/com/four/common/duck/domain/RechargeWithdrawCash.java @@ -1,5 +1,8 @@ package com.four.common.duck.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + import java.math.BigDecimal; import java.util.Date; @@ -9,51 +12,36 @@ import java.util.Date; public class RechargeWithdrawCash { /** - * 充值+提现id + * 钱包记录id */ private Long rechargeWithdrawCashId; /** - * 充值+提现用户id + * 用户id */ private Long userId; /** - * 充值+提现金额 - */ - private BigDecimal money; - - /** - * 充值+提现时间 + * 钱包记录时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT-8") private Date time; /** - * 状态：1:提现 2:充值+签到 + * 钱包记录描述 */ - private Long status; + private String description; /** - * 用户的实名认证和银行卡id + * 金额 */ - private Long certifiedBankCardId; + private BigDecimal amount; public Long getRechargeWithdrawCashId() { return rechargeWithdrawCashId; } - public RechargeWithdrawCash() { - } - - public RechargeWithdrawCash(Long rechargeWithdrawCashId, Long userId, BigDecimal money, Date time, Long status, Long certifiedBankCardId) { - this.rechargeWithdrawCashId = rechargeWithdrawCashId; - this.userId = userId; - this.money = money; - this.time = time; - this.status = status; - this.certifiedBankCardId = certifiedBankCardId; - } - public void setRechargeWithdrawCashId(Long rechargeWithdrawCashId) { this.rechargeWithdrawCashId = rechargeWithdrawCashId; } @@ -66,14 +54,6 @@ public class RechargeWithdrawCash { this.userId = userId; } - public BigDecimal getMoney() { - return money; - } - - public void setMoney(BigDecimal money) { - this.money = money; - } - public Date getTime() { return time; } @@ -82,19 +62,30 @@ public class RechargeWithdrawCash { this.time = time; } - public Long getStatus() { - return status; + public String getDescription() { + return description; } - public void setStatus(Long status) { - this.status = status; + public void setDescription(String description) { + this.description = description; } - public Long getCertifiedBankCardId() { - return certifiedBankCardId; + public BigDecimal getAmount() { + return amount; } - public void setCertifiedBankCardId(Long certifiedBankCardId) { - this.certifiedBankCardId = certifiedBankCardId; + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public RechargeWithdrawCash() { + } + + public RechargeWithdrawCash(Long rechargeWithdrawCashId, Long userId, Date time, String description, BigDecimal amount) { + this.rechargeWithdrawCashId = rechargeWithdrawCashId; + this.userId = userId; + this.time = time; + this.description = description; + this.amount = amount; } } diff --git a/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java b/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java index 974b00f..830e3cd 100644 --- a/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java +++ b/src/main/java/com/four/common/duck/interrogation/AdvisoryCollection.java @@ -1,6 +1,8 @@ package com.four.common.duck.interrogation; +import java.util.Date; + /** * 健康咨询收藏表 */ @@ -17,6 +19,8 @@ public class AdvisoryCollection { */ private Long consultationDetailsId; + private Date advisoryCollectionTime; + /** * 收藏人id */ @@ -46,12 +50,22 @@ public class AdvisoryCollection { this.userId = userId; } + + public Date getAdvisoryCollectionTime() { + return advisoryCollectionTime; + } + + public void setAdvisoryCollectionTime(Date advisoryCollectionTime) { + this.advisoryCollectionTime = advisoryCollectionTime; + } + public AdvisoryCollection() { } - public AdvisoryCollection(Long advisoryCollectionId, Long consultationDetailsId, Long userId) { + public AdvisoryCollection(Long advisoryCollectionId, Long consultationDetailsId, Date advisoryCollectionTime, Long userId) { this.advisoryCollectionId = advisoryCollectionId; this.consultationDetailsId = consultationDetailsId; + this.advisoryCollectionTime = advisoryCollectionTime; this.userId = userId; } } diff --git a/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java b/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java index 9e598ed..6e9bb19 100644 --- a/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java +++ b/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java @@ -1,11 +1,14 @@ package com.four.common.duck.interrogation; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; /** * 健康咨询详情表 */ -public class ConsultationDetails extends ConsultationDetailsType{ +public class ConsultationDetails { /** * 健康咨询详情id @@ -25,6 +28,8 @@ public class ConsultationDetails extends ConsultationDetailsType{ /** * 发布时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT-8") private Date releaseTime; /** @@ -33,14 +38,19 @@ public class ConsultationDetails extends ConsultationDetailsType{ private String consultationDetailsContent; /** - * 类型 + * 类型id */ private Long consultationDetailsTypeId; + /** + * 图片 + */ + private String consultationDetailsImg; /** * 发布人名称 */ - private String username; + private String userName; + public Long getConsultationDetailsId() { return consultationDetailsId; @@ -90,25 +100,33 @@ public class ConsultationDetails extends ConsultationDetailsType{ this.consultationDetailsTypeId = consultationDetailsTypeId; } - public String getUsername() { - return username; + public String getConsultationDetailsImg() { + return consultationDetailsImg; } - public void setUsername(String username) { - this.username = username; + public void setConsultationDetailsImg(String consultationDetailsImg) { + this.consultationDetailsImg = consultationDetailsImg; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; } public ConsultationDetails() { } - public ConsultationDetails(Long consultationDetailsId, String consultationDetailsTitle, Long userId, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String username) { + public ConsultationDetails(Long consultationDetailsId, String consultationDetailsTitle, Long userId, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String consultationDetailsImg, String userName) { this.consultationDetailsId = consultationDetailsId; this.consultationDetailsTitle = consultationDetailsTitle; this.userId = userId; this.releaseTime = releaseTime; this.consultationDetailsContent = consultationDetailsContent; this.consultationDetailsTypeId = consultationDetailsTypeId; - this.username = username; + this.consultationDetailsImg = consultationDetailsImg; + this.userName = userName; } - } diff --git a/src/main/java/com/four/common/duck/interrogation/ConsultationDetailsType.java b/src/main/java/com/four/common/duck/interrogation/ConsultationDetailsType.java index 58f00df..3943091 100644 --- a/src/main/java/com/four/common/duck/interrogation/ConsultationDetailsType.java +++ b/src/main/java/com/four/common/duck/interrogation/ConsultationDetailsType.java @@ -1,5 +1,7 @@ package com.four.common.duck.interrogation; +import java.util.List; + /** * @author: tongCheng * @Package: four-common-duck @@ -8,10 +10,19 @@ package com.four.common.duck.interrogation; **/ public class ConsultationDetailsType { + /** + * 健康资讯分类主键 + */ private Long consultationDetailsTypeId; + /** + * 健康资讯分类名称 + */ + private String consultationDetailsTypeName; + private List consultationDetailsList; + public Long getConsultationDetailsTypeId() { return consultationDetailsTypeId; @@ -29,11 +40,20 @@ public class ConsultationDetailsType { this.consultationDetailsTypeName = consultationDetailsTypeName; } + public List getConsultationDetailsList() { + return consultationDetailsList; + } + + public void setConsultationDetailsList(List consultationDetailsList) { + this.consultationDetailsList = consultationDetailsList; + } + public ConsultationDetailsType() { } - public ConsultationDetailsType(Long consultationDetailsTypeId, String consultationDetailsTypeName) { + public ConsultationDetailsType(Long consultationDetailsTypeId, String consultationDetailsTypeName, List consultationDetailsList) { this.consultationDetailsTypeId = consultationDetailsTypeId; this.consultationDetailsTypeName = consultationDetailsTypeName; + this.consultationDetailsList = consultationDetailsList; } } diff --git a/src/main/java/com/four/common/duck/my/MyFile.java b/src/main/java/com/four/common/duck/my/MyFile.java index f006f28..1b654db 100644 --- a/src/main/java/com/four/common/duck/my/MyFile.java +++ b/src/main/java/com/four/common/duck/my/MyFile.java @@ -68,6 +68,8 @@ public class MyFile { */ private Long userId; + private String[] StringBuilder; + public Long getMyFileId() { return myFileId; } @@ -148,10 +150,18 @@ public class MyFile { this.userId = userId; } + public String[] getStringBuilder() { + return StringBuilder; + } + + public void setStringBuilder(String[] stringBuilder) { + StringBuilder = stringBuilder; + } + public MyFile() { } - public MyFile(Long myFileId, String mainSymptoms, String presentMedicalHistory, String pastMedicalHistory, String treatmentExperienceLast, Date startTime, Date endTime, String therapeuticProcess, String relatedPic, Long userId) { + public MyFile(Long myFileId, String mainSymptoms, String presentMedicalHistory, String pastMedicalHistory, String treatmentExperienceLast, Date startTime, Date endTime, String therapeuticProcess, String relatedPic, Long userId, String[] stringBuilder) { this.myFileId = myFileId; this.mainSymptoms = mainSymptoms; this.presentMedicalHistory = presentMedicalHistory; @@ -162,5 +172,6 @@ public class MyFile { this.therapeuticProcess = therapeuticProcess; this.relatedPic = relatedPic; this.userId = userId; + StringBuilder = stringBuilder; } } diff --git a/src/main/java/com/four/common/duck/my/MyNews.java b/src/main/java/com/four/common/duck/my/MyNews.java new file mode 100644 index 0000000..bffda90 --- /dev/null +++ b/src/main/java/com/four/common/duck/my/MyNews.java @@ -0,0 +1,114 @@ +package com.four.common.duck.my; + +import java.util.Date; +import java.util.List; + +/** + * @author: tongCheng + * @Package: four-common-duck + * @ClassName: MyNews + * @date: 2023-11-01 14:54 + **/ +public class MyNews { + + /** + * 我的消息id + */ + private Long myNewsId; + + /** + * 用户id + */ + private Long userId; + + /** + * 消息内容 + */ + private String messageContent; + + /** + * 消息时间 + */ + private Date messageTime; + + /** + * 消息类型 1系统消息 2问诊消息 3H币入账消息 + */ + private Long myNewsTypeId; + + /** + * 是否已读 1已读 2未读 + */ + private int isRead; + + private List noMyNewsList; + + public Long getMyNewsId() { + return myNewsId; + } + + public void setMyNewsId(Long myNewsId) { + this.myNewsId = myNewsId; + } + + public String getMessageContent() { + return messageContent; + } + + public void setMessageContent(String messageContent) { + this.messageContent = messageContent; + } + + public Date getMessageTime() { + return messageTime; + } + + public void setMessageTime(Date messageTime) { + this.messageTime = messageTime; + } + + public Long getMyNewsTypeId() { + return myNewsTypeId; + } + + public void setMyNewsTypeId(Long myNewsTypeId) { + this.myNewsTypeId = myNewsTypeId; + } + + public int getIsRead() { + return isRead; + } + + public void setIsRead(int isRead) { + this.isRead = isRead; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public List getNoMyNewsList() { + return noMyNewsList; + } + + public void setNoMyNewsList(List noMyNewsList) { + this.noMyNewsList = noMyNewsList; + } + + public MyNews() { + } + + public MyNews(Long myNewsId, Long userId, String messageContent, Date messageTime, Long myNewsTypeId, int isRead, List noMyNewsList) { + this.myNewsId = myNewsId; + this.messageContent = messageContent; + this.messageTime = messageTime; + this.myNewsTypeId = myNewsTypeId; + this.isRead = isRead; + this.userId = userId; + this.noMyNewsList = noMyNewsList; + } +} diff --git a/src/main/java/com/four/common/duck/my/MyNewsType.java b/src/main/java/com/four/common/duck/my/MyNewsType.java new file mode 100644 index 0000000..d72a083 --- /dev/null +++ b/src/main/java/com/four/common/duck/my/MyNewsType.java @@ -0,0 +1,53 @@ +package com.four.common.duck.my; + +import java.util.Date; +import java.util.List; + +/** + * @author: tongCheng + * @Package: four-common-duck + * @ClassName: MyNews + * @date: 2023-11-01 14:54 + **/ +public class MyNewsType { + private Long myNewsTypeId; + private String myNewsTypeName; + + private List myNewsList; + + + public Long getMyNewsTypeId() { + return myNewsTypeId; + } + + public void setMyNewsTypeId(Long myNewsTypeId) { + this.myNewsTypeId = myNewsTypeId; + } + + public String getMyNewsTypeName() { + return myNewsTypeName; + } + + public void setMyNewsTypeName(String myNewsTypeName) { + this.myNewsTypeName = myNewsTypeName; + } + + public List getMyNewsList() { + return myNewsList; + } + + public void setMyNewsList(List myNewsList) { + this.myNewsList = myNewsList; + } + + + public MyNewsType() { + } + + public MyNewsType(Long myNewsTypeId, String myNewsTypeName, List myNewsList) { + this.myNewsTypeId = myNewsTypeId; + this.myNewsTypeName = myNewsTypeName; + this.myNewsList = myNewsList; + + } +} diff --git a/src/main/java/com/four/common/duck/request/AdvisoryCollectionRequest.java b/src/main/java/com/four/common/duck/request/AdvisoryCollectionRequest.java new file mode 100644 index 0000000..e15a7d4 --- /dev/null +++ b/src/main/java/com/four/common/duck/request/AdvisoryCollectionRequest.java @@ -0,0 +1,159 @@ +package com.four.common.duck.request; + +import java.util.Date; + +/** + * @author: tongCheng + * @Package: four-common-duck + * @ClassName: AdvisoryCollectionRequest + * @date: 2023-10-27 18:53 + **/ +public class AdvisoryCollectionRequest { + + /** + * 健康咨询收藏id + */ + private Long advisoryCollectionId; + + /** + * 咨询详情id + */ + private Long consultationDetailsId; + + /** + * 收藏时间 + */ + private Date advisoryCollectionTime; + + /** + * 收藏人id + */ + private Long userId; + + /** + * 健康咨询详情标题 + */ + private String consultationDetailsTitle; + + /** + * 发布人 + */ + private String userName; + + /** + * 发布时间 + */ + private Date releaseTime; + + /** + * 内容 + */ + private String consultationDetailsContent; + + /** + * 类型 + */ + private Long consultationDetailsTypeId; + + /** + * 类型 + */ + private String consultationDetailsTypeName; + + + public Long getAdvisoryCollectionId() { + return advisoryCollectionId; + } + + public void setAdvisoryCollectionId(Long advisoryCollectionId) { + this.advisoryCollectionId = advisoryCollectionId; + } + + public Long getConsultationDetailsId() { + return consultationDetailsId; + } + + public void setConsultationDetailsId(Long consultationDetailsId) { + this.consultationDetailsId = consultationDetailsId; + } + + public Date getAdvisoryCollectionTime() { + return advisoryCollectionTime; + } + + public void setAdvisoryCollectionTime(Date advisoryCollectionTime) { + this.advisoryCollectionTime = advisoryCollectionTime; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getConsultationDetailsTitle() { + return consultationDetailsTitle; + } + + public void setConsultationDetailsTitle(String consultationDetailsTitle) { + this.consultationDetailsTitle = consultationDetailsTitle; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public Date getReleaseTime() { + return releaseTime; + } + + public void setReleaseTime(Date releaseTime) { + this.releaseTime = releaseTime; + } + + public String getConsultationDetailsContent() { + return consultationDetailsContent; + } + + public void setConsultationDetailsContent(String consultationDetailsContent) { + this.consultationDetailsContent = consultationDetailsContent; + } + + public Long getConsultationDetailsTypeId() { + return consultationDetailsTypeId; + } + + public void setConsultationDetailsTypeId(Long consultationDetailsTypeId) { + this.consultationDetailsTypeId = consultationDetailsTypeId; + } + + public String getConsultationDetailsTypeName() { + return consultationDetailsTypeName; + } + + public void setConsultationDetailsTypeName(String consultationDetailsTypeName) { + this.consultationDetailsTypeName = consultationDetailsTypeName; + } + + public AdvisoryCollectionRequest() { + } + + public AdvisoryCollectionRequest(Long advisoryCollectionId, Long consultationDetailsId, Date advisoryCollectionTime, Long userId, String consultationDetailsTitle, String userName, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String consultationDetailsTypeName) { + this.advisoryCollectionId = advisoryCollectionId; + this.consultationDetailsId = consultationDetailsId; + this.advisoryCollectionTime = advisoryCollectionTime; + this.userId = userId; + this.consultationDetailsTitle = consultationDetailsTitle; + this.userName = userName; + this.releaseTime = releaseTime; + this.consultationDetailsContent = consultationDetailsContent; + this.consultationDetailsTypeId = consultationDetailsTypeId; + this.consultationDetailsTypeName = consultationDetailsTypeName; + } +} diff --git a/src/main/java/com/four/common/duck/request/DrugDetailsRequest.java b/src/main/java/com/four/common/duck/request/DrugDetailsRequest.java deleted file mode 100644 index b633232..0000000 --- a/src/main/java/com/four/common/duck/request/DrugDetailsRequest.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.four.common.duck.request; - -/** - * @author: tongCheng - * @Package: four-common-duck - * @ClassName: DrugDetailsRequest - * @date: 2023-10-20 19:06 - * 药品详情+病症药品表联查 - **/ -public class DrugDetailsRequest { - /** - * 药品详情id - */ - private Long drugDetailsId; - - /** - * 常见病症+常见药品表id - */ - private Long id; - - /** - * 药品成分 - */ - private String pharmaceuticalIngredient; - - /** - * 用药禁忌 - */ - private String drugContraindication; - - /** - * 功能主治 - */ - private String functionalIndications; - - /** - * 用法用量 - */ - private String usageDosage; - - /** - * 药品性状 - */ - private String drugCharacter; - - /** - * 包装规格 - */ - private String packingSpecification; - - /** - * 不良反应 - */ - private String adverseReaction; - - /** - * 名称 - */ - private String name; - - /** - * 与id关联 - */ - private Long pid; - - - public Long getDrugDetailsId() { - return drugDetailsId; - } - - public void setDrugDetailsId(Long drugDetailsId) { - this.drugDetailsId = drugDetailsId; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getPharmaceuticalIngredient() { - return pharmaceuticalIngredient; - } - - public void setPharmaceuticalIngredient(String pharmaceuticalIngredient) { - this.pharmaceuticalIngredient = pharmaceuticalIngredient; - } - - public String getDrugContraindication() { - return drugContraindication; - } - - public void setDrugContraindication(String drugContraindication) { - this.drugContraindication = drugContraindication; - } - - public String getFunctionalIndications() { - return functionalIndications; - } - - public void setFunctionalIndications(String functionalIndications) { - this.functionalIndications = functionalIndications; - } - - public String getUsageDosage() { - return usageDosage; - } - - public void setUsageDosage(String usageDosage) { - this.usageDosage = usageDosage; - } - - public String getDrugCharacter() { - return drugCharacter; - } - - public void setDrugCharacter(String drugCharacter) { - this.drugCharacter = drugCharacter; - } - - public String getPackingSpecification() { - return packingSpecification; - } - - public void setPackingSpecification(String packingSpecification) { - this.packingSpecification = packingSpecification; - } - - public String getAdverseReaction() { - return adverseReaction; - } - - public void setAdverseReaction(String adverseReaction) { - this.adverseReaction = adverseReaction; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Long getPid() { - return pid; - } - - public void setPid(Long pid) { - this.pid = pid; - } - - public DrugDetailsRequest() { - } - - public DrugDetailsRequest(Long drugDetailsId, Long id, String pharmaceuticalIngredient, String drugContraindication, String functionalIndications, String usageDosage, String drugCharacter, String packingSpecification, String adverseReaction, String name, Long pid) { - this.drugDetailsId = drugDetailsId; - this.id = id; - this.pharmaceuticalIngredient = pharmaceuticalIngredient; - this.drugContraindication = drugContraindication; - this.functionalIndications = functionalIndications; - this.usageDosage = usageDosage; - this.drugCharacter = drugCharacter; - this.packingSpecification = packingSpecification; - this.adverseReaction = adverseReaction; - this.name = name; - this.pid = pid; - } -} diff --git a/src/main/java/com/four/common/duck/request/MedicineDetailRequest.java b/src/main/java/com/four/common/duck/request/MedicineDetailRequest.java new file mode 100644 index 0000000..42dc9bc --- /dev/null +++ b/src/main/java/com/four/common/duck/request/MedicineDetailRequest.java @@ -0,0 +1,167 @@ +package com.four.common.duck.request; + +import java.util.Date; + +/** + * @author: tongCheng + * @Package: dimensional-health-homePage + * @ClassName: MedicineDetail + * @date: 2023-10-25 18:49 + **/ +public class MedicineDetailRequest { + + /** + * 药品详情id + */ + private Long medicineDetailId; + + /** + * 药品id + */ + private Long medicineId; + + /** + * 药品成分 + */ + private String ingredient; + + /** + * 用药禁忌 + */ + private String medicineAvoid; + + /** + * 功能主治 + */ + private String majorFunction; + + /** + * 用法用量 + */ + private String usageAndDosage; + + /** + * 药品形状 + */ + private String character; + + /** + * 包装规格 + */ + private String packageSpecification; + + /** + * 不良反应 + */ + private String adverseReaction; + + private String name; + + private Long pid; + + + public Long getMedicineDetailId() { + return medicineDetailId; + } + + public void setMedicineDetailId(Long medicineDetailId) { + this.medicineDetailId = medicineDetailId; + } + + public Long getMedicineId() { + return medicineId; + } + + public void setMedicineId(Long medicineId) { + this.medicineId = medicineId; + } + + public String getIngredient() { + return ingredient; + } + + public void setIngredient(String ingredient) { + this.ingredient = ingredient; + } + + public String getMedicineAvoid() { + return medicineAvoid; + } + + public void setMedicineAvoid(String medicineAvoid) { + this.medicineAvoid = medicineAvoid; + } + + public String getMajorFunction() { + return majorFunction; + } + + public void setMajorFunction(String majorFunction) { + this.majorFunction = majorFunction; + } + + public String getUsageAndDosage() { + return usageAndDosage; + } + + public void setUsageAndDosage(String usageAndDosage) { + this.usageAndDosage = usageAndDosage; + } + + public String getCharacter() { + return character; + } + + public void setCharacter(String character) { + this.character = character; + } + + public String getPackageSpecification() { + return packageSpecification; + } + + public void setPackageSpecification(String packageSpecification) { + this.packageSpecification = packageSpecification; + } + + public String getAdverseReaction() { + return adverseReaction; + } + + public void setAdverseReaction(String adverseReaction) { + this.adverseReaction = adverseReaction; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getPid() { + return pid; + } + + public void setPid(Long pid) { + this.pid = pid; + } + + public MedicineDetailRequest() { + } + + public MedicineDetailRequest(Long medicineDetailId, Long medicineId, String ingredient, String medicineAvoid, String majorFunction, String usageAndDosage, String character, String packageSpecification, String adverseReaction, String name, Long pid) { + this.medicineDetailId = medicineDetailId; + this.medicineId = medicineId; + this.ingredient = ingredient; + this.medicineAvoid = medicineAvoid; + this.majorFunction = majorFunction; + this.usageAndDosage = usageAndDosage; + this.character = character; + this.packageSpecification = packageSpecification; + this.adverseReaction = adverseReaction; + this.name = name; + this.pid = pid; + } +} diff --git a/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java new file mode 100644 index 0000000..a6d8edf --- /dev/null +++ b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java @@ -0,0 +1,77 @@ +package com.four.common.duck.request; + +import com.four.common.duck.communitypatients.DiseaseDetail; +import com.four.common.duck.communitypatients.MedicineDetail; +import com.four.common.duck.communitypatients.SymptomsDrugs; + +import java.util.List; + +/** + * @author: tongCheng + * @Package: four-common-duck + * @ClassName: SymptomsDrugsRequest + * @date: 2023-10-31 21:23 + **/ +public class SymptomsDrugsRequest { + /** + * 常见病症+常见药品id + */ + private Long id; + + /** + * 名称 + */ + private String name; + + /** + * 与id关联 + */ + private Long pid; + + + private List symptomsDrugsRequestList; + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getPid() { + return pid; + } + + public void setPid(Long pid) { + this.pid = pid; + } + + + public List getSymptomsDrugsRequestList() { + return symptomsDrugsRequestList; + } + + public void setSymptomsDrugsRequestList(List symptomsDrugsRequestList) { + this.symptomsDrugsRequestList = symptomsDrugsRequestList; + } + + public SymptomsDrugsRequest() { + } + + public SymptomsDrugsRequest(Long id, String name, Long pid, List symptomsDrugsRequestList) { + this.id = id; + this.name = name; + this.pid = pid; + this.symptomsDrugsRequestList = symptomsDrugsRequestList; + } +} diff --git a/src/main/java/com/four/common/duck/request/UserRequest.java b/src/main/java/com/four/common/duck/request/UserRequest.java new file mode 100644 index 0000000..73ad618 --- /dev/null +++ b/src/main/java/com/four/common/duck/request/UserRequest.java @@ -0,0 +1,51 @@ +package com.four.common.duck.request; + +public class UserRequest { + /** + * 用户名称 + */ + private String username; + + /** + *用户密码 + */ + private String password; + + /** + * 发送内容 + */ + private String msg; + + 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; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public UserRequest() { + } + + public UserRequest(String username, String password, String msg) { + this.username = username; + this.password = password; + this.msg = msg; + } +} diff --git a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java index 6191a52..bca8e67 100644 --- a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java @@ -78,6 +78,10 @@ public class DetailsPatientCircleDetailCollection { * 评论数量 */ private Long numberComments; + /** + * 状态1：未采纳，状态2：已采纳 + */ + private Integer detailsPatientCircleStatus; //-------------------------------------------------------- //-------------------------------------------------------- @@ -113,7 +117,12 @@ public class DetailsPatientCircleDetailCollection { /** * 收藏人 */ - private String collector; + private Long collectorId; + + /** + * 状态 + */ + private Integer detailCollectionStatus; //------------------------------------------------------------ //------------------------------------------------------------ //------------------------------------------------------------ diff --git a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailedReview.java b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailedReview.java index 4786638..f6c5050 100644 --- a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailedReview.java +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailedReview.java @@ -77,6 +77,10 @@ public class DetailsPatientCircleDetailedReview { * 评论数量 */ private Long numberComments; + /** + * 状态1：未采纳，状态2：已采纳 + */ + private Integer detailsPatientCircleStatus; //------------------------------------------------------ //------------------------------------------------------ @@ -111,6 +115,32 @@ public class DetailsPatientCircleDetailedReview { * 评论内容 * @return */ - private String name; + private String detailedReviewName; + + + /** + * 状态1：未采纳；状态2：采纳 + */ + private Integer detailedReviewStatus; + + /** + *创建人 + */ + private String detailedReviewFounder; + + /** + *创建时间 + */ + private Date detailedReviewFounderTime; + + /** + * 修改人 + */ + private String detailedReviewModificator; + + /** + * 修改时间 + */ + private Date detailedReviewModificatorTime; } diff --git a/src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java b/src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java index f1d8e2b..2ecf061 100644 --- a/src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java @@ -78,6 +78,10 @@ public class DetailsPatientCircleSymptomsDrugs { * 评论数量 */ private Long numberComments; + /** + * 状态1：未采纳，状态2：已采纳 + */ + private Integer detailsPatientCircleStatus; //---------------------------------------------------------- //---------------------------------------------------------- @@ -180,5 +184,61 @@ public class DetailsPatientCircleSymptomsDrugs { * 余额 */ private String invitationCode; + + //----------------------------------------- + //----------------------------------------- + //----------------------------------------- + /** + * 详情表中的评论id + */ + private Long detailedReviewId; + + + /** + * 评论时间 + */ + private Date commentTime; + + /** + * 评论人id + */ + private Long reviewerId; + + /** + * 点赞次数 + */ + private Long numberLikes; + + /** + * 嘲讽次数 + */ + private Long tauntCount; + + /*** + * 评论内容 + * @return + */ + private String detailedReviewName; + + + /** + * 状态1：未采纳；状态2：采纳 + */ + private Integer detailedReviewStatus; + + /** + *创建人 + */ + private String detailedReviewFounder; + + /** + *创建时间 + */ + private Date detailedReviewFounderTime; + + /** + * 修改人 + */ + private String detailedReviewModificator; } diff --git a/src/main/java/com/four/common/duck/utils/FastUtil.java b/src/main/java/com/four/common/duck/utils/FastUtil.java index 5f37056..59ac056 100644 --- a/src/main/java/com/four/common/duck/utils/FastUtil.java +++ b/src/main/java/com/four/common/duck/utils/FastUtil.java @@ -16,7 +16,6 @@ import javax.annotation.Resource; * @CreateTime: 2023-02-01 08:52 */ @Component - public class FastUtil { private static final Logger log = LoggerFactory.getLogger(FastUtil.class); diff --git a/src/main/java/com/four/common/duck/video/Video.java b/src/main/java/com/four/common/duck/video/Video.java index 7c24006..aa2ecb2 100644 --- a/src/main/java/com/four/common/duck/video/Video.java +++ b/src/main/java/com/four/common/duck/video/Video.java @@ -1,6 +1,8 @@ package com.four.common.duck.video; +import java.math.BigDecimal; + /** * 视频表 */ @@ -25,6 +27,26 @@ public class Video { * 视频路径 */ private String videoPath; + /** + * 视频价格 + */ + private BigDecimal videoMoney; + + public BigDecimal getVideoMoney() { + return videoMoney; + } + + public void setVideoMoney(BigDecimal videoMoney) { + this.videoMoney = videoMoney; + } + + public Video(Long videoId, String videoTitle, String videoDetails, String videoPath, BigDecimal videoMoney) { + this.videoId = videoId; + this.videoTitle = videoTitle; + this.videoDetails = videoDetails; + this.videoPath = videoPath; + this.videoMoney = videoMoney; + } public Long getVideoId() { return videoId;