From 8ee7f6a448a50300f9250f8ec6d5e47d5a76f7aa Mon Sep 17 00:00:00 2001 From: liu Date: Fri, 19 Jan 2024 14:07:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E5=A1=AB?= =?UTF-8?q?=E5=85=85=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/MyBatisMetaObjectHandler.java | 28 ----------------- .../config/MybatisMetaHandler.java | 31 +++++++++++++++++++ .../supervision/model/AskPatientAnswer.java | 10 +++--- .../model/AskTemplateQuestionLibrary.java | 14 ++++----- .../java/com/supervision/model/CommonDic.java | 23 ++++++++------ .../model/ConfigAncillaryItem.java | 9 +++--- .../com/supervision/model/ConfigDrug.java | 14 +++++---- .../model/ConfigPhysicalLocation.java | 5 +++ .../supervision/model/ConfigPhysicalTool.java | 5 +++ .../model/ConfigTreatmentPlan.java | 2 ++ .../model/DefaultItemIndicator.java | 11 ++++--- .../model/DefaultPhysicalIndicator.java | 15 +++++---- .../model/DiagnosisAncillaryRecord.java | 12 +++---- .../model/DiagnosisPhysicalRecord.java | 10 +++--- .../supervision/model/DiagnosisPrimary.java | 10 +++--- .../model/DiagnosisPrimaryRelation.java | 10 +++--- .../supervision/model/DiagnosisQaRecord.java | 10 +++--- .../java/com/supervision/model/Disease.java | 14 ++++----- .../supervision/model/DiseaseAncillary.java | 5 +++ .../supervision/model/DiseasePhysical.java | 7 +++++ .../supervision/model/DiseaseQuestion.java | 14 +++++---- .../model/DiseaseTreatmentPlan.java | 10 ++++-- .../model/DiseaseTreatmentPlanDrug.java | 12 +++++-- .../com/supervision/model/FileResource.java | 10 +++--- .../com/supervision/model/MedicalRec.java | 10 ++++-- .../java/com/supervision/model/Patient.java | 5 +++ .../java/com/supervision/model/Process.java | 3 ++ .../supervision/model/ProcessEvaluation.java | 15 +++++---- .../com/supervision/model/ProcessMedical.java | 5 ++- .../com/supervision/model/RasaModelInfo.java | 5 +++ .../model/TreatmentPlanRecord.java | 10 ++++-- .../main/java/com/supervision/model/User.java | 10 +++--- .../java/com/supervision/util/UserUtil.java | 0 33 files changed, 223 insertions(+), 131 deletions(-) delete mode 100644 virtual-patient-common/src/main/java/com/supervision/config/MyBatisMetaObjectHandler.java create mode 100644 virtual-patient-model/src/main/java/com/supervision/config/MybatisMetaHandler.java rename {virtual-patient-web => virtual-patient-model}/src/main/java/com/supervision/util/UserUtil.java (100%) diff --git a/virtual-patient-common/src/main/java/com/supervision/config/MyBatisMetaObjectHandler.java b/virtual-patient-common/src/main/java/com/supervision/config/MyBatisMetaObjectHandler.java deleted file mode 100644 index 3fe73a4d..00000000 --- a/virtual-patient-common/src/main/java/com/supervision/config/MyBatisMetaObjectHandler.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.supervision.config; - -import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import org.apache.ibatis.reflection.MetaObject; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -/** - * @author ljt on 2022/08/13. - * 创建时间和更新时间自动填充 - */ -@Component -public class MyBatisMetaObjectHandler implements MetaObjectHandler { - // 使用MP进行添加操作，该方法执行 - @Override - public void insertFill(MetaObject metaObject) { - //属性名称，不是字段名称 - this.setFieldValByName("createTime", LocalDateTime.now(), metaObject); - this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject); - } - - @Override - public void updateFill(MetaObject metaObject) { - // 使用MP进行修改操作，该方法执行 - this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject); - } -} diff --git a/virtual-patient-model/src/main/java/com/supervision/config/MybatisMetaHandler.java b/virtual-patient-model/src/main/java/com/supervision/config/MybatisMetaHandler.java new file mode 100644 index 00000000..3f43623e --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/config/MybatisMetaHandler.java @@ -0,0 +1,31 @@ +package com.supervision.config; + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.supervision.util.UserUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; +import java.util.Optional; + +@Component +@Slf4j +public class MybatisMetaHandler implements MetaObjectHandler { + @Override + public void insertFill(MetaObject metaObject) { + log.info("填充创建和开始时间以及新增用户"); + // 填充 + this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now()); + this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); + Optional.ofNullable(UserUtil.getUser()).ifPresent(user -> this.strictInsertFill(metaObject, "createUserId", String.class, user.getId())); + Optional.ofNullable(UserUtil.getUser()).ifPresent(user -> this.strictInsertFill(metaObject, "updateUserId", String.class, user.getId())); + } + + @Override + public void updateFill(MetaObject metaObject) { + log.info("填充修改时间以及修改用户"); + this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now()); + Optional.ofNullable(UserUtil.getUser()).ifPresent(user -> this.strictInsertFill(metaObject, "updateUserId", String.class, user.getId())); + } +} diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java b/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java index 4630b92a..56f01e7d 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/AskPatientAnswer.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; @@ -50,21 +48,25 @@ public class AskPatientAnswer extends Model implements Seriali /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java b/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java index 4edab16e..a3fecfa8 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/AskTemplateQuestionLibrary.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; @@ -58,25 +56,25 @@ public class AskTemplateQuestionLibrary implements Serializable { /** * 创建人ID */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/CommonDic.java b/virtual-patient-model/src/main/java/com/supervision/model/CommonDic.java index 6c639b66..68f4ec1c 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/CommonDic.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/CommonDic.java @@ -1,10 +1,9 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -64,24 +63,28 @@ public class CommonDic extends Model implements Serializable { private String description; /** - * + * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** - * + * 创建时间 */ - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** - * + * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** - * + * 更新时间 */ - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java index 4f3089c9..66e8b3a2 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java @@ -1,9 +1,6 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import java.io.Serializable; import java.math.BigDecimal; @@ -90,21 +87,25 @@ public class ConfigAncillaryItem implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java index 8af82a4a..3431e37e 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigDrug.java @@ -1,8 +1,10 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import io.swagger.annotations.ApiModelProperty; @@ -75,26 +77,26 @@ public class ConfigDrug implements Serializable { /** * 创建人ID */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - @ApiModelProperty(hidden = true) - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** * 更新人 */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - @ApiModelProperty(hidden = true) - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java index ca85f8c1..ba32ad90 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalLocation.java @@ -1,5 +1,6 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -52,21 +53,25 @@ public class ConfigPhysicalLocation implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java index 58fcbf6d..452c66cb 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigPhysicalTool.java @@ -1,5 +1,6 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -74,21 +75,25 @@ public class ConfigPhysicalTool implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java index 677f6a48..fb5217eb 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigTreatmentPlan.java @@ -68,6 +68,7 @@ public class ConfigTreatmentPlan implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** @@ -79,6 +80,7 @@ public class ConfigTreatmentPlan implements Serializable { /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DefaultItemIndicator.java b/virtual-patient-model/src/main/java/com/supervision/model/DefaultItemIndicator.java index 2d141918..efe888b7 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DefaultItemIndicator.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DefaultItemIndicator.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; @@ -46,22 +44,25 @@ public class DefaultItemIndicator implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DefaultPhysicalIndicator.java b/virtual-patient-model/src/main/java/com/supervision/model/DefaultPhysicalIndicator.java index 55454d49..901e22f2 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DefaultPhysicalIndicator.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DefaultPhysicalIndicator.java @@ -1,10 +1,9 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import io.swagger.annotations.ApiModel; @@ -58,22 +57,26 @@ public class DefaultPhysicalIndicator implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java index 6a9db76c..5259f683 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisAncillaryRecord.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; @@ -65,23 +63,25 @@ public class DiagnosisAncillaryRecord extends Model im /** * 创建人ID */ - @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - @ApiModelProperty("") + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java index 17d34191..fd171f7a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPhysicalRecord.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; @@ -65,21 +63,25 @@ public class DiagnosisPhysicalRecord extends Model impl /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java index 1a119093..e273f9f3 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimary.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; @@ -50,21 +48,25 @@ public class DiagnosisPrimary implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimaryRelation.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimaryRelation.java index 72c876cd..d9266267 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimaryRelation.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisPrimaryRelation.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; @@ -51,21 +49,25 @@ public class DiagnosisPrimaryRelation extends Model im /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java index d8449a79..f8093a4b 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiagnosisQaRecord.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; @@ -82,21 +80,25 @@ public class DiagnosisQaRecord extends Model implements Seria /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java index b0922911..6d63133e 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Disease.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Disease.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; @@ -61,25 +59,25 @@ public class Disease implements Serializable { /** * 创建人ID */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java index 498e44ae..360409fb 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseAncillary.java @@ -1,5 +1,6 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -83,21 +84,25 @@ public class DiseaseAncillary implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java index 26f72788..51d9e38a 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseasePhysical.java @@ -1,5 +1,7 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -88,22 +90,27 @@ public class DiseasePhysical implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; + } \ No newline at end of file diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java index d4481a51..09ce106b 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseQuestion.java @@ -1,8 +1,10 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import io.swagger.annotations.ApiModelProperty; @@ -33,26 +35,26 @@ public class DiseaseQuestion implements Serializable { /** * 创建人ID */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - @ApiModelProperty(hidden = true) - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** * 更新人 */ - @ApiModelProperty(hidden = true) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - @ApiModelProperty(hidden = true) - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java index e5e6e85f..61908849 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlan.java @@ -1,9 +1,11 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -42,22 +44,26 @@ public class DiseaseTreatmentPlan implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlanDrug.java b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlanDrug.java index a792602f..29279af9 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlanDrug.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/DiseaseTreatmentPlanDrug.java @@ -1,8 +1,10 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import lombok.Data; @@ -34,24 +36,28 @@ public class DiseaseTreatmentPlanDrug implements Serializable { private String drugId; /** - * 创建人id + * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/FileResource.java b/virtual-patient-model/src/main/java/com/supervision/model/FileResource.java index f6ac6227..82c3e78b 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/FileResource.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/FileResource.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; @@ -45,21 +43,25 @@ public class FileResource extends Model implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java b/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java index 8936f8e7..39daa577 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java @@ -1,10 +1,12 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -121,22 +123,26 @@ public class MedicalRec extends Model implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Patient.java b/virtual-patient-model/src/main/java/com/supervision/model/Patient.java index 17da5e93..2effabf2 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Patient.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Patient.java @@ -1,5 +1,6 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -84,21 +85,25 @@ public class Patient extends Model implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/Process.java b/virtual-patient-model/src/main/java/com/supervision/model/Process.java index e0fd6315..9f8caf64 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/Process.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/Process.java @@ -63,16 +63,19 @@ public class Process implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java b/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java index 2b7a5b7d..34ab871f 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ProcessEvaluation.java @@ -1,10 +1,9 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import io.swagger.annotations.ApiModel; @@ -77,22 +76,26 @@ public class ProcessEvaluation implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ProcessMedical.java b/virtual-patient-model/src/main/java/com/supervision/model/ProcessMedical.java index 6e67d73f..f86b1000 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ProcessMedical.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ProcessMedical.java @@ -106,22 +106,25 @@ public class ProcessMedical implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - @TableField(fill = FieldFill.INSERT) + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/RasaModelInfo.java b/virtual-patient-model/src/main/java/com/supervision/model/RasaModelInfo.java index f11967e7..e61dda7d 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/RasaModelInfo.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/RasaModelInfo.java @@ -1,5 +1,6 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -79,21 +80,25 @@ public class RasaModelInfo implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlanRecord.java b/virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlanRecord.java index a45bafcc..2c385652 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlanRecord.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/TreatmentPlanRecord.java @@ -1,9 +1,11 @@ package com.supervision.model; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; import lombok.Data; @@ -82,22 +84,26 @@ public class TreatmentPlanRecord implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ - private Date createTime; + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ - private Date updateTime; + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/virtual-patient-model/src/main/java/com/supervision/model/User.java b/virtual-patient-model/src/main/java/com/supervision/model/User.java index 4c14f12c..82252172 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/User.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/User.java @@ -1,9 +1,7 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.time.LocalDateTime; @@ -58,21 +56,25 @@ public class User implements Serializable { /** * 创建人ID */ + @TableField(fill = FieldFill.INSERT) private String createUserId; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; /** * 更新人 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private String updateUserId; /** * 更新时间 */ + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateTime; @TableField(exist = false) diff --git a/virtual-patient-web/src/main/java/com/supervision/util/UserUtil.java b/virtual-patient-model/src/main/java/com/supervision/util/UserUtil.java similarity index 100% rename from virtual-patient-web/src/main/java/com/supervision/util/UserUtil.java rename to virtual-patient-model/src/main/java/com/supervision/util/UserUtil.java