Forráskód Böngészése

时间序列化格式,jackson序列化空值处理

skyline 2 éve
szülő
commit
1c812d9e5c

+ 4 - 7
entity/src/main/java/com/kym/entity/admin/AdminUser.java

@@ -1,6 +1,8 @@
 package com.kym.entity.admin;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,12 +20,10 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName("t_admin_user")
-public class AdminUser implements Serializable {
+public class AdminUser extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
     /**
      * 公司id
      */
@@ -59,12 +59,9 @@ public class AdminUser implements Serializable {
      */
     private Integer status;
 
-    private LocalDateTime createTime;
-
-    private LocalDateTime updateTime;
-
     /**
      * 最后登录时间
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime lastLoginTime;
 }

+ 2 - 12
entity/src/main/java/com/kym/entity/admin/AdminUserRole.java

@@ -1,6 +1,7 @@
 package com.kym.entity.admin;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,12 +19,10 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName("t_admin_user_role")
-public class AdminUserRole implements Serializable {
+public class AdminUserRole extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
     /**
      * 公司id
      */
@@ -39,13 +38,4 @@ public class AdminUserRole implements Serializable {
      */
     private Long roleId;
 
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
 }

+ 2 - 6
entity/src/main/java/com/kym/entity/admin/Company.java

@@ -1,6 +1,7 @@
 package com.kym.entity.admin;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,12 +19,10 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName("t_company")
-public class Company implements Serializable {
+public class Company extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
     /**
      * 公司名
      */
@@ -44,7 +43,4 @@ public class Company implements Serializable {
      */
     private Integer status;
 
-    private LocalDateTime createTime;
-
-    private LocalDateTime updateTime;
 }

+ 3 - 7
entity/src/main/java/com/kym/entity/admin/ConnectorInfo.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,12 +20,10 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("t_connector_info")
-public class ConnectorInfo implements Serializable {
+public class ConnectorInfo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
     /**
      * 公司id
      */
@@ -73,8 +73,4 @@ public class ConnectorInfo implements Serializable {
      * 国家标准:1:2011 2:2015
      */
     private Integer nationalStandard;
-
-    private LocalDateTime createTime;
-
-    private LocalDateTime updateTime;
 }

+ 3 - 7
entity/src/main/java/com/kym/entity/admin/EquipmentInfo.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,12 +20,10 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("t_equipment_info")
-public class EquipmentInfo implements Serializable {
+public class EquipmentInfo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
     /**
      * 公司id
      */
@@ -83,8 +83,4 @@ public class EquipmentInfo implements Serializable {
      * 服务状态:0-空闲 1-已连接 2-充电 3-结束
      */
     private Integer serviceStatus;
-
-    private LocalDateTime createTime;
-
-    private LocalDateTime updateTime;
 }

+ 3 - 7
entity/src/main/java/com/kym/entity/admin/EquipmentRelation.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -19,13 +21,10 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("t_equipment_relation")
-public class EquipmentRelation implements Serializable {
+public class EquipmentRelation extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
     /**
      * EN+站点id
      */
@@ -46,7 +45,4 @@ public class EquipmentRelation implements Serializable {
      */
     private Integer status;
 
-    private LocalDateTime createTime;
-
-    private LocalDateTime updateTime;
 }

+ 2 - 12
entity/src/main/java/com/kym/entity/admin/Permission.java

@@ -1,6 +1,7 @@
 package com.kym.entity.admin;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,12 +19,10 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName("t_permission")
-public class Permission implements Serializable {
+public class Permission extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
     /**
      * 公司id
      */
@@ -44,13 +43,4 @@ public class Permission implements Serializable {
      */
     private String permissionDesc;
 
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
 }

+ 2 - 12
entity/src/main/java/com/kym/entity/admin/Role.java

@@ -1,6 +1,7 @@
 package com.kym.entity.admin;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,12 +19,10 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName("t_role")
-public class Role implements Serializable {
+public class Role extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
     /**
      * 公司id
      */
@@ -44,13 +43,4 @@ public class Role implements Serializable {
      */
     private String roleDesc;
 
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
 }

+ 2 - 12
entity/src/main/java/com/kym/entity/admin/RolePermission.java

@@ -1,6 +1,7 @@
 package com.kym.entity.admin;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,12 +19,10 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName("t_role_permission")
-public class RolePermission implements Serializable {
+public class RolePermission extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
     /**
      * 公司id
      */
@@ -39,13 +38,4 @@ public class RolePermission implements Serializable {
      */
     private Long permissionId;
 
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
 }

+ 4 - 7
entity/src/main/java/com/kym/entity/admin/Station.java

@@ -5,13 +5,12 @@ import com.alibaba.fastjson2.annotation.JSONCreator;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -24,7 +23,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName("t_station")
-public class Station implements Serializable {
+public class Station extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -114,11 +113,11 @@ public class Station implements Serializable {
 
     /**
      * 充电桩位置坐标
-     *
+     * <p>
      * FastjsonTypeHandler
      * 支持 MVC JSON 解析
      * 不支持 MySQL JSON 解析
-     *
+     * <p>
      * JacksonTypeHandler
      * 支持 MVC JSON 解析
      * 支持 MySQL JSON 解析
@@ -184,8 +183,6 @@ public class Station implements Serializable {
      */
     @JSONField(name = "Remark")
     private String remark;
-    private LocalDateTime createTime;
-    private LocalDateTime updateTime;
 
     @JSONCreator
     public Station(@JSONField(name = "StationLng") Double lng, @JSONField(name = "StationLat") Double lat) {

+ 2 - 12
entity/src/main/java/com/kym/entity/admin/SystemLog.java

@@ -1,6 +1,7 @@
 package com.kym.entity.admin;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,12 +19,10 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @TableName("t_system_log")
-public class SystemLog implements Serializable {
+public class SystemLog extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private Long id;
-
     /**
      * 公司id
      */
@@ -64,13 +63,4 @@ public class SystemLog implements Serializable {
      */
     private Long executeTime;
 
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
 }

+ 3 - 1
entity/src/main/java/com/kym/entity/miniapp/Cars.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,7 +20,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("t_cars")
-public class Cars implements Serializable {
+public class Cars extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

+ 2 - 1
entity/src/main/java/com/kym/entity/miniapp/User.java

@@ -6,6 +6,7 @@ import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.kym.entity.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,7 +21,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("t_user")
-public class User implements Serializable {
+public class User extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

+ 1 - 1
mapper/src/main/resources/mappers/miniapp/CarsMapper.xml

@@ -14,7 +14,7 @@
         <result column="model" property="model" />
         <result column="engine_no" property="engineNo" />
         <result column="register_date" property="registerDate" />
-        <result column="is_defult" property="isDefult" />
+        <result column="is_defult" property="isDefault" />
         <result column="is_delete" property="isDelete" />
         <result column="issue_date" property="issueDate" />
         <result column="create_time" property="createTime" />