fix:提取公共实体类

This commit is contained in:
lhb 2025-04-18 08:54:24 +08:00
parent eb7d7c6bff
commit 93b79dd9a4
45 changed files with 179 additions and 198 deletions

View File

@ -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;
}

View File

@ -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-按SOC3-按行驶公里数")
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<BatteryStationDc> dcList;
@Schema(description = "电池仓列表", hidden = true)
@TableField(exist = false)
private List<BatteryStationDcc> dccList;
@Schema(description = "电机列表", hidden = true)
@TableField(exist = false)
private List<BatteryStationDj> djList;
@Schema(description = "机器人列表", hidden = true)
@TableField(exist = false)
private List<BatteryStationRobot> robotList;
@ -145,5 +142,11 @@ public class BatteryStation implements Serializable {
@Schema(description = "换电费用标准", hidden = true)
@TableField(exist = false)
private List<BatteryStationHdFeeStandard> feeStandardList;
@Schema(description = "营业起时间")
private String runStartTime;
@Schema(description = "营业止时间")
private String runEndTime;
}

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 = "换电站编码不能为空")

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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")

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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";

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;
}

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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)

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;
}