diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java index 9554ee4..7944d40 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java @@ -2,7 +2,7 @@ package doctor.common.core.constant; /** * 通用常量信息 - * + * * @author ruoyi */ public class Constants @@ -51,6 +51,11 @@ public class Constants * 成功标记 */ public static final Integer SUCCESS = 200; + /** + * 维度健康成功标识 + */ + public static final String SUCCESS_HEALTH = "0000"; + public static final String FAIL_HEALTH = "9001"; /** * 失败标记 diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java new file mode 100644 index 0000000..1138ac6 --- /dev/null +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.java @@ -0,0 +1,116 @@ +package doctor.common.core.domain; + + +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import doctor.common.core.constant.Constants; + +import java.io.Serializable; + +/** + * 响应信息主体 + * + * @author ruoyi + */ +@JsonPropertyOrder({ "result", "message", "status" }) +public class HealthR implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 成功 */ + public static final String SUCCESS = Constants.SUCCESS_HEALTH; + + /** 失败 */ + public static final String FAIL = Constants.FAIL_HEALTH; + + private T result; + private String status; + + private String message; + + + + public static HealthR ok() + { + return restResult(null, SUCCESS, null); + } + + public static HealthR ok(T result) + { + return restResult(result, SUCCESS, null); + } + + public static HealthR ok(T result, String message) + { + return restResult(result, SUCCESS, message); + } + + public static HealthR fail() + { + return restResult(null, FAIL, null); + } + + public static HealthR fail(String message) + { + return restResult(null, FAIL, message); + } + + public static HealthR fail(T result) + { + return restResult(result, FAIL, null); + } + + public static HealthR fail(T result, String message) + { + return restResult(result, FAIL, message); + } + + public static HealthR fail(String status, String message) + { + return restResult(null, status, message); + } + + private static HealthR restResult(T result, String status, String message) + { + HealthR apiResult = new HealthR<>(); + apiResult.setResult(result); + apiResult.setMessage(message); + apiResult.setStatus(status); + return apiResult; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public T getResult() { + return result; + } + + public void setResult(T result) { + this.result = result; + } + + public static Boolean isError(HealthR ret) + { + return !isSuccess(ret); + } + + public static Boolean isSuccess(HealthR ret) + { + return HealthR.SUCCESS == ret.getStatus(); + } + + +} diff --git a/doctor-modules/doctor-health/pom.xml b/doctor-modules/doctor-health/pom.xml index d9360ce..08360fd 100644 --- a/doctor-modules/doctor-health/pom.xml +++ b/doctor-modules/doctor-health/pom.xml @@ -74,6 +74,10 @@ doctor doctor-common-swagger + + org.projectlombok + lombok + diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java index a77598a..59cd42c 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/BannersController.java @@ -1,5 +1,6 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.Banners; import doctor.service.BannersService; @@ -23,8 +24,8 @@ public class BannersController { @Autowired private BannersService bannersService; @GetMapping("/bannersShow") - public R> bannersShow(){ + public HealthR> bannersShow(){ List banners = bannersService.bannersShow(); - return R.ok(banners); + return HealthR.ok(banners); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java index f10f3d0..68efab3 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DepartmentController.java @@ -1,5 +1,6 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.Department; import doctor.service.DepartmentService; @@ -22,8 +23,8 @@ public class DepartmentController { @Autowired private DepartmentService departmentService; @GetMapping("/findDepartment") - public R> findDepartment(){ + public HealthR> findDepartment(){ List list=departmentService.findDepartment(); - return R.ok(list); + return HealthR.ok(list); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java index b8a4c8f..8b16640 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseCategoryController.java @@ -1,5 +1,6 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.DiseaseCategory; import doctor.service.DiseaseCategoryService; @@ -25,8 +26,8 @@ public class DiseaseCategoryController { private DiseaseCategoryService diseaseCategoryService; @GetMapping("/findDiseaseCategory") - public R> findDiseaseCategory(@RequestParam Integer departmentId){ + public HealthR> findDiseaseCategory(@RequestParam Integer departmentId){ List list=diseaseCategoryService.findDiseaseCategory(departmentId); - return R.ok(list); + return HealthR.ok(list); } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java index 6d8c440..85f2987 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java @@ -1,10 +1,13 @@ package doctor.controller; +import doctor.common.core.domain.HealthR; import doctor.common.core.domain.R; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; import doctor.domain.entity.DrugsKnowledge; +import doctor.entity.Information; +import doctor.entity.InformationPlate; import doctor.service.DiseaseKnowledgeService; import org.bouncycastle.cert.ocsp.Req; import org.springframework.beans.factory.annotation.Autowired; @@ -31,23 +34,28 @@ public class DiseaseKnowledgeController { private DiseaseKnowledgeService diseaseKnowledgeService; //罕见病症详情 @GetMapping("/findDiseaseKnowledge") - public R> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){ - return R.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId)); + public HealthR> findDiseaseKnowledge(@RequestParam Integer diseaseCategoryId){ + return HealthR.ok(diseaseKnowledgeService.findDiseaseKnowledge(diseaseCategoryId)); } @GetMapping("/findDrugsCategoryList") - public R> findDrugsCategoryList(){ - return R.ok(diseaseKnowledgeService.findDrugsCategoryList()); + public HealthR> findDrugsCategoryList(){ + return HealthR.ok(diseaseKnowledgeService.findDrugsCategoryList()); } @GetMapping("/findDrugsKnowledgeList") - public R> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId, + public HealthR> findDrugsKnowledgeList(@RequestParam Integer drugsCategoryId, @RequestParam(value = "page",defaultValue = "1") Integer page, @RequestParam(value = "count",defaultValue = "5") Integer count){ startPage(page,count); List list=diseaseKnowledgeService.findDrugsKnowledgeList(drugsCategoryId); - return R.ok(list); + return HealthR.ok(list); } + + + + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java b/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java new file mode 100644 index 0000000..7304f18 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java @@ -0,0 +1,41 @@ +package doctor.controller; + +import doctor.common.core.domain.HealthR; +import doctor.entity.Information; +import doctor.entity.InformationPlate; +import doctor.service.InformationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +import static com.github.pagehelper.page.PageMethod.startPage; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.controller + * @Author: jpz + * @CreateTime: 2024/1/11 16:19 + */ +@RestController +@RequestMapping("/share/information/v1") +public class InformationController { + @Autowired + private InformationService informationService; + @GetMapping("/findInformationList") + public HealthR> findInformationList(@RequestParam Integer plateId, + @RequestParam(value = "page",defaultValue = "1") Integer page, + @RequestParam(value = "count",defaultValue = "5") Integer count){ + startPage(page,count); + List list=informationService.findInformationList(plateId); + return HealthR.ok(list); + } + @GetMapping("/findInformationPlateList") + public HealthR> findInformationPlateList(){ + List list=informationService.findInformationPlateList(); + return HealthR.ok(list); + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/Information.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/Information.java new file mode 100644 index 0000000..d62d679 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/Information.java @@ -0,0 +1,85 @@ +package doctor.entity; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/11 16:03 + */ + +public class Information { + private Integer id; + private Integer plateId; + private String title; + private String thumbnail; + private String content; + private String source; + private Date createTime; + private Date releaseTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getPlateId() { + return plateId; + } + + public void setPlateId(Integer plateId) { + this.plateId = plateId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getThumbnail() { + return thumbnail; + } + + public void setThumbnail(String thumbnail) { + this.thumbnail = thumbnail; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getReleaseTime() { + return releaseTime; + } + + public void setReleaseTime(Date releaseTime) { + this.releaseTime = releaseTime; + } +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/InformationPlate.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/InformationPlate.java new file mode 100644 index 0000000..c6f1630 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/InformationPlate.java @@ -0,0 +1,16 @@ +package doctor.entity; + +import java.util.Date; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.entity + * @Author: jpz + * @CreateTime: 2024/1/11 16:12 + */ +public class InformationPlate { + private Integer id; + private String name; + private String sort; + private Date createTime; +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java index 15cbd8f..a0e205a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserAdoptCommentEntity.java @@ -1,6 +1,5 @@ package doctor.entity; -import lombok.Data; import java.util.Date; @@ -10,7 +9,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:33 */ -@Data + public class UserAdoptCommentEntity { private Integer id; private Integer userId; @@ -22,4 +21,84 @@ public class UserAdoptCommentEntity { private String disease; private String content; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getReleaseUserId() { + return releaseUserId; + } + + public void setReleaseUserId(Integer releaseUserId) { + this.releaseUserId = releaseUserId; + } + + public String getReleaseUserName() { + return releaseUserName; + } + + public void setReleaseUserName(String releaseUserName) { + this.releaseUserName = releaseUserName; + } + + public String getReleaseUserHeadPic() { + return releaseUserHeadPic; + } + + public void setReleaseUserHeadPic(String releaseUserHeadPic) { + this.releaseUserHeadPic = releaseUserHeadPic; + } + + public Integer getSickCircleId() { + return sickCircleId; + } + + public void setSickCircleId(Integer sickCircleId) { + this.sickCircleId = sickCircleId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDisease() { + return disease; + } + + public void setDisease(String disease) { + this.disease = disease; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java index 5f11bcd..6b8b164 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserArchivesEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:37 */ -@Data + public class UserArchivesEntity { private Integer id; private Integer userId; @@ -19,4 +19,60 @@ public class UserArchivesEntity { private Integer bankCardType; private Date updateTime; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getBankCardNumber() { + return bankCardNumber; + } + + public void setBankCardNumber(String bankCardNumber) { + this.bankCardNumber = bankCardNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public Integer getBankCardType() { + return bankCardType; + } + + public void setBankCardType(Integer bankCardType) { + this.bankCardType = bankCardType; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java index 194cd86..6d21a92 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserBindingLoginEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:40 */ -@Data + public class UserBindingLoginEntity { private Integer id; private Integer userId; @@ -18,4 +18,52 @@ public class UserBindingLoginEntity { private String openId; private String unionId; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getOpenId() { + return openId; + } + + public void setOpenId(String openId) { + this.openId = openId; + } + + public String getUnionId() { + return unionId; + } + + public void setUnionId(String unionId) { + this.unionId = unionId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java index 61df2a3..81cd5e5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserConsumptionRecordEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:45 */ -@Data + public class UserConsumptionRecordEntity { private Integer id; private Integer userId; @@ -19,4 +19,60 @@ public class UserConsumptionRecordEntity { private Integer changeNum; private String remark; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getBalance() { + return balance; + } + + public void setBalance(Integer balance) { + this.balance = balance; + } + + public Integer getChangeNum() { + return changeNum; + } + + public void setChangeNum(Integer changeNum) { + this.changeNum = changeNum; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java index 12eb761..8c8329b 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDoctorFollowEntity.java @@ -10,10 +10,42 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:49 */ -@Data + public class UserDoctorFollowEntity { private Integer id; private Integer userId; private Integer doctorId; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getDoctorId() { + return doctorId; + } + + public void setDoctorId(Integer doctorId) { + this.doctorId = doctorId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java index 46ef9fe..b428624 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserDrawRecordEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:53 */ -@Data + public class UserDrawRecordEntity { private Integer id; private Integer userId; @@ -20,4 +20,68 @@ public class UserDrawRecordEntity { private String remark; private Integer status; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Double getMoney() { + return money; + } + + public void setMoney(Double money) { + this.money = money; + } + + public String getBankCardNumber() { + return bankCardNumber; + } + + public void setBankCardNumber(String bankCardNumber) { + this.bankCardNumber = bankCardNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java index c8aa9e3..a9298e5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 20:59 */ -@Data + public class UserEntity { private Integer id; private String phone; @@ -26,4 +26,116 @@ public class UserEntity { private String invitationCode; private Date updateTime; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPwd() { + return pwd; + } + + public void setPwd(String pwd) { + this.pwd = pwd; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getNickName() { + return nickName; + } + + public void setNickName(String nickName) { + this.nickName = nickName; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getHeadPic() { + return headPic; + } + + public void setHeadPic(String headPic) { + this.headPic = headPic; + } + + public Integer getSex() { + return sex; + } + + public void setSex(Integer sex) { + this.sex = sex; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public Integer getHeight() { + return height; + } + + public void setHeight(Integer height) { + this.height = height; + } + + public Integer getWeight() { + return weight; + } + + public void setWeight(Integer weight) { + this.weight = weight; + } + + public String getInvitationCode() { + return invitationCode; + } + + public void setInvitationCode(String invitationCode) { + this.invitationCode = invitationCode; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java index 24278d6..529c2b5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserIdCardEntity.java @@ -10,7 +10,7 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 21:56 */ -@Data + public class UserIdCardEntity { private Integer id; private Integer userId; @@ -22,4 +22,84 @@ public class UserIdCardEntity { private String idNumber; private String issueOffice; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getNation() { + return nation; + } + + public void setNation(String nation) { + this.nation = nation; + } + + public String getBirthday() { + return birthday; + } + + public void setBirthday(String birthday) { + this.birthday = birthday; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getIdNumber() { + return idNumber; + } + + public void setIdNumber(String idNumber) { + this.idNumber = idNumber; + } + + public String getIssueOffice() { + return issueOffice; + } + + public void setIssueOffice(String issueOffice) { + this.issueOffice = issueOffice; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java index 60e0a15..6cd422a 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/entity/UserInfoCollectionEntity.java @@ -10,10 +10,42 @@ import java.util.Date; * @Author: jpz * @CreateTime: 2024/1/8 22:02 */ -@Data + public class UserInfoCollectionEntity { private Integer id; private Integer userId; private String infoId; private Date createTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public String getInfoId() { + return infoId; + } + + public void setInfoId(String infoId) { + this.infoId = infoId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java index ebabbd9..91cda87 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/DiseaseKnowledgeMapper.java @@ -2,6 +2,8 @@ package doctor.mapper; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; +import doctor.entity.Information; +import doctor.entity.InformationPlate; import org.mybatis.spring.annotation.MapperScan; import java.util.List; @@ -19,4 +21,8 @@ public interface DiseaseKnowledgeMapper { List findDrugsCategoryList(); List findDrugsKnowledgeList(Integer drugsCategoryId); + + List findInformationList(Integer plateId); + + List findInformationPlateList(); } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java new file mode 100644 index 0000000..b28f358 --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/mapper/InformationMapper.java @@ -0,0 +1,21 @@ +package doctor.mapper; + +import doctor.entity.Information; +import doctor.entity.InformationPlate; +import org.mybatis.spring.annotation.MapperScan; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.mapper + * @Author: jpz + * @CreateTime: 2024/1/11 16:22 + */ +@MapperScan +public interface InformationMapper { + List findInformationList(Integer plateId); + + List findInformationPlateList(); + +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java index f1ae174..4f227b2 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/DiseaseKnowledgeService.java @@ -2,6 +2,8 @@ package doctor.service; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; +import doctor.entity.Information; +import doctor.entity.InformationPlate; import java.util.List; @@ -17,4 +19,6 @@ public interface DiseaseKnowledgeService { List findDrugsCategoryList(); List findDrugsKnowledgeList(Integer drugsCategoryId); + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java b/doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java new file mode 100644 index 0000000..1749b0c --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/InformationService.java @@ -0,0 +1,19 @@ +package doctor.service; + +import doctor.entity.Information; +import doctor.entity.InformationPlate; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service + * @Author: jpz + * @CreateTime: 2024/1/11 16:21 + */ + +public interface InformationService { + List findInformationList(Integer plateId); + + List findInformationPlateList(); +} diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java index 83db7b3..4c060d5 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/DiseaseKnowledgeServiceimpl.java @@ -2,6 +2,8 @@ package doctor.service.impl; import doctor.domain.entity.DiseaseKnowledge; import doctor.domain.entity.DrugsCategory; +import doctor.entity.Information; +import doctor.entity.InformationPlate; import doctor.mapper.DiseaseKnowledgeMapper; import doctor.service.DiseaseKnowledgeService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,4 +35,6 @@ public class DiseaseKnowledgeServiceimpl implements DiseaseKnowledgeService { public List findDrugsKnowledgeList(Integer drugsCategoryId) { return diseaseKnowledgeMapper.findDrugsKnowledgeList(drugsCategoryId); } + + } diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java new file mode 100644 index 0000000..24fb8df --- /dev/null +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/InformationServiceimpl.java @@ -0,0 +1,32 @@ +package doctor.service.impl; + +import doctor.entity.Information; +import doctor.entity.InformationPlate; +import doctor.mapper.InformationMapper; +import doctor.service.InformationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @BelongsProject: Medical_Treatment + * @BelongsPackage: doctor.service.impl + * @Author: jpz + * @CreateTime: 2024/1/11 16:21 + */ +@Service +public class InformationServiceimpl implements InformationService { + @Autowired + private InformationMapper informationMapper; + + @Override + public List findInformationList(Integer plateId) { + return informationMapper.findInformationList(plateId); + } + + @Override + public List findInformationPlateList() { + return informationMapper.findInformationPlateList(); + } +} diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml index 86fa2e6..66eba71 100644 --- a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/DiseaseKnowledgeServiceMapper.xml @@ -16,4 +16,5 @@ select * from drugs_knowledge where drugs_category_id = #{drugsCategoryId} + diff --git a/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml new file mode 100644 index 0000000..45409ef --- /dev/null +++ b/doctor-modules/doctor-health/src/main/resources/mapper/doctor/InformationMapperServiceMapper.xml @@ -0,0 +1,17 @@ + + + + + + + +