date

mbg/src/main/java/com/koobietech/eas/mbg/CommentGenerator.java

@@ -18,7 +18,7 @@ public class CommentGenerator extends DefaultCommentGenerator {
     private static final String EXAMPLE_SUFFIX="Example";
     private static final String API_MODEL_PROPERTY_FULL_CLASS_NAME="io.swagger.v3.oas.annotations.media.Schema";
 
-    private static final String COM_FASTERXML_JACKSON_NAME="com.fasterxml.jackson.annotation.JsonFormat";
+    private static final String API_DATE_TIME_FORMAT="com.fasterxml.jackson.annotation.JsonFormat";
 
     /**
      * 设置用户配置的参数
@@ -46,8 +46,9 @@ public class CommentGenerator extends DefaultCommentGenerator {
             //给model的字段添加swagger注解
             field.addJavaDocLine("@Schema(description = \""+remarks+"\")");
             //如果字段是时间类型 则加JsonFormat注解
+            System.out.println("字段类型："+field.getType().getFullyQualifiedName());
             if("java.util.Date".equals(field.getType().getFullyQualifiedName())){
-                field.addJavaDocLine("@JsonFormat(pattern = \"yyyy-MM-dd HH:mm:ss\", timezone = \"GMT+8\")");
+                field.addJavaDocLine("@JsonFormat(pattern = \"yyyy-MM-dd HH:mm\", timezone = \"GMT+8\")");
             }
         }
     }
@@ -73,7 +74,7 @@ public class CommentGenerator extends DefaultCommentGenerator {
         //只在model中添加swagger注解类的导入
         if(!compilationUnit.getType().getFullyQualifiedName().contains(EXAMPLE_SUFFIX)){
             compilationUnit.addImportedType(new FullyQualifiedJavaType(API_MODEL_PROPERTY_FULL_CLASS_NAME));
-            compilationUnit.addImportedType(new FullyQualifiedJavaType(COM_FASTERXML_JACKSON_NAME));
+            compilationUnit.addImportedType(new FullyQualifiedJavaType(API_DATE_TIME_FORMAT));
         }
     }
 }

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcArchives.java

@@ -46,7 +46,7 @@ public class EasArcArchives implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -55,7 +55,7 @@ public class EasArcArchives implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -64,7 +64,7 @@ public class EasArcArchives implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "档案有效期截至时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date validityTime;
 
     /**
@@ -81,7 +81,7 @@ public class EasArcArchives implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "档案创建时间, 用于文件归档用")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createDate;
 
     /**
@@ -107,7 +107,7 @@ public class EasArcArchives implements Serializable {
     }
 
     public void setArchiveNumber(String archiveNumber) {
-        this.archiveNumber = archiveNumber;
+        this.archiveNumber = archiveNumber == null ? null : archiveNumber.trim();
     }
 
     public String getStudentNumber() {
@@ -115,7 +115,7 @@ public class EasArcArchives implements Serializable {
     }
 
     public void setStudentNumber(String studentNumber) {
-        this.studentNumber = studentNumber;
+        this.studentNumber = studentNumber == null ? null : studentNumber.trim();
     }
 
     public String getFilePath() {
@@ -123,7 +123,7 @@ public class EasArcArchives implements Serializable {
     }
 
     public void setFilePath(String filePath) {
-        this.filePath = filePath;
+        this.filePath = filePath == null ? null : filePath.trim();
     }
 
     public Integer getArctypeId() {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcArctype.java

@@ -54,7 +54,7 @@ public class EasArcArctype implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -63,7 +63,7 @@ public class EasArcArctype implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -89,7 +89,7 @@ public class EasArcArctype implements Serializable {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name == null ? null : name.trim();
     }
 
     public String getIsViews() {
@@ -97,7 +97,7 @@ public class EasArcArctype implements Serializable {
     }
 
     public void setIsViews(String isViews) {
-        this.isViews = isViews;
+        this.isViews = isViews == null ? null : isViews.trim();
     }
 
     public String getTemplate() {
@@ -105,7 +105,7 @@ public class EasArcArctype implements Serializable {
     }
 
     public void setTemplate(String template) {
-        this.template = template;
+        this.template = template == null ? null : template.trim();
     }
 
     public String getBackup() {
@@ -113,7 +113,7 @@ public class EasArcArctype implements Serializable {
     }
 
     public void setBackup(String backup) {
-        this.backup = backup;
+        this.backup = backup == null ? null : backup.trim();
     }
 
     public String getSuffix() {
@@ -121,7 +121,7 @@ public class EasArcArctype implements Serializable {
     }
 
     public void setSuffix(String suffix) {
-        this.suffix = suffix;
+        this.suffix = suffix == null ? null : suffix.trim();
     }
 
     public Date getCreateTime() {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsAttendance.java

@@ -14,7 +14,7 @@ public class EasArcTlsAttendance implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "签到日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date checkinDate;
 
     /**
@@ -79,7 +79,7 @@ public class EasArcTlsAttendance implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -88,7 +88,7 @@ public class EasArcTlsAttendance implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     private static final long serialVersionUID = 1L;
@@ -130,7 +130,7 @@ public class EasArcTlsAttendance implements Serializable {
     }
 
     public void setMorning(String morning) {
-        this.morning = morning;
+        this.morning = morning == null ? null : morning.trim();
     }
 
     public String getAfternoon() {
@@ -138,7 +138,7 @@ public class EasArcTlsAttendance implements Serializable {
     }
 
     public void setAfternoon(String afternoon) {
-        this.afternoon = afternoon;
+        this.afternoon = afternoon == null ? null : afternoon.trim();
     }
 
     public String getStudentName() {
@@ -146,7 +146,7 @@ public class EasArcTlsAttendance implements Serializable {
     }
 
     public void setStudentName(String studentName) {
-        this.studentName = studentName;
+        this.studentName = studentName == null ? null : studentName.trim();
     }
 
     public String getStudentNumber() {
@@ -154,7 +154,7 @@ public class EasArcTlsAttendance implements Serializable {
     }
 
     public void setStudentNumber(String studentNumber) {
-        this.studentNumber = studentNumber;
+        this.studentNumber = studentNumber == null ? null : studentNumber.trim();
     }
 
     public Integer getCreateUid() {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsScores.java

@@ -45,7 +45,7 @@ public class EasArcTlsScores implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "考试时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date testDate;
 
     /**
@@ -78,7 +78,7 @@ public class EasArcTlsScores implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -87,7 +87,7 @@ public class EasArcTlsScores implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -121,7 +121,7 @@ public class EasArcTlsScores implements Serializable {
     }
 
     public void setStudentNumber(String studentNumber) {
-        this.studentNumber = studentNumber;
+        this.studentNumber = studentNumber == null ? null : studentNumber.trim();
     }
 
     public Integer getCategoryId() {
@@ -201,7 +201,7 @@ public class EasArcTlsScores implements Serializable {
     }
 
     public void setComment(String comment) {
-        this.comment = comment;
+        this.comment = comment == null ? null : comment.trim();
     }
 
     @Override

mbg/src/main/java/com/koobietech/eas/mbg/model/EasArcTlsStudents.java

@@ -52,7 +52,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生出生日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date birthdate;
 
     /**
@@ -85,7 +85,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生入学进入培训班日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date enrollmentDate;
 
     /**
@@ -94,7 +94,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生在培训班毕业日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date graduationDate;
 
     /**
@@ -135,7 +135,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -144,7 +144,7 @@ public class EasArcTlsStudents implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -186,7 +186,7 @@ public class EasArcTlsStudents implements Serializable {
     }
 
     public void setArchiveNumber(String archiveNumber) {
-        this.archiveNumber = archiveNumber;
+        this.archiveNumber = archiveNumber == null ? null : archiveNumber.trim();
     }
 
     public String getStudentNumber() {
@@ -194,7 +194,7 @@ public class EasArcTlsStudents implements Serializable {
     }
 
     public void setStudentNumber(String studentNumber) {
-        this.studentNumber = studentNumber;
+        this.studentNumber = studentNumber == null ? null : studentNumber.trim();
     }
 
     public String getStudentName() {
@@ -202,7 +202,7 @@ public class EasArcTlsStudents implements Serializable {
     }
 
     public void setStudentName(String studentName) {
-        this.studentName = studentName;
+        this.studentName = studentName == null ? null : studentName.trim();
     }
 
     public String getGender() {
@@ -210,7 +210,7 @@ public class EasArcTlsStudents implements Serializable {
     }
 
     public void setGender(String gender) {
-        this.gender = gender;
+        this.gender = gender == null ? null : gender.trim();
     }
 
     public Date getBirthdate() {
@@ -226,7 +226,7 @@ public class EasArcTlsStudents implements Serializable {
     }
 
     public void setAddress(String address) {
-        this.address = address;
+        this.address = address == null ? null : address.trim();
     }
 
     public String getPhone() {
@@ -234,7 +234,7 @@ public class EasArcTlsStudents implements Serializable {
     }
 
     public void setPhone(String phone) {
-        this.phone = phone;
+        this.phone = phone == null ? null : phone.trim();
     }
 
     public String getEmail() {
@@ -242,7 +242,7 @@ public class EasArcTlsStudents implements Serializable {
     }
 
     public void setEmail(String email) {
-        this.email = email;
+        this.email = email == null ? null : email.trim();
     }
 
     public Date getEnrollmentDate() {
@@ -274,7 +274,7 @@ public class EasArcTlsStudents implements Serializable {
     }
 
     public void setMajor(String major) {
-        this.major = major;
+        this.major = major == null ? null : major.trim();
     }
 
     public String getMinor() {
@@ -282,7 +282,7 @@ public class EasArcTlsStudents implements Serializable {
     }
 
     public void setMinor(String minor) {
-        this.minor = minor;
+        this.minor = minor == null ? null : minor.trim();
     }
 
     public String getUniversity() {
@@ -290,7 +290,7 @@ public class EasArcTlsStudents implements Serializable {
     }
 
     public void setUniversity(String university) {
-        this.university = university;
+        this.university = university == null ? null : university.trim();
     }
 
     public Date getCreateTime() {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCategory.java

@@ -30,7 +30,7 @@ public class EasEduCategory implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -39,7 +39,7 @@ public class EasEduCategory implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -73,7 +73,7 @@ public class EasEduCategory implements Serializable {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name == null ? null : name.trim();
     }
 
     public String getDescription() {
@@ -81,7 +81,7 @@ public class EasEduCategory implements Serializable {
     }
 
     public void setDescription(String description) {
-        this.description = description;
+        this.description = description == null ? null : description.trim();
     }
 
     public Date getCreateTime() {
@@ -113,7 +113,7 @@ public class EasEduCategory implements Serializable {
     }
 
     public void setDisabled(String disabled) {
-        this.disabled = disabled;
+        this.disabled = disabled == null ? null : disabled.trim();
     }
 
     @Override

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClaRelation.java

@@ -46,7 +46,7 @@ public class EasEduClaRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -55,7 +55,7 @@ public class EasEduClaRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClass.java

@@ -44,7 +44,7 @@ public class EasEduClass implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -53,7 +53,7 @@ public class EasEduClass implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -87,7 +87,7 @@ public class EasEduClass implements Serializable {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name == null ? null : name.trim();
     }
 
     public Integer getManageId() {
@@ -135,7 +135,7 @@ public class EasEduClass implements Serializable {
     }
 
     public void setDisabled(String disabled) {
-        this.disabled = disabled;
+        this.disabled = disabled == null ? null : disabled.trim();
     }
 
     @Override

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduClassroom.java

@@ -78,7 +78,7 @@ public class EasEduClassroom implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -87,7 +87,7 @@ public class EasEduClassroom implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -113,7 +113,7 @@ public class EasEduClassroom implements Serializable {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name == null ? null : name.trim();
     }
 
     public Integer getManagerId() {
@@ -129,7 +129,7 @@ public class EasEduClassroom implements Serializable {
     }
 
     public void setAddress(String address) {
-        this.address = address;
+        this.address = address == null ? null : address.trim();
     }
 
     public String getManager() {
@@ -137,7 +137,7 @@ public class EasEduClassroom implements Serializable {
     }
 
     public void setManager(String manager) {
-        this.manager = manager;
+        this.manager = manager == null ? null : manager.trim();
     }
 
     public Integer getFloor() {
@@ -161,7 +161,7 @@ public class EasEduClassroom implements Serializable {
     }
 
     public void setComment(String comment) {
-        this.comment = comment;
+        this.comment = comment == null ? null : comment.trim();
     }
 
     public String getDisabled() {
@@ -169,7 +169,7 @@ public class EasEduClassroom implements Serializable {
     }
 
     public void setDisabled(String disabled) {
-        this.disabled = disabled;
+        this.disabled = disabled == null ? null : disabled.trim();
     }
 
     public Date getCreateTime() {

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduCltRelation.java

@@ -30,7 +30,7 @@ public class EasEduCltRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -39,7 +39,7 @@ public class EasEduCltRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduSchedule.java

@@ -22,7 +22,7 @@ public class EasEduSchedule implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "起始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date startTime;
 
     /**
@@ -31,7 +31,7 @@ public class EasEduSchedule implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date endTime;
 
     /**
@@ -88,7 +88,7 @@ public class EasEduSchedule implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -97,7 +97,7 @@ public class EasEduSchedule implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -227,7 +227,7 @@ public class EasEduSchedule implements Serializable {
     }
 
     public void setDisabled(String disabled) {
-        this.disabled = disabled;
+        this.disabled = disabled == null ? null : disabled.trim();
     }
 
     @Override

mbg/src/main/java/com/koobietech/eas/mbg/model/EasEduSubjects.java

@@ -38,7 +38,7 @@ public class EasEduSubjects implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -47,7 +47,7 @@ public class EasEduSubjects implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -81,7 +81,7 @@ public class EasEduSubjects implements Serializable {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name == null ? null : name.trim();
     }
 
     public String getDescription() {
@@ -89,7 +89,7 @@ public class EasEduSubjects implements Serializable {
     }
 
     public void setDescription(String description) {
-        this.description = description;
+        this.description = description == null ? null : description.trim();
     }
 
     public Integer getCategoryId() {
@@ -129,7 +129,7 @@ public class EasEduSubjects implements Serializable {
     }
 
     public void setDisabled(String disabled) {
-        this.disabled = disabled;
+        this.disabled = disabled == null ? null : disabled.trim();
     }
 
     @Override

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysDepRelation.java

@@ -44,7 +44,7 @@ public class EasSysDepRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysDepartment.java

@@ -54,7 +54,7 @@ public class EasSysDepartment implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -63,7 +63,7 @@ public class EasSysDepartment implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -97,7 +97,7 @@ public class EasSysDepartment implements Serializable {
     }
 
     public void setDepname(String depname) {
-        this.depname = depname;
+        this.depname = depname == null ? null : depname.trim();
     }
 
     public String getAddress() {
@@ -105,7 +105,7 @@ public class EasSysDepartment implements Serializable {
     }
 
     public void setAddress(String address) {
-        this.address = address;
+        this.address = address == null ? null : address.trim();
     }
 
     public String getPhone() {
@@ -113,7 +113,7 @@ public class EasSysDepartment implements Serializable {
     }
 
     public void setPhone(String phone) {
-        this.phone = phone;
+        this.phone = phone == null ? null : phone.trim();
     }
 
     public String getEmail() {
@@ -121,7 +121,7 @@ public class EasSysDepartment implements Serializable {
     }
 
     public void setEmail(String email) {
-        this.email = email;
+        this.email = email == null ? null : email.trim();
     }
 
     public String getManager() {
@@ -129,7 +129,7 @@ public class EasSysDepartment implements Serializable {
     }
 
     public void setManager(String manager) {
-        this.manager = manager;
+        this.manager = manager == null ? null : manager.trim();
     }
 
     public Date getCreateTime() {
@@ -161,7 +161,7 @@ public class EasSysDepartment implements Serializable {
     }
 
     public void setDisabled(String disabled) {
-        this.disabled = disabled;
+        this.disabled = disabled == null ? null : disabled.trim();
     }
 
     @Override

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysLogs.java

@@ -20,7 +20,7 @@ public class EasSysLogs implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "记录日志的时间戳")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date timestamp;
 
     /**
@@ -78,7 +78,7 @@ public class EasSysLogs implements Serializable {
     }
 
     public void setLevel(String level) {
-        this.level = level;
+        this.level = level == null ? null : level.trim();
     }
 
     public String getLogger() {
@@ -86,7 +86,7 @@ public class EasSysLogs implements Serializable {
     }
 
     public void setLogger(String logger) {
-        this.logger = logger;
+        this.logger = logger == null ? null : logger.trim();
     }
 
     public String getMessage() {
@@ -94,7 +94,7 @@ public class EasSysLogs implements Serializable {
     }
 
     public void setMessage(String message) {
-        this.message = message;
+        this.message = message == null ? null : message.trim();
     }
 
     public String getException() {
@@ -102,7 +102,7 @@ public class EasSysLogs implements Serializable {
     }
 
     public void setException(String exception) {
-        this.exception = exception;
+        this.exception = exception == null ? null : exception.trim();
     }
 
     @Override

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPermission.java

@@ -44,7 +44,7 @@ public class EasSysPermission implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -53,7 +53,7 @@ public class EasSysPermission implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -87,7 +87,7 @@ public class EasSysPermission implements Serializable {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name == null ? null : name.trim();
     }
 
     public String getDescription() {
@@ -95,7 +95,7 @@ public class EasSysPermission implements Serializable {
     }
 
     public void setDescription(String description) {
-        this.description = description;
+        this.description = description == null ? null : description.trim();
     }
 
     public Byte getIsActive() {
@@ -135,7 +135,7 @@ public class EasSysPermission implements Serializable {
     }
 
     public void setDisabled(String disabled) {
-        this.disabled = disabled;
+        this.disabled = disabled == null ? null : disabled.trim();
     }
 
     @Override

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysPesRelation.java

@@ -36,7 +36,7 @@ public class EasSysPesRelation implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysStudent.java

@@ -54,7 +54,7 @@ public class EasSysStudent implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "学生入学日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date enrollmentDate;
 
     /**
@@ -79,7 +79,7 @@ public class EasSysStudent implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -88,7 +88,7 @@ public class EasSysStudent implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -138,7 +138,7 @@ public class EasSysStudent implements Serializable {
     }
 
     public void setStudentNumber(String studentNumber) {
-        this.studentNumber = studentNumber;
+        this.studentNumber = studentNumber == null ? null : studentNumber.trim();
     }
 
     public String getStudentName() {
@@ -146,7 +146,7 @@ public class EasSysStudent implements Serializable {
     }
 
     public void setStudentName(String studentName) {
-        this.studentName = studentName;
+        this.studentName = studentName == null ? null : studentName.trim();
     }
 
     public String getGender() {
@@ -154,7 +154,7 @@ public class EasSysStudent implements Serializable {
     }
 
     public void setGender(String gender) {
-        this.gender = gender;
+        this.gender = gender == null ? null : gender.trim();
     }
 
     public String getPhone() {
@@ -162,7 +162,7 @@ public class EasSysStudent implements Serializable {
     }
 
     public void setPhone(String phone) {
-        this.phone = phone;
+        this.phone = phone == null ? null : phone.trim();
     }
 
     public String getEmail() {
@@ -170,7 +170,7 @@ public class EasSysStudent implements Serializable {
     }
 
     public void setEmail(String email) {
-        this.email = email;
+        this.email = email == null ? null : email.trim();
     }
 
     public Date getEnrollmentDate() {
@@ -186,7 +186,7 @@ public class EasSysStudent implements Serializable {
     }
 
     public void setPasswd(String passwd) {
-        this.passwd = passwd;
+        this.passwd = passwd == null ? null : passwd.trim();
     }
 
     public String getAvatar() {
@@ -194,7 +194,7 @@ public class EasSysStudent implements Serializable {
     }
 
     public void setAvatar(String avatar) {
-        this.avatar = avatar;
+        this.avatar = avatar == null ? null : avatar.trim();
     }
 
     public Date getCreateTime() {
@@ -242,7 +242,7 @@ public class EasSysStudent implements Serializable {
     }
 
     public void setDisabled(String disabled) {
-        this.disabled = disabled;
+        this.disabled = disabled == null ? null : disabled.trim();
     }
 
     @Override

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysUniversity.java

@@ -28,7 +28,7 @@ public class EasSysUniversity implements Serializable {
     }
 
     public void setUniversityCode(String universityCode) {
-        this.universityCode = universityCode;
+        this.universityCode = universityCode == null ? null : universityCode.trim();
     }
 
     public String getUniversityTitle() {
@@ -36,7 +36,7 @@ public class EasSysUniversity implements Serializable {
     }
 
     public void setUniversityTitle(String universityTitle) {
-        this.universityTitle = universityTitle;
+        this.universityTitle = universityTitle == null ? null : universityTitle.trim();
     }
 
     @Override

mbg/src/main/java/com/koobietech/eas/mbg/model/EasSysUserinfo.java

@@ -68,7 +68,7 @@ public class EasSysUserinfo implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -77,7 +77,7 @@ public class EasSysUserinfo implements Serializable {
      * @mbg.generated
      */
     @Schema(description = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
     private Date modifyTime;
 
     /**
@@ -111,7 +111,7 @@ public class EasSysUserinfo implements Serializable {
     }
 
     public void setUsername(String username) {
-        this.username = username;
+        this.username = username == null ? null : username.trim();
     }
 
     public String getPasswd() {
@@ -119,7 +119,7 @@ public class EasSysUserinfo implements Serializable {
     }
 
     public void setPasswd(String passwd) {
-        this.passwd = passwd;
+        this.passwd = passwd == null ? null : passwd.trim();
     }
 
     public String getEmail() {
@@ -127,7 +127,7 @@ public class EasSysUserinfo implements Serializable {
     }
 
     public void setEmail(String email) {
-        this.email = email;
+        this.email = email == null ? null : email.trim();
     }
 
     public String getRelname() {
@@ -135,7 +135,7 @@ public class EasSysUserinfo implements Serializable {
     }
 
     public void setRelname(String relname) {
-        this.relname = relname;
+        this.relname = relname == null ? null : relname.trim();
     }
 
     public String getPhone() {
@@ -143,7 +143,7 @@ public class EasSysUserinfo implements Serializable {
     }
 
     public void setPhone(String phone) {
-        this.phone = phone;
+        this.phone = phone == null ? null : phone.trim();
     }
 
     public String getAddress() {
@@ -151,7 +151,7 @@ public class EasSysUserinfo implements Serializable {
     }
 
     public void setAddress(String address) {
-        this.address = address;
+        this.address = address == null ? null : address.trim();
     }
 
     public Date getCreateTime() {
@@ -183,7 +183,7 @@ public class EasSysUserinfo implements Serializable {
     }
 
     public void setDisabled(String disabled) {
-        this.disabled = disabled;
+        this.disabled = disabled == null ? null : disabled.trim();
     }
 
     @Override

mbg/src/main/resources/generatorConfig.xml

@@ -27,6 +27,10 @@
             <property name="suppressDate" value="true"/>
             <!-- 是否添加数据库内的注释 true：是 ： false:否 -->
             <property name="addRemarkComments" value="true"/>
+            <!-- 生成注释的作者 -->
+            <property name="author" value="koobietech"/>
+            <!-- 生成注释的日期格式 -->
+            <property name="dateFormat" value="yyyy-MM-dd HH:mm:ss"/>
         </commentGenerator>
 
         <jdbcConnection driverClass="${jdbc.driverClass}"
@@ -36,7 +40,11 @@
             <property name="nullCatalogMeansCurrent" value="true" />
         </jdbcConnection>
 
-        <javaModelGenerator targetPackage="com.koobietech.eas.mbg.model" targetProject="mbg/src/main/java"/>
+        <javaModelGenerator targetPackage="com.koobietech.eas.mbg.model" targetProject="mbg/src/main/java">
+            <property name="dateType" value="java.util.Date"/>
+            <property name="datetimeType" value="java.util.DateTime"/>
+            <property name="trimStrings" value="true"/>
+        </javaModelGenerator>
 
         <sqlMapGenerator targetPackage="com.koobietech.eas.mbg.mapper" targetProject="mbg/src/main/resources"/>