diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nurseappletpersonworkorder/NurseAppletPersonWorkOrderController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nurseappletpersonworkorder/NurseAppletPersonWorkOrderController.java index 778bbf2..e7f9290 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nurseappletpersonworkorder/NurseAppletPersonWorkOrderController.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nurseappletpersonworkorder/NurseAppletPersonWorkOrderController.java @@ -5,7 +5,7 @@ import com.xinelu.applet.dto.nursepersonapplogin.OrderFallbackDTO; import com.xinelu.applet.service.nurseappletpersonworkorder.NurseAppletPersonWorkOrderService; import com.xinelu.common.annotation.MobileRequestAuthorization; import com.xinelu.common.core.domain.AjaxResult; -import net.sf.jsqlparser.statement.update.Update; +import com.xinelu.common.custominterface.Update; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/appletlogin/AppointmentConsumableDTO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/appletlogin/AppointmentConsumableDTO.java index 753c795..6311cc2 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/appletlogin/AppointmentConsumableDTO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/appletlogin/AppointmentConsumableDTO.java @@ -2,8 +2,8 @@ package com.xinelu.applet.dto.appletlogin; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import lombok.Data; -import net.sf.jsqlparser.statement.update.Update; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/appletlogin/AppointmentInfoDTO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/appletlogin/AppointmentInfoDTO.java index 84e92ac..d782137 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/appletlogin/AppointmentInfoDTO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/appletlogin/AppointmentInfoDTO.java @@ -3,8 +3,8 @@ package com.xinelu.applet.dto.appletlogin; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import lombok.Data; -import net.sf.jsqlparser.statement.update.Update; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/nursepersonapplogin/OrderFallbackDTO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/nursepersonapplogin/OrderFallbackDTO.java index d74a81b..b065ce2 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/nursepersonapplogin/OrderFallbackDTO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/nursepersonapplogin/OrderFallbackDTO.java @@ -1,8 +1,8 @@ package com.xinelu.applet.dto.nursepersonapplogin; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import lombok.Data; -import net.sf.jsqlparser.statement.update.Update; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/nursingstationgoods/GoodsOrderStationDTO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/nursingstationgoods/GoodsOrderStationDTO.java index 6484700..de52aef 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/nursingstationgoods/GoodsOrderStationDTO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/dto/nursingstationgoods/GoodsOrderStationDTO.java @@ -2,8 +2,8 @@ package com.xinelu.applet.dto.nursingstationgoods; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import lombok.Data; -import net.sf.jsqlparser.statement.update.Update; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/diseaseinfo/DiseasesInfoVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/diseaseinfo/DiseasesInfoVO.java index 3bbcc07..e480e95 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/diseaseinfo/DiseasesInfoVO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/diseaseinfo/DiseasesInfoVO.java @@ -3,9 +3,9 @@ package com.xinelu.applet.vo.diseaseinfo; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseDomain; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.sf.jsqlparser.statement.update.Update; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nearbynursingstation/NurseStationClassifyVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nearbynursingstation/NurseStationClassifyVO.java index 056e91f..e3b7397 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nearbynursingstation/NurseStationClassifyVO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nearbynursingstation/NurseStationClassifyVO.java @@ -2,9 +2,9 @@ package com.xinelu.applet.vo.nearbynursingstation; import com.xinelu.common.annotation.Excel; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.sf.jsqlparser.statement.update.Update; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/NurseAppLoginVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/NurseAppLoginVO.java index d50e23d..cf38fc2 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/NurseAppLoginVO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nurseapplogin/NurseAppLoginVO.java @@ -2,8 +2,8 @@ package com.xinelu.applet.vo.nurseapplogin; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import lombok.Data; -import net.sf.jsqlparser.statement.update.Update; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursepersonapplogin/NurseAppLoginSysUserVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursepersonapplogin/NurseAppLoginSysUserVO.java index 90ab683..e6896c4 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursepersonapplogin/NurseAppLoginSysUserVO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursepersonapplogin/NurseAppLoginSysUserVO.java @@ -2,8 +2,8 @@ package com.xinelu.applet.vo.nursepersonapplogin; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import lombok.Data; -import net.sf.jsqlparser.statement.update.Update; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationdepartment/StationDepartmentController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationdepartment/StationDepartmentController.java index c416c3a..d0eba9a 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationdepartment/StationDepartmentController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationdepartment/StationDepartmentController.java @@ -5,13 +5,13 @@ import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.nursestationdepartment.NurseStationDepartment; import com.xinelu.manage.dto.nursestationdepartment.NurseStationDepartmentDTO; import com.xinelu.manage.service.nursestationdepartment.INurseStationDepartmentService; import com.xinelu.manage.vo.nursestationdepartment.NurseStationDepartmentVO; -import net.sf.jsqlparser.statement.update.Update; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/sysarea/SysAreaController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/sysarea/SysAreaController.java index 1895dc1..e083b87 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/sysarea/SysAreaController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/sysarea/SysAreaController.java @@ -5,11 +5,11 @@ import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.sysarea.SysArea; import com.xinelu.manage.service.sysarea.ISysAreaService; -import net.sf.jsqlparser.statement.update.Update; import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/diseaseinfo/DiseaseInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/diseaseinfo/DiseaseInfo.java index cbb1f21..15dad01 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/diseaseinfo/DiseaseInfo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/diseaseinfo/DiseaseInfo.java @@ -3,10 +3,10 @@ package com.xinelu.manage.domain.diseaseinfo; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseDomain; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -import net.sf.jsqlparser.statement.update.Update; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.validator.constraints.Length; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationconsumable/NurseStationConsumable.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationconsumable/NurseStationConsumable.java index 2c6704f..aced788 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationconsumable/NurseStationConsumable.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationconsumable/NurseStationConsumable.java @@ -3,13 +3,13 @@ package com.xinelu.manage.domain.nursestationconsumable; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseDomain; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import net.sf.jsqlparser.statement.update.Update; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.validator.constraints.Length; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationdepartment/NurseStationDepartment.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationdepartment/NurseStationDepartment.java index 175e213..01c6cb4 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationdepartment/NurseStationDepartment.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationdepartment/NurseStationDepartment.java @@ -3,13 +3,13 @@ package com.xinelu.manage.domain.nursestationdepartment; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseDomain; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import net.sf.jsqlparser.statement.update.Update; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.validator.constraints.Length; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationperson/NurseStationPerson.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationperson/NurseStationPerson.java index 3ce3b50..e9ad4ed 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationperson/NurseStationPerson.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/nursestationperson/NurseStationPerson.java @@ -4,13 +4,13 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseDomain; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import net.sf.jsqlparser.statement.update.Update; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.validator.constraints.Length; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/receiveAddressInfo/ReceiveAddressInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/receiveAddressInfo/ReceiveAddressInfo.java index e1e9d22..e4cbbd4 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/receiveAddressInfo/ReceiveAddressInfo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/receiveAddressInfo/ReceiveAddressInfo.java @@ -3,13 +3,13 @@ package com.xinelu.manage.domain.receiveAddressInfo; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseDomain; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import net.sf.jsqlparser.statement.update.Update; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.validator.constraints.Length; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/ChatRecordDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/ChatRecordDTO.java index 8d8df4e..de2ab65 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/ChatRecordDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/chatrecord/ChatRecordDTO.java @@ -2,10 +2,12 @@ package com.xinelu.manage.dto.chatrecord; import com.xinelu.common.core.domain.BaseEntity; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import net.sf.jsqlparser.statement.update.Update; +import lombok.EqualsAndHashCode; import org.hibernate.validator.constraints.Length; + import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -16,14 +18,15 @@ import java.util.Date; * @author xinelu * @date 2023-09-25 */ +@EqualsAndHashCode(callSuper = true) @Data public class ChatRecordDTO extends BaseEntity implements Serializable { private static final long serialVersionUID = -3911806583514536587L; - @ApiModelProperty("消息类别 1：通知公告，2：健康推送，3：在线咨询 4：消息通知") - private String messageCategory; + @ApiModelProperty("消息类别 1：通知公告，2：健康推送，3：在线咨询 4：消息通知") + private String messageCategory; /** * 聊天记录业务主键(问诊表id) @@ -84,10 +87,10 @@ public class ChatRecordDTO extends BaseEntity implements Serializable { @Length(max = 400, message = "消息内容不能超过18位", groups = {Insert.class, Update.class}) private String content; - /** - * 消息内容业务主键，用于点击跳转 - */ - private String contentId; + /** + * 消息内容业务主键，用于点击跳转 + */ + private String contentId; /** * 标题 diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/consultationInfo/ConsultationInfoDTO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/consultationInfo/ConsultationInfoDTO.java index 4052ea0..6470f57 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/consultationInfo/ConsultationInfoDTO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/consultationInfo/ConsultationInfoDTO.java @@ -3,16 +3,18 @@ package com.xinelu.manage.dto.consultationInfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.core.domain.BaseEntity; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalTime; import java.util.Date; import java.util.List; -import javax.validation.constraints.NotNull; -import lombok.Data; -import net.sf.jsqlparser.statement.update.Update; -import org.hibernate.validator.constraints.Length; /** * 在线问诊-问诊信息（图文和视频问诊基本信息）对象 consultation_info @@ -20,6 +22,7 @@ import org.hibernate.validator.constraints.Length; * @author xinelu * @date 2023-09-25 */ +@EqualsAndHashCode(callSuper = true) @ApiModel("在线问诊-问诊信息（图文和视频问诊基本信息）对象") @Data public class ConsultationInfoDTO extends BaseEntity implements Serializable { @@ -33,7 +36,7 @@ public class ConsultationInfoDTO extends BaseEntity implements Serializable { /** * 患者id */ - @ApiModelProperty("患者id") + @ApiModelProperty("患者id") @NotNull(message = "患者信息不能为空", groups = {Insert.class}) private Long patientId; diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/nursestationperson/NurseStationPersonSysUserVO.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/nursestationperson/NurseStationPersonSysUserVO.java index d2b1dc5..395f91d 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/nursestationperson/NurseStationPersonSysUserVO.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/vo/nursestationperson/NurseStationPersonSysUserVO.java @@ -3,9 +3,9 @@ package com.xinelu.manage.vo.nursestationperson; import com.xinelu.common.core.domain.BaseDomain; import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import lombok.Data; import lombok.EqualsAndHashCode; -import net.sf.jsqlparser.statement.update.Update; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank;