diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearReactors.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearReactors.java index 720eed3..61d2536 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearReactors.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearReactors.java @@ -23,13 +23,12 @@ import java.util.Date; @TableName("CONFIGURATION.GARDS_NUCLEAR_REACTORS") public class GardsNuclearReactors implements Serializable { - private static final long serialVersionUID = 1L; /** * 主键ID */ - @TableId(value = "ID", type = IdType.AUTO) + @TableId(value = "ID", type = IdType.NONE) private Integer id; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearReleaseRecords.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearReleaseRecords.java index 2374d48..aed8ebc 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearReleaseRecords.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearReleaseRecords.java @@ -3,12 +3,10 @@ package org.jeecg.modules.base.entity.configuration; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.apache.ibatis.type.JdbcType; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.time.LocalDateTime; import java.util.Date; /** @@ -31,7 +29,7 @@ public class GardsNuclearReleaseRecords implements Serializable { /** * 设施名称 */ - @Excel(name = "设施名称", width = 20,height = 20,orderNum="0") + @Excel(name = "设施名称", width = 20, height = 20, orderNum = "0") @TableField(value = "FACILITY_NAME") private String facilityName; @@ -53,46 +51,46 @@ public class GardsNuclearReleaseRecords implements Serializable { /** * 开始时间 */ - @Excel(name = "开始时间", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "3") - @TableField(value = "START_TIME", fill = FieldFill.INSERT_UPDATE) + @Excel(name = "开始时间", width = 20, height = 20, orderNum = "3") + @TableField(value = "START_TIME") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date startTime; + private Date startTime; /** * 结束时间 */ - @Excel(name = "结束时间", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "4") - @TableField(value = "END_TIME", fill = FieldFill.INSERT_UPDATE) - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date endTime; + @Excel(name = "结束时间", width = 20, height = 20, orderNum = "4") + @TableField(value = "END_TIME") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date endTime; /** * 具体核素 */ - @Excel(name = "核素", width = 20,height = 20,orderNum="5") + @Excel(name = "核素", width = 20, height = 20, orderNum = "5") @TableField(value = "NUCLIDE") private String nuclide; /** - *释放量 + * 释放量 */ - @Excel(name = "释放量", width = 20,height = 20,orderNum="6") + @Excel(name = "释放量", width = 20, height = 20, orderNum = "6") @TableField(value = "RELEASE_AMOUNT") private String releaseAmount; /** * 物质状态 1-气体,2-气溶胶 */ - @Excel(name = "物质状态", width = 20,height = 20,orderNum="7") + @Excel(name = "物质状态", width = 20, height = 20, orderNum = "7") @TableField(value = "MATTER_STATE") private Integer matterState; /** * 数据来源 1-监测数据,2-重建数据,3-评估数据 */ - @Excel(name = "数据来源", width = 20,height = 20,orderNum="8") + @Excel(name = "数据来源", width = 20, height = 20, orderNum = "8") @TableField(value = "DATA_SOURCE") private Integer dataSource; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearTestingPlant.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearTestingPlant.java index 5ff2275..dcceb9a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearTestingPlant.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearTestingPlant.java @@ -18,7 +18,7 @@ import java.util.Date; */ @Data @TableName("CONFIGURATION.GARDS_NUCLEAR_TESTING_PLANT") -public class GardsNuclearTestingPlant implements Serializable { +public class GardsNuclearTestingPlant implements Serializable { private static final long serialVersionUID = 1L; @@ -26,41 +26,41 @@ public class GardsNuclearTestingPlant implements Serializable { * 主键ID */ @TableId(value = "ID", type = IdType.AUTO) - private Integer id; + private Integer id; /** * 名称 */ - @Excel(name = "名称", width = 20,height = 20,orderNum="0") + @Excel(name = "名称", width = 20, height = 20, orderNum = "0") @TableField(value = "NAME") private String name; /** * 纬度 */ - @Excel(name = "纬度", width = 20,height = 20,orderNum="1") + @Excel(name = "纬度", width = 20, height = 20, orderNum = "1") @TableField(value = "LATITUDE") private Double latitude; /** * 经度 */ - @Excel(name = "经度", width = 20,height = 20,orderNum="2") + @Excel(name = "经度", width = 20, height = 20, orderNum = "2") @TableField(value = "LONGITUDE") private Double longitude; /** * 类型 */ - @Excel(name = "国家", width = 20,height = 20,orderNum="3") + @Excel(name = "国家", width = 20, height = 20, orderNum = "3") @TableField(value = "COUNTRY") private String country; /** * 详细信息(大文本字段) */ - @Excel(name = "详细信息", width = 150,height = 20,orderNum="4") - @TableField(value = "INFO",typeHandler = ClobTypeHandler.class) + @Excel(name = "详细信息", width = 150, height = 20, orderNum = "4") + @TableField(value = "INFO", typeHandler = ClobTypeHandler.class) private String info; /** diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclideDecay.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclideDecay.java index 608fd18..6494408 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclideDecay.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclideDecay.java @@ -1,8 +1,10 @@ package org.jeecg.modules.base.entity.configuration; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; @@ -26,8 +28,10 @@ public class GardsNuclideDecay implements Serializable { @TableField("ENERGY") @Excel(name = "能量", width = 20, height = 20, orderNum = "1") - private Double energy; + private String energy; - @TableField(value = "MODDATE", fill = FieldFill.INSERT_UPDATE) + @TableField(value = "MODDATE") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date moddate; } \ No newline at end of file