From 5230e5d0ba065d915d0961549acf6fcbd65474c4 Mon Sep 17 00:00:00 2001 From: life <1733802689@qq.com> Date: Thu, 26 Oct 2023 16:48:52 +0800 Subject: [PATCH 01/47] =?UTF-8?q?=E7=A4=BC=E7=89=A9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=94=B6=E7=A4=BC=E4=BA=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../four/common/duck/domain/GiftRecord.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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; + } } From 2761e8ff1a6bb5302fce4d176f034e228d21dea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Thu, 26 Oct 2023 19:35:30 +0800 Subject: [PATCH 02/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8D=AF=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85Request?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/request/DrugDetailsRequest.java | 171 ------------------ .../duck/request/MedicineDetailRequest.java | 167 +++++++++++++++++ 2 files changed, 167 insertions(+), 171 deletions(-) delete mode 100644 src/main/java/com/four/common/duck/request/DrugDetailsRequest.java create mode 100644 src/main/java/com/four/common/duck/request/MedicineDetailRequest.java 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; + } +} From b663b208b5242d5f82c8eaa34283a3530655c21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Thu, 26 Oct 2023 20:29:50 +0800 Subject: [PATCH 03/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E8=AE=AF?= =?UTF-8?q?=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/interrogation/ConsultationDetails.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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..d0c40fa 100644 --- a/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java +++ b/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java @@ -40,7 +40,7 @@ public class ConsultationDetails extends ConsultationDetailsType{ /** * 发布人名称 */ - private String username; + private String userName; public Long getConsultationDetailsId() { return consultationDetailsId; @@ -90,25 +90,25 @@ public class ConsultationDetails extends ConsultationDetailsType{ this.consultationDetailsTypeId = consultationDetailsTypeId; } - public String getUsername() { - return username; + public String getUserName() { + return userName; } - public void setUsername(String username) { - this.username = 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 userName) { this.consultationDetailsId = consultationDetailsId; this.consultationDetailsTitle = consultationDetailsTitle; this.userId = userId; this.releaseTime = releaseTime; this.consultationDetailsContent = consultationDetailsContent; this.consultationDetailsTypeId = consultationDetailsTypeId; - this.username = username; + this.userName = userName; } } From 127c351e48313ba226bbd9255a66796ed513ee2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Fri, 27 Oct 2023 13:56:52 +0800 Subject: [PATCH 04/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E8=AE=AF?= =?UTF-8?q?=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/four/common/duck/my/MyFile.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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; } } From 45d23a478e6b5470e9b759d3651a158611708634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Fri, 27 Oct 2023 16:21:50 +0800 Subject: [PATCH 05/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/interrogation/ConsultationDetails.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 d0c40fa..d802e6b 100644 --- a/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java +++ b/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java @@ -42,6 +42,8 @@ public class ConsultationDetails extends ConsultationDetailsType{ */ private String userName; + private Integer status; + public Long getConsultationDetailsId() { return consultationDetailsId; } @@ -98,10 +100,18 @@ public class ConsultationDetails extends ConsultationDetailsType{ this.userName = userName; } + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + 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 userName, Integer status) { this.consultationDetailsId = consultationDetailsId; this.consultationDetailsTitle = consultationDetailsTitle; this.userId = userId; @@ -109,6 +119,7 @@ public class ConsultationDetails extends ConsultationDetailsType{ this.consultationDetailsContent = consultationDetailsContent; this.consultationDetailsTypeId = consultationDetailsTypeId; this.userName = userName; + this.status = status; } } From 3b45f5fea88e33eb33ef07d79dca4ff116611639 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:30:06 +0800 Subject: [PATCH 06/47] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detailCollectionRecord.java | 50 +++++++++++++++++++ .../com/four/common/duck/utils/FastUtil.java | 1 - 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java 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..064c959 --- /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/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); From 9a3d8df27e359b441f9ea556da5d388e1ce98d9e Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:31:16 +0800 Subject: [PATCH 07/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{detailCollectionRecord.java => DetailCollectionRecord.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/java/com/four/common/duck/communitypatients/{detailCollectionRecord.java => DetailCollectionRecord.java} (95%) diff --git a/src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java b/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java similarity index 95% rename from src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java rename to src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java index 064c959..b36123b 100644 --- a/src/main/java/com/four/common/duck/communitypatients/detailCollectionRecord.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java @@ -16,7 +16,7 @@ import java.util.Date; */ @Data -public class detailCollectionRecord { +public class DetailCollectionRecord { /** * 收藏记录id */ From e5bf96ab3397ffef1fe9c6cbcc265a1674a1eab3 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:32:53 +0800 Subject: [PATCH 08/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/duck/communitypatients/DetailCollectionRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java b/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java index b36123b..171df37 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollectionRecord.java @@ -16,7 +16,7 @@ import java.util.Date; */ @Data -public class DetailCollectionRecord { +public class DetailCollectionRecord { /** * 收藏记录id */ From c60295926e01cf54f93336329ecadd9df85c305a Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:48:54 +0800 Subject: [PATCH 09/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitypatients/DetailCollection.java | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) 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..3c092cc 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java @@ -25,7 +25,7 @@ public class DetailCollection { /** * 收藏人 */ - private String collector; + private Long collectorId; /** * 创建人 @@ -107,13 +107,6 @@ public class DetailCollection { this.collectionTime = collectionTime; } - public String getCollector() { - return collector; - } - - public void setCollector(String collector) { - this.collector = collector; - } public DetailCollection() { } @@ -122,6 +115,27 @@ public class DetailCollection { this.detailCollectionId = detailCollectionId; this.detailsPatientCircleId = detailsPatientCircleId; this.collectionTime = collectionTime; - this.collector = collector; + } + + @Override + public String toString() { + return "DetailCollection{" + + "detailCollectionId=" + detailCollectionId + + ", detailsPatientCircleId=" + detailsPatientCircleId + + ", collectionTime=" + collectionTime + + ", collectorId=" + collectorId + + ", detailCollectionFounder='" + detailCollectionFounder + '\'' + + ", detailCollectionFounderTime=" + detailCollectionFounderTime + + ", detailCollectionModificator='" + detailCollectionModificator + '\'' + + ", detailCollectionModificatorTime=" + detailCollectionModificatorTime + + '}'; + } + + public Long getCollectorId() { + return collectorId; + } + + public void setCollectorId(Long collectorId) { + this.collectorId = collectorId; } } From 5f38c5367ab50833d6c760eaec75763517afcda2 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:50:17 +0800 Subject: [PATCH 10/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../four/common/duck/communitypatients/DetailCollection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3c092cc..b87d24e 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 From dc7835c92a30a3e171d0c88d5732d2aab0669a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Fri, 27 Oct 2023 16:54:33 +0800 Subject: [PATCH 11/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/interrogation/AdvisoryCollection.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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; } } From d8dda599d09894c62f7e59493188cf602c979279 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 16:55:36 +0800 Subject: [PATCH 12/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E5=8F=8B?= =?UTF-8?q?=E5=9C=88=E6=94=B6=E8=97=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitypatients/DetailCollection.java | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) 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 b87d24e..2223689 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java @@ -23,10 +23,38 @@ public class DetailCollection { private Date collectionTime; /** - * 收藏人 + * 收藏人id */ private Long collectorId; + /** + * 收藏状态 + */ + private Integer detailCollectionStatus; + + @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; + } + /** * 创建人 * @return @@ -117,20 +145,6 @@ public class DetailCollection { this.collectionTime = collectionTime; } - @Override - public String toString() { - return "DetailCollection{" + - "detailCollectionId=" + detailCollectionId + - ", detailsPatientCircleId=" + detailsPatientCircleId + - ", collectionTime=" + collectionTime + - ", collectorId=" + collectorId + - ", detailCollectionFounder='" + detailCollectionFounder + '\'' + - ", detailCollectionFounderTime=" + detailCollectionFounderTime + - ", detailCollectionModificator='" + detailCollectionModificator + '\'' + - ", detailCollectionModificatorTime=" + detailCollectionModificatorTime + - '}'; - } - public Long getCollectorId() { return collectorId; } From 6303f4584080702586f79e39d1320acb5fcc30e1 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 18:44:21 +0800 Subject: [PATCH 13/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9DetailsPatientCircleDet?= =?UTF-8?q?ailCollection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/DetailsPatientCircleDetailCollection.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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..e365268 100644 --- a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java @@ -113,7 +113,12 @@ public class DetailsPatientCircleDetailCollection { /** * 收藏人 */ - private String collector; + private Long collectorId; + + /** + * 状态 + */ + private Integer detailCollectionStatus; //------------------------------------------------------------ //------------------------------------------------------------ //------------------------------------------------------------ From 4061363fea4e7a8cda52e9d750d0ae07b7f0fce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Fri, 27 Oct 2023 18:56:26 +0800 Subject: [PATCH 14/47] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=84=E8=AE=AF?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/AdvisoryCollectionRequest.java | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 src/main/java/com/four/common/duck/request/AdvisoryCollectionRequest.java 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; + } +} From 6f57a0657b99c0f90929a549c5c59ae360be136f Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Fri, 27 Oct 2023 21:52:29 +0800 Subject: [PATCH 15/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9DetailsPatientCircleDet?= =?UTF-8?q?ailCollection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitypatients/DetailCollection.java | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) 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 2223689..b2a6c04 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailCollection.java @@ -32,6 +32,31 @@ public class DetailCollection { */ private Integer detailCollectionStatus; + /** + * 创建人 + * @return + */ + private String detailCollectionFounder; + + /** + * 创建时间 + * @return + */ + private Date detailCollectionFounderTime; + + /** + * 修改人 + * @return + */ + private String detailCollectionModificator; + + /** + * 修改时间 + * @return + */ + private Date detailCollectionModificatorTime; + + @Override public String toString() { return "DetailCollection{" + @@ -55,17 +80,6 @@ public class DetailCollection { this.detailCollectionStatus = detailCollectionStatus; } - /** - * 创建人 - * @return - */ - private String detailCollectionFounder; - - /** - * 创建时间 - * @return - */ - private Date detailCollectionFounderTime; public String getDetailCollectionFounder() { return detailCollectionFounder; @@ -99,17 +113,7 @@ public class DetailCollection { this.detailCollectionModificatorTime = detailCollectionModificatorTime; } - /** - * 修改人 - * @return - */ - private String detailCollectionModificator; - /** - * 修改时间 - * @return - */ - private Date detailCollectionModificatorTime; public Long getDetailCollectionId() { return detailCollectionId; From b7457a4b85b0a687d2b7d88ea1abce78a636132f Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Mon, 30 Oct 2023 19:13:31 +0800 Subject: [PATCH 16/47] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitypatients/DetailedReview.java | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) 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..e6679cf 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java @@ -43,6 +43,12 @@ public class DetailedReview { */ private String name; + + /** + * 状态1：未采纳；状态2：采纳 + */ + private Integer detailedReviewStatus; + /** *创建人 */ @@ -163,4 +169,30 @@ public class DetailedReview { public void setName(String name) { this.name = 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='" + name + '\'' + + ", detailedReviewStatus=" + detailedReviewStatus + + ", detailedReviewFounder='" + detailedReviewFounder + '\'' + + ", detailedReviewFounderTime=" + detailedReviewFounderTime + + ", detailedReviewModificator='" + detailedReviewModificator + '\'' + + ", detailedReviewModificatorTime=" + detailedReviewModificatorTime + + '}'; + } } From af0d48cf60651a1014d7c38f54f015f13499ee1a Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Mon, 30 Oct 2023 19:28:14 +0800 Subject: [PATCH 17/47] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/four/common/duck/communitypatients/DetailedReview.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e6679cf..62c5c77 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java @@ -174,7 +174,7 @@ public class DetailedReview { return detailedReviewStatus; } - public void setDetailedReviewStatus(Integer detailedReviewStatus) { + public void setDetailedReviewStatus(Integer detailedReviewStatus) { this.detailedReviewStatus = detailedReviewStatus; } From 31c93f2fd32162f4821c30eafad970faaeda0f37 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Mon, 30 Oct 2023 19:49:04 +0800 Subject: [PATCH 18/47] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communitypatients/DetailedReview.java | 10 ++-- .../DetailsPatientCircleSymptomsDrugs.java | 56 +++++++++++++++++++ 2 files changed, 61 insertions(+), 5 deletions(-) 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 62c5c77..117bb9a 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,7 @@ public class DetailedReview { * 评论内容 * @return */ - private String name; + private String detailedReviewName; /** @@ -108,7 +108,7 @@ public class DetailedReview { this.reviewerId = reviewerId; this.numberLikes = numberLikes; this.tauntCount = tauntCount; - this.name = name; + this.detailedReviewName = detailedReviewName; } public Long getDetailedReviewId() { @@ -163,11 +163,11 @@ public class DetailedReview { } public String getName() { - return name; + return detailedReviewName; } public void setName(String name) { - this.name = name; + this.detailedReviewName = name; } public Integer getDetailedReviewStatus() { @@ -187,7 +187,7 @@ public class DetailedReview { ", reviewerId=" + reviewerId + ", numberLikes=" + numberLikes + ", tauntCount=" + tauntCount + - ", name='" + name + '\'' + + ", name='" + detailedReviewName + '\'' + ", detailedReviewStatus=" + detailedReviewStatus + ", detailedReviewFounder='" + detailedReviewFounder + '\'' + ", detailedReviewFounderTime=" + detailedReviewFounderTime + 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..78501fd 100644 --- a/src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleSymptomsDrugs.java @@ -180,5 +180,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; } From 2d453b785c0b1d6fd4e3ac938db1009561ab8030 Mon Sep 17 00:00:00 2001 From: life <1733802689@qq.com> Date: Mon, 30 Oct 2023 20:28:17 +0800 Subject: [PATCH 19/47] =?UTF-8?q?=E6=96=B0=E5=A2=9ERequestUser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../four/common/duck/request/UserRequest.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 src/main/java/com/four/common/duck/request/UserRequest.java 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; + } +} From 6d622857ca1f6c9af8240a56fae2b82fcd153de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 31 Oct 2023 13:43:07 +0800 Subject: [PATCH 20/47] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=92=B1=E5=8C=85?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/domain/RechargeWithdrawCash.java | 71 ++++++++----------- 1 file changed, 31 insertions(+), 40 deletions(-) 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..396be16 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") 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; } } From aed04616f331f6e664db374d50c209c98cdaa7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 31 Oct 2023 14:16:39 +0800 Subject: [PATCH 21/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E8=B5=84=E8=AE=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/domain/RechargeWithdrawCash.java | 2 +- .../interrogation/ConsultationDetails.java | 91 ++----------------- .../ConsultationDetailsType.java | 22 ++++- 3 files changed, 32 insertions(+), 83 deletions(-) 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 396be16..3834fd1 100644 --- a/src/main/java/com/four/common/duck/domain/RechargeWithdrawCash.java +++ b/src/main/java/com/four/common/duck/domain/RechargeWithdrawCash.java @@ -25,7 +25,7 @@ public class RechargeWithdrawCash { * 钱包记录时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT-8") private Date time; /** 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 d802e6b..fc69eae 100644 --- a/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java +++ b/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java @@ -1,5 +1,8 @@ package com.four.common.duck.interrogation; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; /** @@ -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,93 +38,17 @@ public class ConsultationDetails extends ConsultationDetailsType{ private String consultationDetailsContent; /** - * 类型 + * 类型id */ private Long consultationDetailsTypeId; + /** + * 图片 + */ + private String consultationDetailsImg; /** * 发布人名称 */ private String userName; - private Integer status; - - public Long getConsultationDetailsId() { - return consultationDetailsId; - } - - public void setConsultationDetailsId(Long consultationDetailsId) { - this.consultationDetailsId = consultationDetailsId; - } - - public String getConsultationDetailsTitle() { - return consultationDetailsTitle; - } - - public void setConsultationDetailsTitle(String consultationDetailsTitle) { - this.consultationDetailsTitle = consultationDetailsTitle; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(Long userId) { - this.userId = userId; - } - - 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 getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public ConsultationDetails() { - } - - public ConsultationDetails(Long consultationDetailsId, String consultationDetailsTitle, Long userId, Date releaseTime, String consultationDetailsContent, Long consultationDetailsTypeId, String userName, Integer status) { - this.consultationDetailsId = consultationDetailsId; - this.consultationDetailsTitle = consultationDetailsTitle; - this.userId = userId; - this.releaseTime = releaseTime; - this.consultationDetailsContent = consultationDetailsContent; - this.consultationDetailsTypeId = consultationDetailsTypeId; - this.userName = userName; - this.status = status; - } - } 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; } } From f91c6488ecdff5244a69530afa35b492d904f54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 31 Oct 2023 14:55:45 +0800 Subject: [PATCH 22/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E8=B5=84=E8=AE=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interrogation/ConsultationDetails.java | 80 ++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) 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 fc69eae..6e9bb19 100644 --- a/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java +++ b/src/main/java/com/four/common/duck/interrogation/ConsultationDetails.java @@ -8,7 +8,7 @@ import java.util.Date; /** * 健康咨询详情表 */ -public class ConsultationDetails extends ConsultationDetailsType{ +public class ConsultationDetails { /** * 健康咨询详情id @@ -51,4 +51,82 @@ public class ConsultationDetails extends ConsultationDetailsType{ */ private String userName; + + public Long getConsultationDetailsId() { + return consultationDetailsId; + } + + public void setConsultationDetailsId(Long consultationDetailsId) { + this.consultationDetailsId = consultationDetailsId; + } + + public String getConsultationDetailsTitle() { + return consultationDetailsTitle; + } + + public void setConsultationDetailsTitle(String consultationDetailsTitle) { + this.consultationDetailsTitle = consultationDetailsTitle; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + 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 getConsultationDetailsImg() { + return consultationDetailsImg; + } + + 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 consultationDetailsImg, String userName) { + this.consultationDetailsId = consultationDetailsId; + this.consultationDetailsTitle = consultationDetailsTitle; + this.userId = userId; + this.releaseTime = releaseTime; + this.consultationDetailsContent = consultationDetailsContent; + this.consultationDetailsTypeId = consultationDetailsTypeId; + this.consultationDetailsImg = consultationDetailsImg; + this.userName = userName; + } } From a36155a14d4385067e104d360ba28daedce4c26e Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Tue, 31 Oct 2023 18:44:29 +0800 Subject: [PATCH 23/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9DetailsPatientCircleDet?= =?UTF-8?q?ailedReview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailsPatientCircleDetailedReview.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) 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..64ab169 100644 --- a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailedReview.java +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailedReview.java @@ -111,6 +111,27 @@ public class DetailsPatientCircleDetailedReview { * 评论内容 * @return */ - private String name; + private String detailedReviewName; + + + /** + * 状态1：未采纳；状态2：采纳 + */ + private Integer detailedReviewStatus; + + /** + *创建人 + */ + private String detailedReviewFounder; + + /** + *创建时间 + */ + private Date detailedReviewFounderTime; + + /** + * 修改人 + */ + private String detailedReviewModificator; } From 23a8b0fdda0b5a9666471fb1d7688a88bf25cbbc Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Tue, 31 Oct 2023 18:46:55 +0800 Subject: [PATCH 24/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9DetailsPatientCircleDet?= =?UTF-8?q?ailedReview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/duck/communitypatients/DetailedReview.java | 10 ++++++---- .../response/DetailsPatientCircleDetailedReview.java | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) 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 117bb9a..484a720 100644 --- a/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java +++ b/src/main/java/com/four/common/duck/communitypatients/DetailedReview.java @@ -64,6 +64,11 @@ public class DetailedReview { */ private String detailedReviewModificator; + /** + * 修改时间 + */ + private Date detailedReviewModificatorTime; + public String getDetailedReviewFounder() { return detailedReviewFounder; } @@ -96,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; 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 64ab169..fb6afce 100644 --- a/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailedReview.java +++ b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailedReview.java @@ -133,5 +133,10 @@ public class DetailsPatientCircleDetailedReview { * 修改人 */ private String detailedReviewModificator; + + /** + * 修改时间 + */ + private Date detailedReviewModificatorTime; } From de2eb243655126fc149a11031995d5ded57796e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 31 Oct 2023 20:04:51 +0800 Subject: [PATCH 25/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/communitypatients/SymptomsDrugs.java | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-) 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..3d8764a 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,7 @@ package com.four.common.duck.communitypatients; +import java.util.List; + /** * 常见病症+常见药品表 */ @@ -20,6 +22,9 @@ public class SymptomsDrugs { */ private Long pid; + //科室 + private List departmentList; + private String aname; private String bname; @@ -45,17 +50,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 +74,34 @@ 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; + } } From 91a303d3de86aff46cf2d665d8ba8bb7a2a1dc9c Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Tue, 31 Oct 2023 20:22:53 +0800 Subject: [PATCH 26/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DetailsPatientCircle.java | 59 +++++++++++-------- .../DetailsPatientCircleDetailCollection.java | 4 ++ .../DetailsPatientCircleDetailedReview.java | 4 ++ .../DetailsPatientCircleSymptomsDrugs.java | 4 ++ 4 files changed, 48 insertions(+), 23 deletions(-) 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/response/DetailsPatientCircleDetailCollection.java b/src/main/java/com/four/common/duck/response/DetailsPatientCircleDetailCollection.java index e365268..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; //-------------------------------------------------------- //-------------------------------------------------------- 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 fb6afce..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; //------------------------------------------------------ //------------------------------------------------------ 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 78501fd..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; //---------------------------------------------------------- //---------------------------------------------------------- From 27a38403b9ce222665528904da56977db7b9e3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 31 Oct 2023 21:25:21 +0800 Subject: [PATCH 27/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/request/SymptomsDrugsRequest.java | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java 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..f1caeed --- /dev/null +++ b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java @@ -0,0 +1,57 @@ +package com.four.common.duck.request; + +/** + * @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; + + 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 SymptomsDrugsRequest() { + } + + public SymptomsDrugsRequest(Long id, String name, Long pid) { + this.id = id; + this.name = name; + this.pid = pid; + } +} From e467c598effa670281f1ccc827dc1d84980c0d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 31 Oct 2023 21:31:15 +0800 Subject: [PATCH 28/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/duck/communitypatients/SymptomsDrugs.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 3d8764a..c1f444e 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,7 @@ package com.four.common.duck.communitypatients; +import com.four.common.duck.request.SymptomsDrugsRequest; + import java.util.List; /** @@ -23,7 +25,7 @@ public class SymptomsDrugs { private Long pid; //科室 - private List departmentList; + private List departmentList; private String aname; @@ -75,11 +77,11 @@ public class SymptomsDrugs { this.pid = pid; } - public List getDepartmentList() { + public List getDepartmentList() { return departmentList; } - public void setDepartmentList(List departmentList) { + public void setDepartmentList(List departmentList) { this.departmentList = departmentList; } @@ -95,7 +97,7 @@ public class SymptomsDrugs { public SymptomsDrugs() { } - public SymptomsDrugs(Long id, String name, Long pid, List departmentList, String aname, String bname, String img) { + 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; From 35136d96f36c14712ec30b468bdfe79e1c1f5399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 31 Oct 2023 21:48:36 +0800 Subject: [PATCH 29/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/communitypatients/SymptomsDrugs.java | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) 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 c1f444e..54e4cb2 100644 --- a/src/main/java/com/four/common/duck/communitypatients/SymptomsDrugs.java +++ b/src/main/java/com/four/common/duck/communitypatients/SymptomsDrugs.java @@ -24,9 +24,21 @@ public class SymptomsDrugs { */ private Long pid; - //科室 + /** + * 病症+药品 + */ private List departmentList; + /** + * 病症详情 + */ + private List diseaseDetailList; + + /** + * 药品详情 + */ + private List medicineDetailList; + private String aname; private String bname; @@ -85,6 +97,21 @@ public class SymptomsDrugs { this.departmentList = departmentList; } + public List getDiseaseDetailList() { + return diseaseDetailList; + } + + public void setDiseaseDetailList(List diseaseDetailList) { + this.diseaseDetailList = diseaseDetailList; + } + + public List getMedicineDetailList() { + return medicineDetailList; + } + + public void setMedicineDetailList(List medicineDetailList) { + this.medicineDetailList = medicineDetailList; + } public String getImg() { return img; @@ -97,11 +124,13 @@ public class SymptomsDrugs { public SymptomsDrugs() { } - public SymptomsDrugs(Long id, String name, Long pid, List departmentList, String aname, String bname, String img) { + public SymptomsDrugs(Long id, String name, Long pid, List departmentList, List diseaseDetailList, List medicineDetailList, String aname, String bname, String img) { this.id = id; this.name = name; this.pid = pid; this.departmentList = departmentList; + this.diseaseDetailList = diseaseDetailList; + this.medicineDetailList = medicineDetailList; this.aname = aname; this.bname = bname; this.img = img; From 3c4a70e58174eb4b49717c008a07a5a24fcd9a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 31 Oct 2023 21:57:24 +0800 Subject: [PATCH 30/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/communitypatients/SymptomsDrugs.java | 20 +---------- .../duck/request/SymptomsDrugsRequest.java | 36 ++++++++++++++++++- 2 files changed, 36 insertions(+), 20 deletions(-) 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 54e4cb2..d8378ed 100644 --- a/src/main/java/com/four/common/duck/communitypatients/SymptomsDrugs.java +++ b/src/main/java/com/four/common/duck/communitypatients/SymptomsDrugs.java @@ -97,22 +97,6 @@ public class SymptomsDrugs { this.departmentList = departmentList; } - public List getDiseaseDetailList() { - return diseaseDetailList; - } - - public void setDiseaseDetailList(List diseaseDetailList) { - this.diseaseDetailList = diseaseDetailList; - } - - public List getMedicineDetailList() { - return medicineDetailList; - } - - public void setMedicineDetailList(List medicineDetailList) { - this.medicineDetailList = medicineDetailList; - } - public String getImg() { return img; } @@ -124,13 +108,11 @@ public class SymptomsDrugs { public SymptomsDrugs() { } - public SymptomsDrugs(Long id, String name, Long pid, List departmentList, List diseaseDetailList, List medicineDetailList, String aname, String bname, String img) { + 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.diseaseDetailList = diseaseDetailList; - this.medicineDetailList = medicineDetailList; this.aname = aname; this.bname = bname; this.img = img; diff --git a/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java index f1caeed..9092bad 100644 --- a/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java +++ b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java @@ -1,5 +1,10 @@ package com.four.common.duck.request; +import com.four.common.duck.communitypatients.DiseaseDetail; +import com.four.common.duck.communitypatients.MedicineDetail; + +import java.util.List; + /** * @author: tongCheng * @Package: four-common-duck @@ -22,6 +27,17 @@ public class SymptomsDrugsRequest { */ private Long pid; + /** + * 病症详情 + */ + private List diseaseDetailList; + + /** + * 药品详情 + */ + private List medicineDetailList; + + public Long getId() { return id; } @@ -46,12 +62,30 @@ public class SymptomsDrugsRequest { this.pid = pid; } + public List getDiseaseDetailList() { + return diseaseDetailList; + } + + public void setDiseaseDetailList(List diseaseDetailList) { + this.diseaseDetailList = diseaseDetailList; + } + + public List getMedicineDetailList() { + return medicineDetailList; + } + + public void setMedicineDetailList(List medicineDetailList) { + this.medicineDetailList = medicineDetailList; + } + public SymptomsDrugsRequest() { } - public SymptomsDrugsRequest(Long id, String name, Long pid) { + public SymptomsDrugsRequest(Long id, String name, Long pid, List diseaseDetailList, List medicineDetailList) { this.id = id; this.name = name; this.pid = pid; + this.diseaseDetailList = diseaseDetailList; + this.medicineDetailList = medicineDetailList; } } From 809beb35160c32d3473c937cf1ce9fbbf8216a98 Mon Sep 17 00:00:00 2001 From: TangZhaoZhen <207525215@qq.com> Date: Tue, 31 Oct 2023 22:08:32 +0800 Subject: [PATCH 31/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 16 ++++++ .../common/duck/domain/CertifiedBankCard.java | 57 +++++++------------ .../com/four/common/duck/video/Video.java | 22 +++++++ 3 files changed, 59 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index e1592b4..c8a73d7 100644 --- a/pom.xml +++ b/pom.xml @@ -85,4 +85,20 @@ + + + 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/domain/CertifiedBankCard.java b/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java index b7728f7..03855fa 100644 --- a/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java +++ b/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java @@ -20,16 +20,6 @@ public class CertifiedBankCard { */ private String realName; - /** - * 性别 - */ - private String realGender; - - /** - * 真实籍贯 - */ - private String trueNativePlace; - /** * 身份证号 */ @@ -53,16 +43,17 @@ public class CertifiedBankCard { public CertifiedBankCard() { } - public CertifiedBankCard(Long certifiedBankCardId, Long userId, String realName, String realGender, String trueNativePlace, Long idNumber, String bankName, String bankCardNumber, Long certifiedBankCardStatus) { - 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; + @Override + public String toString() { + return "CertifiedBankCard{" + + "certifiedBankCardId=" + certifiedBankCardId + + ", userId=" + userId + + ", realName='" + realName + '\'' + + ", idNumber=" + idNumber + + ", bankName='" + bankName + '\'' + + ", bankCardNumber='" + bankCardNumber + '\'' + + ", certifiedBankCardStatus=" + certifiedBankCardStatus + + '}'; } public Long getCertifiedBankCardId() { @@ -89,22 +80,6 @@ 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() { return idNumber; } @@ -136,4 +111,14 @@ public class CertifiedBankCard { public void setCertifiedBankCardStatus(Long certifiedBankCardStatus) { this.certifiedBankCardStatus = certifiedBankCardStatus; } + + public CertifiedBankCard(Long certifiedBankCardId, Long userId, String realName, Long idNumber, String bankName, String bankCardNumber, Long certifiedBankCardStatus) { + this.certifiedBankCardId = certifiedBankCardId; + this.userId = userId; + this.realName = realName; + this.idNumber = idNumber; + this.bankName = bankName; + this.bankCardNumber = bankCardNumber; + this.certifiedBankCardStatus = certifiedBankCardStatus; + } } 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; From 14dcb87dfe3908323a364ee40e3748b324db29ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 31 Oct 2023 22:28:04 +0800 Subject: [PATCH 32/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/four/common/duck/request/SymptomsDrugsRequest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java index 9092bad..ef33c7b 100644 --- a/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java +++ b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java @@ -2,6 +2,7 @@ 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; @@ -27,6 +28,8 @@ public class SymptomsDrugsRequest { */ private Long pid; + + private List symptomsDrugsRequestList; /** * 病症详情 */ From b69736a41558fecae0c02649bc401caf599e4aae Mon Sep 17 00:00:00 2001 From: TangZhaoZhen <207525215@qq.com> Date: Tue, 31 Oct 2023 22:30:03 +0800 Subject: [PATCH 33/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/duck/domain/CertifiedBankCard.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 03855fa..a810b19 100644 --- a/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java +++ b/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java @@ -23,7 +23,7 @@ public class CertifiedBankCard { /** * 身份证号 */ - private Long idNumber; + private String idNumber; /** * 开户行：银行名称 @@ -38,7 +38,7 @@ public class CertifiedBankCard { /** * 状态：1身份证号 2银行卡号 */ - private Long certifiedBankCardStatus; + private Integer certifiedBankCardStatus; public CertifiedBankCard() { } @@ -49,7 +49,7 @@ public class CertifiedBankCard { "certifiedBankCardId=" + certifiedBankCardId + ", userId=" + userId + ", realName='" + realName + '\'' + - ", idNumber=" + idNumber + + ", idNumber='" + idNumber + '\'' + ", bankName='" + bankName + '\'' + ", bankCardNumber='" + bankCardNumber + '\'' + ", certifiedBankCardStatus=" + certifiedBankCardStatus + @@ -80,11 +80,11 @@ public class CertifiedBankCard { this.realName = realName; } - public Long getIdNumber() { + public String getIdNumber() { return idNumber; } - public void setIdNumber(Long idNumber) { + public void setIdNumber(String idNumber) { this.idNumber = idNumber; } @@ -104,15 +104,15 @@ public class CertifiedBankCard { this.bankCardNumber = bankCardNumber; } - public Long getCertifiedBankCardStatus() { + public Integer getCertifiedBankCardStatus() { return certifiedBankCardStatus; } - public void setCertifiedBankCardStatus(Long certifiedBankCardStatus) { + public void setCertifiedBankCardStatus(Integer certifiedBankCardStatus) { this.certifiedBankCardStatus = certifiedBankCardStatus; } - public CertifiedBankCard(Long certifiedBankCardId, Long userId, String realName, Long idNumber, String bankName, String bankCardNumber, Long certifiedBankCardStatus) { + public CertifiedBankCard(Long certifiedBankCardId, Long userId, String realName, String idNumber, String bankName, String bankCardNumber, Integer certifiedBankCardStatus) { this.certifiedBankCardId = certifiedBankCardId; this.userId = userId; this.realName = realName; From 4caa299f956de39028106c873b9817208c051ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Tue, 31 Oct 2023 22:32:41 +0800 Subject: [PATCH 34/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/duck/request/SymptomsDrugsRequest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java index ef33c7b..6f33a89 100644 --- a/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java +++ b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java @@ -81,14 +81,23 @@ public class SymptomsDrugsRequest { this.medicineDetailList = medicineDetailList; } + public List getSymptomsDrugsRequestList() { + return symptomsDrugsRequestList; + } + + public void setSymptomsDrugsRequestList(List symptomsDrugsRequestList) { + this.symptomsDrugsRequestList = symptomsDrugsRequestList; + } + public SymptomsDrugsRequest() { } - public SymptomsDrugsRequest(Long id, String name, Long pid, List diseaseDetailList, List medicineDetailList) { + public SymptomsDrugsRequest(Long id, String name, Long pid, List symptomsDrugsRequestList, List diseaseDetailList, List medicineDetailList) { this.id = id; this.name = name; this.pid = pid; this.diseaseDetailList = diseaseDetailList; this.medicineDetailList = medicineDetailList; + this.symptomsDrugsRequestList = symptomsDrugsRequestList; } } From b3fe9e268a2be22a38449e4a6bcb2cbb18c44d9a Mon Sep 17 00:00:00 2001 From: TangZhaoZhen <207525215@qq.com> Date: Wed, 1 Nov 2023 09:33:14 +0800 Subject: [PATCH 35/47] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/duck/domain/CertifiedBankCard.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) 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 a810b19..b536530 100644 --- a/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java +++ b/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java @@ -35,11 +35,6 @@ public class CertifiedBankCard { */ private String bankCardNumber; - /** - * 状态：1身份证号 2银行卡号 - */ - private Integer certifiedBankCardStatus; - public CertifiedBankCard() { } @@ -52,7 +47,6 @@ public class CertifiedBankCard { ", idNumber='" + idNumber + '\'' + ", bankName='" + bankName + '\'' + ", bankCardNumber='" + bankCardNumber + '\'' + - ", certifiedBankCardStatus=" + certifiedBankCardStatus + '}'; } @@ -104,21 +98,12 @@ public class CertifiedBankCard { this.bankCardNumber = bankCardNumber; } - public Integer getCertifiedBankCardStatus() { - return certifiedBankCardStatus; - } - - public void setCertifiedBankCardStatus(Integer certifiedBankCardStatus) { - this.certifiedBankCardStatus = certifiedBankCardStatus; - } - - public CertifiedBankCard(Long certifiedBankCardId, Long userId, String realName, String idNumber, String bankName, String bankCardNumber, Integer 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; - this.certifiedBankCardStatus = certifiedBankCardStatus; } } From 971014a9a8a82f6d96a9bf84c49f7111e15125d3 Mon Sep 17 00:00:00 2001 From: TangZhaoZhen <207525215@qq.com> Date: Wed, 1 Nov 2023 14:28:10 +0800 Subject: [PATCH 36/47] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=9A=84=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 + .../common/duck/domain/CertifiedBankCard.java | 42 ++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c8a73d7..6b66e22 100644 --- a/pom.xml +++ b/pom.xml @@ -101,4 +101,6 @@ + + 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 b536530..96dfecd 100644 --- a/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java +++ b/src/main/java/com/four/common/duck/domain/CertifiedBankCard.java @@ -35,8 +35,14 @@ public class CertifiedBankCard { */ private String bankCardNumber; - public CertifiedBankCard() { - } + /** + * 身份证照片路径 + */ + private String cardUrl; + /** + * 银行卡照片路径 + */ + private String bankUrl; @Override public String toString() { @@ -47,9 +53,41 @@ public class CertifiedBankCard { ", idNumber='" + idNumber + '\'' + ", bankName='" + bankName + '\'' + ", bankCardNumber='" + bankCardNumber + '\'' + + ", cardUrl='" + cardUrl + '\'' + + ", bankUrl='" + bankUrl + '\'' + '}'; } + 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.idNumber = idNumber; + this.bankName = bankName; + this.bankCardNumber = bankCardNumber; + this.cardUrl = cardUrl; + this.bankUrl = bankUrl; + } + + public CertifiedBankCard() { + } + public Long getCertifiedBankCardId() { return certifiedBankCardId; } From 71a3839d9e8fd1ab5ada8cc907ec7492327d4072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Wed, 1 Nov 2023 14:57:49 +0800 Subject: [PATCH 37/47] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/four/common/duck/my/MyNews.java | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 src/main/java/com/four/common/duck/my/MyNews.java 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..836647a --- /dev/null +++ b/src/main/java/com/four/common/duck/my/MyNews.java @@ -0,0 +1,74 @@ +package com.four.common.duck.my; + +import java.util.Date; + +/** + * @author: tongCheng + * @Package: four-common-duck + * @ClassName: MyNews + * @date: 2023-11-01 14:54 + **/ +public class MyNews { + + /** + * 我的消息id + */ + private Long myNewsId; + + /** + * 消息内容 + */ + private String messageContent; + + /** + * 消息时间 + */ + private Date messageTime; + + /** + * 消息类型 1系统消息 2问诊消息 3H币入账消息 + */ + private int messageType; + + 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 int getMessageType() { + return messageType; + } + + public void setMessageType(int messageType) { + this.messageType = messageType; + } + + public MyNews() { + } + + public MyNews(Long myNewsId, String messageContent, Date messageTime, int messageType) { + this.myNewsId = myNewsId; + this.messageContent = messageContent; + this.messageTime = messageTime; + this.messageType = messageType; + } +} From 14fe38a0980e24889b4dbe0f04cc7555f1738ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Wed, 1 Nov 2023 15:10:18 +0800 Subject: [PATCH 38/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/four/common/duck/my/MyNews.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/my/MyNews.java b/src/main/java/com/four/common/duck/my/MyNews.java index 836647a..c430d8a 100644 --- a/src/main/java/com/four/common/duck/my/MyNews.java +++ b/src/main/java/com/four/common/duck/my/MyNews.java @@ -30,6 +30,11 @@ public class MyNews { */ private int messageType; + /** + * 是否已读 1已读 2未读 + */ + private int isRead; + public Long getMyNewsId() { return myNewsId; } @@ -62,13 +67,22 @@ public class MyNews { this.messageType = messageType; } + public int getIsRead() { + return isRead; + } + + public void setIsRead(int isRead) { + this.isRead = isRead; + } + public MyNews() { } - public MyNews(Long myNewsId, String messageContent, Date messageTime, int messageType) { + public MyNews(Long myNewsId, String messageContent, Date messageTime, int messageType, int isRead) { this.myNewsId = myNewsId; this.messageContent = messageContent; this.messageTime = messageTime; this.messageType = messageType; + this.isRead = isRead; } } From 23c4013982307edc0eb5b6a50004191862be2842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Wed, 1 Nov 2023 15:28:55 +0800 Subject: [PATCH 39/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/four/common/duck/my/MyNews.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/my/MyNews.java b/src/main/java/com/four/common/duck/my/MyNews.java index c430d8a..004068b 100644 --- a/src/main/java/com/four/common/duck/my/MyNews.java +++ b/src/main/java/com/four/common/duck/my/MyNews.java @@ -15,6 +15,8 @@ public class MyNews { */ private Long myNewsId; + private Long userId; + /** * 消息内容 */ @@ -75,14 +77,23 @@ public class MyNews { this.isRead = isRead; } + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + public MyNews() { } - public MyNews(Long myNewsId, String messageContent, Date messageTime, int messageType, int isRead) { + public MyNews(Long myNewsId, Long userId, String messageContent, Date messageTime, int messageType, int isRead) { this.myNewsId = myNewsId; this.messageContent = messageContent; this.messageTime = messageTime; this.messageType = messageType; this.isRead = isRead; + this.userId = userId; } } From 4a9d58a2458347e9cd46058dacf6c96c8110bb3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Wed, 1 Nov 2023 15:52:21 +0800 Subject: [PATCH 40/47] =?UTF-8?q?=E7=86=99=E5=A2=9E=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/four/common/duck/my/MyNewsType.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/main/java/com/four/common/duck/my/MyNewsType.java 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..f282fa3 --- /dev/null +++ b/src/main/java/com/four/common/duck/my/MyNewsType.java @@ -0,0 +1,50 @@ +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; + } +} From 7c1acf0ba8147a1bd5cdedee00f9e89b79eb7899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Wed, 1 Nov 2023 16:06:51 +0800 Subject: [PATCH 41/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/four/common/duck/my/MyNews.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/four/common/duck/my/MyNews.java b/src/main/java/com/four/common/duck/my/MyNews.java index 004068b..b63fc85 100644 --- a/src/main/java/com/four/common/duck/my/MyNews.java +++ b/src/main/java/com/four/common/duck/my/MyNews.java @@ -15,6 +15,9 @@ public class MyNews { */ private Long myNewsId; + /** + * 用户id + */ private Long userId; /** @@ -30,7 +33,7 @@ public class MyNews { /** * 消息类型 1系统消息 2问诊消息 3H币入账消息 */ - private int messageType; + private int myNewsTypeId; /** * 是否已读 1已读 2未读 @@ -61,12 +64,12 @@ public class MyNews { this.messageTime = messageTime; } - public int getMessageType() { - return messageType; + public int getMyNewsTypeId() { + return myNewsTypeId; } - public void setMessageType(int messageType) { - this.messageType = messageType; + public void setMyNewsTypeId(int myNewsTypeId) { + this.myNewsTypeId = myNewsTypeId; } public int getIsRead() { @@ -88,11 +91,11 @@ public class MyNews { public MyNews() { } - public MyNews(Long myNewsId, Long userId, String messageContent, Date messageTime, int messageType, int isRead) { + public MyNews(Long myNewsId, Long userId, String messageContent, Date messageTime, int myNewsTypeId, int isRead) { this.myNewsId = myNewsId; this.messageContent = messageContent; this.messageTime = messageTime; - this.messageType = messageType; + this.myNewsTypeId = myNewsTypeId; this.isRead = isRead; this.userId = userId; } From e7d7287634e5f86c6ad5afc39b3e9f9df6c90ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Thu, 2 Nov 2023 11:14:28 +0800 Subject: [PATCH 42/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/request/SymptomsDrugsRequest.java | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java index 6f33a89..a6d8edf 100644 --- a/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java +++ b/src/main/java/com/four/common/duck/request/SymptomsDrugsRequest.java @@ -30,15 +30,6 @@ public class SymptomsDrugsRequest { private List symptomsDrugsRequestList; - /** - * 病症详情 - */ - private List diseaseDetailList; - - /** - * 药品详情 - */ - private List medicineDetailList; public Long getId() { @@ -65,21 +56,6 @@ public class SymptomsDrugsRequest { this.pid = pid; } - public List getDiseaseDetailList() { - return diseaseDetailList; - } - - public void setDiseaseDetailList(List diseaseDetailList) { - this.diseaseDetailList = diseaseDetailList; - } - - public List getMedicineDetailList() { - return medicineDetailList; - } - - public void setMedicineDetailList(List medicineDetailList) { - this.medicineDetailList = medicineDetailList; - } public List getSymptomsDrugsRequestList() { return symptomsDrugsRequestList; @@ -92,12 +68,10 @@ public class SymptomsDrugsRequest { public SymptomsDrugsRequest() { } - public SymptomsDrugsRequest(Long id, String name, Long pid, List symptomsDrugsRequestList, List diseaseDetailList, List medicineDetailList) { + public SymptomsDrugsRequest(Long id, String name, Long pid, List symptomsDrugsRequestList) { this.id = id; this.name = name; this.pid = pid; - this.diseaseDetailList = diseaseDetailList; - this.medicineDetailList = medicineDetailList; this.symptomsDrugsRequestList = symptomsDrugsRequestList; } } From c49a750cded530773a52a850881d3d7751bdb38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Thu, 2 Nov 2023 11:18:01 +0800 Subject: [PATCH 43/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/duck/communitypatients/SymptomsDrugs.java | 10 ---------- 1 file changed, 10 deletions(-) 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 d8378ed..6fbf90a 100644 --- a/src/main/java/com/four/common/duck/communitypatients/SymptomsDrugs.java +++ b/src/main/java/com/four/common/duck/communitypatients/SymptomsDrugs.java @@ -29,16 +29,6 @@ public class SymptomsDrugs { */ private List departmentList; - /** - * 病症详情 - */ - private List diseaseDetailList; - - /** - * 药品详情 - */ - private List medicineDetailList; - private String aname; private String bname; From 8ec2f54718bf42dda3c21a25d32ace56bf042e31 Mon Sep 17 00:00:00 2001 From: 18404992668 <44167514@qq.com> Date: Thu, 2 Nov 2023 19:11:15 +0800 Subject: [PATCH 44/47] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../duck/communitypatients/UserSign.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/main/java/com/four/common/duck/communitypatients/UserSign.java 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; +} + From e76cc6e22d787a56312a3ec6c3a7752f2a55a9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Thu, 2 Nov 2023 21:36:22 +0800 Subject: [PATCH 45/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/four/common/duck/my/MyNews.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/four/common/duck/my/MyNews.java b/src/main/java/com/four/common/duck/my/MyNews.java index b63fc85..e0c0c8e 100644 --- a/src/main/java/com/four/common/duck/my/MyNews.java +++ b/src/main/java/com/four/common/duck/my/MyNews.java @@ -33,7 +33,7 @@ public class MyNews { /** * 消息类型 1系统消息 2问诊消息 3H币入账消息 */ - private int myNewsTypeId; + private Long myNewsTypeId; /** * 是否已读 1已读 2未读 @@ -64,11 +64,11 @@ public class MyNews { this.messageTime = messageTime; } - public int getMyNewsTypeId() { + public Long getMyNewsTypeId() { return myNewsTypeId; } - public void setMyNewsTypeId(int myNewsTypeId) { + public void setMyNewsTypeId(Long myNewsTypeId) { this.myNewsTypeId = myNewsTypeId; } @@ -91,7 +91,7 @@ public class MyNews { public MyNews() { } - public MyNews(Long myNewsId, Long userId, String messageContent, Date messageTime, int myNewsTypeId, int isRead) { + public MyNews(Long myNewsId, Long userId, String messageContent, Date messageTime, Long myNewsTypeId, int isRead) { this.myNewsId = myNewsId; this.messageContent = messageContent; this.messageTime = messageTime; From 1b88c3080a129ef74872a8073ee1b57d46ef33b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Thu, 2 Nov 2023 22:00:22 +0800 Subject: [PATCH 46/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/four/common/duck/my/MyNewsType.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/four/common/duck/my/MyNewsType.java b/src/main/java/com/four/common/duck/my/MyNewsType.java index f282fa3..2aac30f 100644 --- a/src/main/java/com/four/common/duck/my/MyNewsType.java +++ b/src/main/java/com/four/common/duck/my/MyNewsType.java @@ -15,6 +15,8 @@ public class MyNewsType { private List myNewsList; + private List noMyNewsList; + public Long getMyNewsTypeId() { return myNewsTypeId; } @@ -39,12 +41,21 @@ public class MyNewsType { this.myNewsList = myNewsList; } + public List getNoMyNewsList() { + return noMyNewsList; + } + + public void setNoMyNewsList(List noMyNewsList) { + this.noMyNewsList = noMyNewsList; + } + public MyNewsType() { } - public MyNewsType(Long myNewsTypeId, String myNewsTypeName, List myNewsList) { + public MyNewsType(Long myNewsTypeId, String myNewsTypeName, List myNewsList, List noMyNewsList) { this.myNewsTypeId = myNewsTypeId; this.myNewsTypeName = myNewsTypeName; this.myNewsList = myNewsList; + this.noMyNewsList = noMyNewsList; } } From 9420f4f5e4976bb7d6983826ca49ca99168c4a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A5=E6=88=90?= <13191486+tong-cheng666@user.noreply.gitee.com> Date: Thu, 2 Nov 2023 22:10:52 +0800 Subject: [PATCH 47/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/four/common/duck/my/MyNews.java | 14 +++++++++++++- .../java/com/four/common/duck/my/MyNewsType.java | 12 ++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/four/common/duck/my/MyNews.java b/src/main/java/com/four/common/duck/my/MyNews.java index e0c0c8e..bffda90 100644 --- a/src/main/java/com/four/common/duck/my/MyNews.java +++ b/src/main/java/com/four/common/duck/my/MyNews.java @@ -1,6 +1,7 @@ package com.four.common.duck.my; import java.util.Date; +import java.util.List; /** * @author: tongCheng @@ -40,6 +41,8 @@ public class MyNews { */ private int isRead; + private List noMyNewsList; + public Long getMyNewsId() { return myNewsId; } @@ -88,15 +91,24 @@ public class MyNews { 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) { + 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 index 2aac30f..d72a083 100644 --- a/src/main/java/com/four/common/duck/my/MyNewsType.java +++ b/src/main/java/com/four/common/duck/my/MyNewsType.java @@ -15,7 +15,6 @@ public class MyNewsType { private List myNewsList; - private List noMyNewsList; public Long getMyNewsTypeId() { return myNewsTypeId; @@ -41,21 +40,14 @@ public class MyNewsType { this.myNewsList = myNewsList; } - public List getNoMyNewsList() { - return noMyNewsList; - } - - public void setNoMyNewsList(List noMyNewsList) { - this.noMyNewsList = noMyNewsList; - } public MyNewsType() { } - public MyNewsType(Long myNewsTypeId, String myNewsTypeName, List myNewsList, List noMyNewsList) { + public MyNewsType(Long myNewsTypeId, String myNewsTypeName, List myNewsList) { this.myNewsTypeId = myNewsTypeId; this.myNewsTypeName = myNewsTypeName; this.myNewsList = myNewsList; - this.noMyNewsList = noMyNewsList; + } }