diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactor.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactor.java index ed90967..d90d967 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactor.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsCorrectionFactor.java @@ -23,54 +23,54 @@ public class GardsCorrectionFactor 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 = "STATION_CODE") private String stationCode; /** * 探测器代码 */ - @Excel(name = "探测器代码", width = 20,height = 20,orderNum="1") + @Excel(name = "探测器代码", width = 20, height = 20, orderNum = "1") @TableField(value = "DETECTOR_CODE") private String detectorCode; /** * 峰效率 */ - @Excel(name = "峰效率", width = 20,height = 20,orderNum="2") + @Excel(name = "峰效率", width = 20, height = 20, orderNum = "2") @TableField(value = "PEAK_EFFICIENCY") private Double peakEfficiency; /** * 总效率 */ - @Excel(name = "总效率", width = 20,height = 20,orderNum="3") + @Excel(name = "总效率", width = 20, height = 20, orderNum = "3") @TableField(value = "TOTAL_EFFICIENCY") private Double totalEfficiency; /** * 校正因子 */ - @Excel(name = "校正因子", width = 20,height = 20,orderNum="4") + @Excel(name = "校正因子", width = 20, height = 20, orderNum = "4") @TableField(value = "CORRECTION_FACTOR") private Double correctionFactor; /** * 制造商 */ - @Excel(name = "制造商", width = 20,height = 20,orderNum="5") + @Excel(name = "制造商", width = 20, height = 20, orderNum = "5") @TableField(value = "MANUFACTURER") private String manufacturer; /** * 型号 */ - @Excel(name = "型号", width = 20,height = 20,orderNum="6") + @Excel(name = "型号", width = 20, height = 20, orderNum = "6") @TableField(value = "MODEL") private String model; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearFuelFacilities.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearFuelFacilities.java index 14b9a09..6de895d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearFuelFacilities.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearFuelFacilities.java @@ -31,76 +31,76 @@ public class GardsNuclearFuelFacilities 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; /** * 国家 */ - @Excel(name = "国家", width = 20,height = 20,orderNum="1") + @Excel(name = "国家", width = 20, height = 20, orderNum = "1") @TableField(value = "COUNTRY") private String country; /** * 纬度 */ - @Excel(name = "纬度", width = 20,height = 20,orderNum="2") + @Excel(name = "纬度", width = 20, height = 20, orderNum = "2") @TableField(value = "LATITUDE") private Double latitude; /** * 经度 */ - @Excel(name = "经度", width = 20,height = 20,orderNum="3") + @Excel(name = "经度", width = 20, height = 20, orderNum = "3") @TableField(value = "LONGITUDE") private Double longitude; /** * 设施类型 */ - @Excel(name = "设施类型", width = 20,height = 20,orderNum="4") + @Excel(name = "设施类型", width = 20, height = 20, orderNum = "4") @TableField(value = "FACILITY_TYPE") private String facilityType; /** * 燃料类型 */ - @Excel(name = "燃料类型", width = 20,height = 20,orderNum="5") + @Excel(name = "燃料类型", width = 20, height = 20, orderNum = "5") @TableField(value = "FUEL_TYPE") private String fuelType; /** * 设施状态 */ - @Excel(name = "设施状态", width = 20,height = 20,orderNum="6") + @Excel(name = "设施状态", width = 20, height = 20, orderNum = "6") @TableField(value = "FACILITY_STATUS") private String facilityStatus; /** * 规模 */ - @Excel(name = "规模", width = 20,height = 20,orderNum="7") + @Excel(name = "规模", width = 20, height = 20, orderNum = "7") @TableField(value = "SCALE") private String scale; /** * 设计容量 */ - @Excel(name = "设计容量", width = 20,height = 20,orderNum="8") + @Excel(name = "设计容量", width = 20, height = 20, orderNum = "8") @TableField(value = "DESIGN_CAPACITY") private String designCapacity; /** * 开始运营年份 */ - @Excel(name = "开始运营年份", width = 20,height = 20,orderNum="9") + @Excel(name = "开始运营年份", width = 20, height = 20, orderNum = "9") @TableField(value = "START_OF_OPERATION") private Integer startOfOperation; /** * 结束运营年份 */ - @Excel(name = "结束运营年份", width = 20,height = 20,orderNum="10") + @Excel(name = "结束运营年份", width = 20, height = 20, orderNum = "10") @TableField(value = "END_OF_OPERATION") private Integer endOfOperation; @@ -113,5 +113,4 @@ public class GardsNuclearFuelFacilities implements Serializable { private Date moddate; - } 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 61d2536..59ea0f6 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 @@ -154,7 +154,7 @@ public class GardsNuclearReactors implements Serializable { /** * 建设开始日期 */ - @Excel(name = "建设开始日期", width = 20, height = 20, orderNum = "17") + @Excel(name = "建设开始日期", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "17") @TableField(value = "CONSTRUCTION_START_DATE") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -163,7 +163,7 @@ public class GardsNuclearReactors implements Serializable { /** * 首次临界日期 */ - @Excel(name = "首次临界日期", width = 20, height = 20, orderNum = "18") + @Excel(name = "首次临界日期", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "18") @TableField(value = "FIRST_CRITICALITY_DATE") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -172,7 +172,7 @@ public class GardsNuclearReactors implements Serializable { /** * 首次电网连接日期 */ - @Excel(name = "首次电网连接日期", width = 20, height = 20, orderNum = "19") + @Excel(name = "首次电网连接日期", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "19") @TableField(value = "FIRST_GRID_CONNECTION_DATE") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -181,7 +181,7 @@ public class GardsNuclearReactors implements Serializable { /** * 商业运营日期 */ - @Excel(name = "商业运营日期", width = 20, height = 20, orderNum = "20") + @Excel(name = "商业运营日期", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "20") @TableField(value = "COMMERCIAL_OPERATION_DATE") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") 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 aed8ebc..b535d2d 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 @@ -51,15 +51,15 @@ public class GardsNuclearReleaseRecords implements Serializable { /** * 开始时间 */ - @Excel(name = "开始时间", width = 20, height = 20, orderNum = "3") + @Excel(name = "开始时间", format = "yyyy-MM-dd", 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") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date startTime; /** * 结束时间 */ - @Excel(name = "结束时间", width = 20, height = 20, orderNum = "4") + @Excel(name = "结束时间", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "4") @TableField(value = "END_TIME") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearfacility.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearfacility.java index 299ffd3..03dca3a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearfacility.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearfacility.java @@ -6,6 +6,7 @@ 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; @@ -14,61 +15,61 @@ import java.util.Date; public class GardsNuclearfacility implements Serializable { /** - * 核设施id + * 核设施id */ @TableField(value = "FACILITY_ID") private Integer facilityId; /** - * 核设施名称 + * 核设施名称 */ - @Excel(name = "核设施名称", width = 20,height = 20,orderNum="0") + @Excel(name = "核设施名称", width = 20, height = 20, orderNum = "0") @TableField(value = "FACILITY_NAME") private String facilityName; /** - * 核设施类型 + * 核设施类型 */ - @Excel(name = "核设施类型", width = 20,height = 20,orderNum="1") + @Excel(name = "核设施类型", width = 20, height = 20, orderNum = "1") @TableField(value = "TYPE") private String type; /** * 地点 */ - @Excel(name = "地点", width = 20,height = 20,orderNum="2") + @Excel(name = "地点", width = 20, height = 20, orderNum = "2") @TableField(value = "LOCATION") private String location; /** - * 经度 + * 经度 */ - @Excel(name = "经度", width = 20,height = 20,orderNum="3") + @Excel(name = "经度", width = 20, height = 20, orderNum = "3") @TableField(value = "LONGITUDE") private String longitude; @TableField(exist = false) private Double lonValue; /** - * 纬度 + * 纬度 */ - @Excel(name = "纬度", width = 20,height = 20,orderNum="4") + @Excel(name = "纬度", width = 20, height = 20, orderNum = "4") @TableField(value = "LATITUDE") private String latitude; @TableField(exist = false) private Double latValue; /** - * 状态 + * 状态 */ - @Excel(name = "状态", width = 20,height = 20,orderNum="5") + @Excel(name = "状态", width = 20, height = 20, orderNum = "5") @TableField(value = "STATUS") private String status; /** - * 修建时间 + * 修建时间 */ - @Excel(name = "修建时间",format = "yyyy-MM-dd", width = 20,height = 20,orderNum="6") + @Excel(name = "修建时间", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "6") @TableField(value = "BUILDDATE") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -77,7 +78,7 @@ public class GardsNuclearfacility implements Serializable { /** * 临界时间 */ - @Excel(name = "临界时间",format = "yyyy-MM-dd", width = 20,height = 20,orderNum="7") + @Excel(name = "临界时间", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "7") @TableField(value = "CRITICALITYDATE") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -86,7 +87,7 @@ public class GardsNuclearfacility implements Serializable { /** * 退休时间 */ - @Excel(name = "退休时间", format = "yyyy-MM-dd",width = 20,height = 20,orderNum="8") + @Excel(name = "退休时间", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "8") @TableField(value = "RETIREDATE") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -95,7 +96,7 @@ public class GardsNuclearfacility implements Serializable { /** * 网格工程日期 */ - @Excel(name = "并网时间",format = "yyyy-MM-dd", width = 20,height = 20,orderNum="9") + @Excel(name = "并网时间", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "9") @TableField(value = "GRIDCONEETIONDATE") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -104,56 +105,56 @@ public class GardsNuclearfacility implements Serializable { /** * 销售公司 */ - @Excel(name = "所属公司", width = 20,height = 20,orderNum="10") + @Excel(name = "所属公司", width = 20, height = 20, orderNum = "10") @TableField(value = "VENDOR") private String vendor; /** - * 拥有者 + * 拥有者 */ - @Excel(name = "拥有者", width = 20,height = 20,orderNum="11") + @Excel(name = "拥有者", width = 20, height = 20, orderNum = "11") @TableField(value = "OWNER") private String owner; /** * 操作人员 */ - @Excel(name = "操作人员", width = 20,height = 20,orderNum="12") + @Excel(name = "操作人员", width = 20, height = 20, orderNum = "12") @TableField(value = "OPERARTOR") private String operartor; /** * 容量 */ - @Excel(name = "容量", width = 20,height = 20,orderNum="13") + @Excel(name = "容量", width = 20, height = 20, orderNum = "13") @TableField(value = "CAPACITYGROSS") private Integer capacitygross; /** * 容量集 */ - @Excel(name = "容量集", width = 20,height = 20,orderNum="14") + @Excel(name = "容量集", width = 20, height = 20, orderNum = "14") @TableField(value = "CAPACITYNET") private Integer capacitynet; /** * 热容量 */ - @Excel(name = "热容量", width = 20,height = 20,orderNum="15") + @Excel(name = "热容量", width = 20, height = 20, orderNum = "15") @TableField(value = "CAPACITYTHERMAL") private Integer capacitythermal; /** * 活动时间 */ - @Excel(name = "活动时间", width = 20,height = 20,orderNum="16") + @Excel(name = "活动时间", width = 20, height = 20, orderNum = "16") @TableField(value = "ACTIVITY_DAY") private Integer activityDay; /** - * 活动年份 + * 活动年份 */ - @Excel(name = "活动年份", width = 20,height = 20,orderNum="17") + @Excel(name = "活动年份", width = 20, height = 20, orderNum = "17") @TableField(value = "ACTIVITY_YEAR") private Integer activityYear; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsResearchReactors.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsResearchReactors.java index fa76480..d3279e2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsResearchReactors.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsResearchReactors.java @@ -31,63 +31,63 @@ public class GardsResearchReactors 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; /** * 纬度 */ - @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 = 20,height = 20,orderNum="4") + @Excel(name = "城市", width = 20, height = 20, orderNum = "4") @TableField(value = "CITY") private String city; /** * 反应堆类型 */ - @Excel(name = "反应堆类型", width = 20,height = 20,orderNum="5") + @Excel(name = "反应堆类型", width = 20, height = 20, orderNum = "5") @TableField(value = "REACTOR_TYPE") private String reactorType; /** * 热功率 */ - @Excel(name = "热功率", width = 20,height = 20,orderNum="6") + @Excel(name = "热功率", width = 20, height = 20, orderNum = "6") @TableField(value = "THERMAL_POWER") private Double thermalPower; /** * 状态 */ - @Excel(name = "状态", width = 20,height = 20,orderNum="7") + @Excel(name = "状态", width = 20, height = 20, orderNum = "7") @TableField(value = "STATUS") private String status; /** * 首次临界日期 */ - @Excel(name = "首次临界日期", format = "yyyy-MM-dd", width = 20,height = 20,orderNum="8") + @Excel(name = "首次临界日期", format = "yyyy-MM-dd", width = 20, height = 20, orderNum = "8") @TableField(value = "FIRST_CRITICALITY_DATE") @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @@ -96,21 +96,21 @@ public class GardsResearchReactors implements Serializable { /** * 区域 */ - @Excel(name = "区域", width = 20,height = 20,orderNum="9") + @Excel(name = "区域", width = 20, height = 20, orderNum = "9") @TableField(value = "REGION") private String region; /** * 是否同位素生产（0-否，1-是） */ - @Excel(name = "是否同位素生产（0-否，1-是）",dicCode = "IS_ISOTOPE_PRODUCTION", width = 20,height = 20,orderNum="10") + @Excel(name = "是否同位素生产（0-否，1-是）", dicCode = "IS_ISOTOPE_PRODUCTION", width = 20, height = 20, orderNum = "10") @TableField(value = "IS_ISOTOPE_PRODUCTION") private Integer isIsotopeProduction; /** * 备注信息 */ - @Excel(name = "备注信息", width = 20,height = 20,orderNum="11") + @Excel(name = "备注信息", width = 20, height = 20, orderNum = "11") @TableField(value = "REMARKS") private String remarks; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java index 5015d17..0b58115 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsStations.java @@ -23,7 +23,7 @@ public class GardsStations implements Serializable { * 台站id */ @Excel(name = "台站ID", width = 20, height = 20, orderNum = "0") - @TableId(value = "STATION_ID",type = IdType.INPUT) + @TableId(value = "STATION_ID", type = IdType.INPUT) private Integer stationId; /**