diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/BaseEntity.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/BaseEntity.java new file mode 100644 index 0000000..8d9e06d --- /dev/null +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/BaseEntity.java @@ -0,0 +1,55 @@ +package com.evotech.hd.common.core.entity; + + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; +import jakarta.validation.constraints.Min; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * 基础实体类 + * @author lhb + * @date 2023年4月13日 下午4:02:08 + */ +@Data +@Schema(name = "BaseEntity", description = "基础实体类") +public class BaseEntity implements Serializable { + + + private static final long serialVersionUID = 1L; + + @TableId(value = "pk_id", type = IdType.AUTO) + @Hidden + private Integer pkId; + + @Schema(description = "创建人", hidden = true) + @TableField(fill = FieldFill.INSERT) + private String creater; + + @Schema(description = "创建时间", hidden = true) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private Date ctime; + + @Schema(description = "更新人", hidden = true) + @TableField(fill = FieldFill.UPDATE) + private String updater; + + @Schema(description = "更新时间", hidden = true) + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private Date uptime; + +} diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java index edcfbc7..9294270 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStation.java @@ -4,6 +4,7 @@ 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.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -25,14 +26,10 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_battery_station") @Schema(name = "BatteryStation", description = "换电站") -public class BatteryStation implements Serializable { +public class BatteryStation extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Hidden - private Integer pkId; - @Schema(description = "归属运营商ID", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "无关联运营商信息") private String proxyId; @@ -50,7 +47,7 @@ public class BatteryStation implements Serializable { @Schema(description = "站点类型ID") private Integer type; - + @Schema(description = "换电计费方式：1-按充电量，2-按SOC，3-按行驶公里数") private Integer feeType; @@ -74,10 +71,10 @@ public class BatteryStation implements Serializable { @Schema(description = "联系电话") private String phone; - + @Schema(description = "服务车辆类型") private String carTypeCode; - + @Schema(description = "是否适合该车辆") @TableField(exist = false) private Boolean isSuitable; @@ -124,20 +121,20 @@ public class BatteryStation implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date uptime; - - + + @Schema(description = "电池列表", hidden = true) @TableField(exist = false) private List dcList; - + @Schema(description = "电池仓列表", hidden = true) @TableField(exist = false) private List dccList; - + @Schema(description = "电机列表", hidden = true) @TableField(exist = false) private List djList; - + @Schema(description = "机器人列表", hidden = true) @TableField(exist = false) private List robotList; @@ -145,5 +142,11 @@ public class BatteryStation implements Serializable { @Schema(description = "换电费用标准", hidden = true) @TableField(exist = false) private List feeStandardList; - + + @Schema(description = "营业起时间") + private String runStartTime; + + @Schema(description = "营业止时间") + private String runEndTime; + } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategy.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategy.java index a4c4976..30ffdab 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategy.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategy.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -25,13 +26,9 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_battery_station_cd_strategy") @Schema(name = "电站-充电策略") -public class BatteryStationCdStrategy implements Serializable { +public class BatteryStationCdStrategy extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; @Schema(description = "策略名称", requiredMode = RequiredMode.REQUIRED) @NotBlank diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategyDetail.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategyDetail.java index e1371d1..cbd40a0 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategyDetail.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationCdStrategyDetail.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -23,14 +24,10 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_battery_station_cd_strategy_detail") @Schema(name = "电站-充电策略详情") -public class BatteryStationCdStrategyDetail implements Serializable { +public class BatteryStationCdStrategyDetail extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "换电站编码", requiredMode = RequiredMode.REQUIRED) @NotBlank private String stationCode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDc.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDc.java index 862638d..eb27f30 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDc.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDc.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -25,14 +26,10 @@ import lombok.Setter; @Setter @TableName("hd_cloud_manage.yt_t_battery_station_dc") @Schema(name = "电站-电池") -public class BatteryStationDc implements Serializable { +public class BatteryStationDc extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "电池型号编码", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "型号编码不能为空") private String typeCode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java index 31994b8..b23c8e3 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDcc.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -25,14 +26,10 @@ import lombok.Setter; @Setter @TableName("hd_cloud_manage.yt_t_battery_station_dcc") @Schema(name = "电站-电池仓") -public class BatteryStationDcc implements Serializable { +public class BatteryStationDcc extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "换电站编码", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "换电站编码不能为空") private String stationCode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDj.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDj.java index 7230e81..2f60343 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDj.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationDj.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -25,14 +26,10 @@ import lombok.Setter; @Setter @TableName("hd_cloud_manage.yt_t_battery_station_dj") @Schema(name = "电站-电机") -public class BatteryStationDj implements Serializable { +public class BatteryStationDj extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "换电站编码", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "换电站编码不能为空") private String stationCode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandard.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandard.java index 770abb9..466abcd 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandard.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandard.java @@ -4,6 +4,7 @@ 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.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import cn.hutool.core.date.DatePattern; @@ -29,13 +30,9 @@ import lombok.Setter; @Setter @TableName("hd_cloud_manage.yt_t_battery_station_hd_fee_standard") @Schema(name = "电站-换电费用标准") -public class BatteryStationHdFeeStandard implements Serializable { +public class BatteryStationHdFeeStandard extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; @Schema(description = "费用标准名称") private String name; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandardDetail.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandardDetail.java index ef89571..240ea33 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandardDetail.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationHdFeeStandardDetail.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import cn.hutool.core.date.DatePattern; @@ -29,13 +30,9 @@ import lombok.Setter; @Setter @TableName("hd_cloud_manage.yt_t_battery_station_hd_fee_standard_detail") @Schema(name = "电站-换电费用标准细节") -public class BatteryStationHdFeeStandardDetail implements Serializable { +public class BatteryStationHdFeeStandardDetail extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; @Schema(description = "换电站编码", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "换电站编码不能为空") diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationRobot.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationRobot.java index b2f4fc6..4907fa9 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationRobot.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryStationRobot.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -25,14 +26,10 @@ import lombok.Setter; @Setter @TableName("hd_cloud_manage.yt_t_battery_station_robot") @Schema(name = "电站-机器人") -public class BatteryStationRobot implements Serializable { +public class BatteryStationRobot extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "换电站编码", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "换电站编码不能为空") private String stationCode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryTrace.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryTrace.java index 5b16888..c9d7f63 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryTrace.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/BatteryTrace.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -23,14 +24,10 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_battery_trace") @Schema(name = "电池追溯表") -public class BatteryTrace implements Serializable { +public class BatteryTrace extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "电池编码", requiredMode = RequiredMode.REQUIRED) @NotBlank private String batCode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java index 81ece0f..21642cb 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/Company.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -25,14 +26,10 @@ import lombok.Setter; @Setter @TableName("hd_cloud_manage.yt_t_company") @Schema(name = "公司客户信息表") -public class Company implements Serializable { +public class Company extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(description = "ID", hidden = true) - private Integer pkId; - @Schema(description = "区划名称", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "区划名称不能为空") private String division; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataOrderSwapCollate.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataOrderSwapCollate.java index 07f221b..fcc59f6 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataOrderSwapCollate.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataOrderSwapCollate.java @@ -2,6 +2,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -19,13 +20,10 @@ import lombok.Data; @Data @TableName("yt_t_home_data_order_swap_collate") @Schema(name = "首页数据-换电订单中间表") -public class HomeDataOrderSwapCollate implements Serializable { +public class HomeDataOrderSwapCollate extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId("pk_id") - private Integer pkId; - @Schema(description = "站编码") private String stationCode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataTradeCollate.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataTradeCollate.java index 65c529f..6e42dc5 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataTradeCollate.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/HomeDataTradeCollate.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -20,13 +21,10 @@ import lombok.Data; @Data @TableName("yt_t_home_data_trade_collate") @Schema(name = "首页数据-交易中间表") -public class HomeDataTradeCollate implements Serializable { +public class HomeDataTradeCollate extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "日期") private String day; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderRecharge.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderRecharge.java index 1cfa78e..2b836b6 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderRecharge.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderRecharge.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -22,14 +23,10 @@ import lombok.Setter; @Setter @TableName("hd_cloud_manage.yt_t_order_recharge") @Schema(name = "充值订单") -public class OrderRecharge implements Serializable { +public class OrderRecharge extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "订单时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBattery.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBattery.java index c66f831..da2df3e 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBattery.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBattery.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -25,13 +26,9 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_order_swap_battery") @Schema(name = "换电订单信息表") -public class OrderSwapBattery implements Serializable { +public class OrderSwapBattery extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; @Schema(description = "预约订单ID") private Integer orderPreId; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryPre.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryPre.java index b21c7e9..f2087e3 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryPre.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryPre.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -23,13 +24,9 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_order_swap_battery_pre") @Schema(name = "换电预约订单") -public class OrderSwapBatteryPre implements Serializable { +public class OrderSwapBatteryPre extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(description = "ID", hidden = true) - private Integer pkId; @Schema(description = "来源：1-小程序，2-云端，3-站端", requiredMode = RequiredMode.REQUIRED) @NotNull diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryStep.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryStep.java index b719216..e67ee5e 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryStep.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/OrderSwapBatteryStep.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -20,13 +21,9 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_order_swap_battery_step") @Schema(name = "换电步骤记录") -public class OrderSwapBatteryStep implements Serializable { +public class OrderSwapBatteryStep extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(description = "ID", hidden = true) - private Integer pkId; @Schema(description = "订单编码") private String orderNo; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/PreOrderRelationSwapOrder.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/PreOrderRelationSwapOrder.java index a047d32..79fa3d0 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/PreOrderRelationSwapOrder.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/PreOrderRelationSwapOrder.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -22,13 +23,10 @@ import lombok.Setter; @Setter @TableName("hd_cloud_manage.yt_t_pre_order_relation_swap_order") @Schema(name = "扫码支付时关联的换电订单号") -public class PreOrderRelationSwapOrder implements Serializable { +public class PreOrderRelationSwapOrder extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "微信支付方式") private String payApiType = "NATIVE"; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/TradeDetail.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/TradeDetail.java index f0c5e5e..fb75f0c 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/TradeDetail.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/TradeDetail.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -20,14 +21,10 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_trade_detail") @Schema(name = "交易信息表") -public class TradeDetail implements Serializable { +public class TradeDetail extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "换电站编码") private String stationCode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java index d550271..89a99af 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleInfo.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -24,14 +25,10 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_vehicle_info") @Schema(name = "车辆信息表") -public class VehicleInfo implements Serializable { +public class VehicleInfo extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "型号编码", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "型号编码不能为空") private String typeCode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleWechatUserRelation.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleWechatUserRelation.java index 1098c63..b8a55cf 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleWechatUserRelation.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/VehicleWechatUserRelation.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -23,14 +24,10 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_vehicle_wechat_user_relation") @Schema(name = "车辆和用户关系") -public class VehicleWechatUserRelation implements Serializable { +public class VehicleWechatUserRelation extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "用户编码", requiredMode = RequiredMode.REQUIRED) private String ucode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccount.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccount.java index 1fa73c3..eb92e4e 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccount.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccount.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -23,14 +24,10 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_wallet_account") @Schema(name = "资金钱包账户表") -public class WalletAccount implements Serializable { +public class WalletAccount extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "户主类型：1-个人，2-企业", requiredMode = RequiredMode.REQUIRED) @NotNull(message = "类型不能为空") private Integer ownerType; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccountDetail.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccountDetail.java index 742693e..269737c 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccountDetail.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccountDetail.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.cloud; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -23,14 +24,10 @@ import lombok.Data; @Data @TableName("hd_cloud_manage.yt_t_wallet_account_detail") @Schema(name = "资金账户明细") -public class WalletAccountDetail implements Serializable { +public class WalletAccountDetail extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; - @Schema(description = "编码", requiredMode = RequiredMode.REQUIRED) @NotBlank private String code; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/vo/BatteryStationVO.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/vo/BatteryStationVO.java index 2c90184..86d9221 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/vo/BatteryStationVO.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/vo/BatteryStationVO.java @@ -59,4 +59,10 @@ public class BatteryStationVO implements Serializable { @Schema(description = "全天营业：1-是，0-否") private Integer openAllDay; + @Schema(description = "营业起时间") + private String runStartTime; + + @Schema(description = "营业止时间") + private String runEndTime; + } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/BatteryType.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/BatteryType.java index 7834347..2bec44d 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/BatteryType.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/BatteryType.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -24,14 +25,10 @@ import lombok.Setter; @Setter @TableName("hd_resource.yt_d_battery_type") @Schema(name = "电池型号表") -public class BatteryType implements Serializable { +public class BatteryType extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(description = "ID", hidden = true) - private Integer pkId; - @Schema(description = "型号名称", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "型号名称不能为空") private String typeName; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/CarType.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/CarType.java index 7a2ed83..94930d8 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/CarType.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/CarType.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -24,14 +25,10 @@ import lombok.Setter; @Setter @TableName("hd_resource.yt_d_car_type") @Schema(name = "车辆类型") -public class CarType implements Serializable { +public class CarType extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(description = "ID", hidden = true) - private Integer pkId; - @Schema(description = "类型名称", requiredMode = RequiredMode.REQUIRED) @NotBlank(message = "类型名称不能为空") private String typeName; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogLogin.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogLogin.java index a1cf9d0..ceeb37b 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogLogin.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogLogin.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -21,13 +22,10 @@ import org.springframework.format.annotation.DateTimeFormat; @EqualsAndHashCode(callSuper = false) @TableName("yt_log_login") @Schema(name = "登录日志", description = "登录日志") -public class LogLogin implements Serializable { +public class LogLogin extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "登录人ID") private String uid; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogUpload.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogUpload.java index 614ac2f..4fbccb6 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogUpload.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/LogUpload.java @@ -1,7 +1,10 @@ package com.evotech.hd.common.core.entity.resource; +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 com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -55,8 +58,10 @@ public class LogUpload implements Serializable { @Schema(description = "创建时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @TableField(fill = FieldFill.INSERT) private Date ctime; @Schema(description = "创建者") + @TableField(fill = FieldFill.INSERT) private String creater; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/ProxyOperater.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/ProxyOperater.java index 297af63..6830db9 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/ProxyOperater.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/ProxyOperater.java @@ -1,13 +1,13 @@ package com.evotech.hd.common.core.entity.resource; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import java.util.Date; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.format.annotation.DateTimeFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -28,8 +28,8 @@ public class ProxyOperater implements Serializable { private static final long serialVersionUID = 1L; - @Schema(description = "ID", hidden = true) @TableId(value = "pk_id", type = IdType.AUTO) + @Hidden private Integer pkId; @Schema(description = "区划名称", requiredMode = RequiredMode.REQUIRED) @@ -79,18 +79,22 @@ public class ProxyOperater implements Serializable { private Integer stationCount; @Schema(description = "创建人") + @TableField(fill = FieldFill.INSERT) private String creater; @Schema(description = "创建时间", hidden = true) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @TableField(fill = FieldFill.INSERT) private Date ctime; @Schema(description = "更新人", hidden = true) + @TableField(fill = FieldFill.UPDATE) private String updater; @Schema(description = "更新时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @TableField(fill = FieldFill.UPDATE) private Date uptime; } diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/UploadFile.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/UploadFile.java index 0ce55f3..fd618b7 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/UploadFile.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/UploadFile.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -22,13 +23,10 @@ import lombok.Setter; @Setter @TableName("hd_resource.hd_resource.yt_t_upload_file") @Schema(name = "上传文件表") -public class UploadFile implements Serializable { +public class UploadFile extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "公司编码") private String ccode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatAgreement.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatAgreement.java index 0cb6e61..de45921 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatAgreement.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatAgreement.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -23,13 +24,9 @@ import lombok.Data; @TableName("hd_resource.yt_setting_wechat_agreement") @Schema(name = "微信协议") @Data -public class WechatAgreement implements Serializable { +public class WechatAgreement extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; private String appid; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatSwiper.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatSwiper.java index 98840e8..0d79bda 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatSwiper.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/WechatSwiper.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -20,13 +21,9 @@ import lombok.Data; @Data @TableName("hd_resource.yt_setting_wechat_swiper") @Schema(name = "微信轮播图设置") -public class WechatSwiper implements Serializable { +public class WechatSwiper extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - - @TableId(value = "pk_id", type = IdType.AUTO) - @Schema(hidden = true) - private Integer pkId; private String appid; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthMenu.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthMenu.java index 2ab143d..0cec675 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthMenu.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthMenu.java @@ -4,6 +4,7 @@ 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.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -24,14 +25,10 @@ import lombok.Setter; @Setter @TableName("yt_auth_menu") @Schema(name = "菜单") -public class AuthMenu implements Serializable { +public class AuthMenu extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @Schema(description = "主键", hidden = true) - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "菜单名称") private String name; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthPermission.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthPermission.java index 5eb2c52..e1956bd 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthPermission.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthPermission.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource.auth; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -22,14 +23,10 @@ import lombok.Setter; @Setter @TableName("yt_auth_permission") @Schema(name = "资源权限") -public class AuthPermission implements Serializable { +public class AuthPermission extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @Schema(description = "ID", hidden = true) - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "资源编码：页面:操作") private String code; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRole.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRole.java index e565178..61ac4a2 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRole.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRole.java @@ -1,6 +1,7 @@ package com.evotech.hd.common.core.entity.resource.auth; import com.baomidou.mybatisplus.annotation.*; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; @@ -18,14 +19,10 @@ import java.util.Date; @Setter @TableName("yt_auth_role") @Schema(name = "角色") -public class AuthRole implements Serializable { +public class AuthRole extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @Schema(description = "id", hidden = true) - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "角色名称") private String name; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRoleResource.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRoleResource.java index 2e3a67f..5f14f94 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRoleResource.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthRoleResource.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource.auth; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -22,14 +23,10 @@ import lombok.Setter; @Setter @TableName("yt_auth_role_resource") @Schema(name = "角色的权限") -public class AuthRoleResource implements Serializable { +public class AuthRoleResource extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @Schema(description = "主键") - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "角色编码") private String rcode; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUser.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUser.java index be0c824..dbd0e34 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUser.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUser.java @@ -1,6 +1,7 @@ package com.evotech.hd.common.core.entity.resource.auth; import com.baomidou.mybatisplus.annotation.*; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; @@ -19,13 +20,13 @@ import java.util.Date; @Data @TableName("yt_auth_user") @Schema(name = "账号") -public class AuthUser implements Serializable { +public class AuthUser extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @Schema(description = "主键", hidden = true) - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; +// @Schema(description = "主键", hidden = true) +// @TableId(value = "pk_id", type = IdType.AUTO) +// private Integer pkId; @Schema(description = "用户ID") private String uid; @@ -90,7 +91,7 @@ public class AuthUser implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date lastLoginTime; - @Schema(description = "创建人", hidden = true) + /*@Schema(description = "创建人", hidden = true) @TableField(fill = FieldFill.INSERT) private String creater; @@ -108,7 +109,7 @@ public class AuthUser implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") @TableField(fill = FieldFill.UPDATE) - private Date uptime; + private Date uptime;*/ @Schema(description = "角色编码", hidden = true) @TableField(exist = false) diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserRole.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserRole.java index 58ca0bc..1d47568 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserRole.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/auth/AuthUserRole.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource.auth; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -27,9 +28,6 @@ public class AuthUserRole implements Serializable { private static final long serialVersionUID = 1L; - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "用户ID") @NotBlank private String uid; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/AdmdvsInfo.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/AdmdvsInfo.java index 9c30865..0278ca9 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/AdmdvsInfo.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/AdmdvsInfo.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource.dict; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -23,13 +24,10 @@ import lombok.Setter; @Setter @TableName("yt_d_admdvs_info") @Schema(name = "行政区划信息表") -public class AdmdvsInfo implements Serializable { +public class AdmdvsInfo extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @TableId("pk_id") - private Integer pkId; - @Schema(description = "区划代码") private String admdvsNo; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/Dict.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/Dict.java index 6f2d22b..d08aadc 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/Dict.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/Dict.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource.dict; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -22,14 +23,10 @@ import lombok.Setter; @Setter @TableName("hd_resource.yt_d_dict") @Schema(name = "字典") -public class Dict implements Serializable { +public class Dict extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @Schema(description = "主键", hidden = true) - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "字典名称") private String dictName; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/DictType.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/DictType.java index b540a84..88aeae0 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/DictType.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/resource/dict/DictType.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.resource.dict; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -22,14 +23,10 @@ import lombok.Setter; @Setter @TableName("hd_resource.yt_d_dict_type") @Schema(name = "字典类型") -public class DictType implements Serializable { +public class DictType extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @Schema(description = "主键", hidden = true) - @TableId(value = "pk_id", type = IdType.AUTO) - private Integer pkId; - @Schema(description = "类型名称") private String typeName; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatPayPreOrder.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatPayPreOrder.java index 6b4b5b7..bc0ad4e 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatPayPreOrder.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatPayPreOrder.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.wechat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -20,7 +21,7 @@ import lombok.Data; @Data @TableName("yt_t_wechat_pay_pre_order") @Schema(name = "WechatPayPreOrder", description = "微信预支付订单") -public class WechatPayPreOrder implements Serializable { +public class WechatPayPreOrder extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java index b120b58..2789b42 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/wechat/WechatUser.java @@ -3,6 +3,7 @@ package com.evotech.hd.common.core.entity.wechat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.evotech.hd.common.core.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; @@ -22,7 +23,7 @@ import lombok.Setter; @Setter @TableName("hd_wechat.yt_t_wechat_user") @Schema(name = "小程序用户信息") -public class WechatUser implements Serializable { +public class WechatUser extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListBatteryStationRequest.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListBatteryStationRequest.java index d54f734..f3535ed 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListBatteryStationRequest.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/PageListBatteryStationRequest.java @@ -29,4 +29,10 @@ public class PageListBatteryStationRequest extends BasePageRequest { @Schema(description = "站点类型ID") private Integer type; + @Schema(description = "营业起时间") + private String runStartTime; + + @Schema(description = "营业止时间") + private String runEndTime; + }