fys/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

@Schema(title = "ID", hidden = true)

Browse Source
This commit is contained in:
daiyongfei
2025-08-23 17:33:35 +08:00
parent 7607a0c9c0
commit 1246ac5cf7
7 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java
View File

@ -22,10 +22,10 @@ public class Device extends TenantEntity {
* id * id
*/ */
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
@Schema(name = "ID") @Schema(title = "ID")
private Long id; private Long id;
@Schema(name = "设备记录ID") @Schema(title = "设备记录ID")
@TableField(exist = false) @TableField(exist = false)
private Long assignId; private Long assignId;
@ -33,76 +33,76 @@ public class Device extends TenantEntity {
* 设备分组 * 设备分组
* group_id * group_id
*/ */
@Schema(name = "设备分组") @Schema(title = "设备分组")
private Long groupId; private Long groupId;
/** /**
* device_type * device_type
*/ */
@Schema(name = "设备类型") @Schema(title = "设备类型")
private Long deviceType; private Long deviceType;
@Schema(name = "设备类型名称") @Schema(title = "设备类型名称")
private String typeName; private String typeName;
@Schema(name = "客户号") @Schema(title = "客户号")
private Long customerId; private Long customerId;
@Schema(name = "所属客户") @Schema(title = "所属客户")
private String customerName; private String customerName;
/** /**
* 当前所有者 * 当前所有者
* current_owner_id * current_owner_id
*/ */
@Schema(name = "当前所有者") @Schema(title = "当前所有者")
private Long currentOwnerId; private Long currentOwnerId;
/** /**
* 原始所有者（创建者） * 原始所有者（创建者）
* original_owner_id * original_owner_id
*/ */
@Schema(name = "原始所有者（创建者）") @Schema(title = "原始所有者（创建者）")
private Long originalOwnerId; private Long originalOwnerId;
/** /**
* 原始设备 * 原始设备
*/ */
@Schema(name = "原始设备") @Schema(title = "原始设备")
private Long originalDeviceId; private Long originalDeviceId;
@Schema(name = "设备编号") @Schema(title = "设备编号")
private String deviceNo; private String deviceNo;
@Schema(name = "设备名称") @Schema(title = "设备名称")
private String deviceName; private String deviceName;
@Schema(name = "设备图片") @Schema(title = "设备图片")
private String devicePic; private String devicePic;
@Schema(name = "设备MAC") @Schema(title = "设备MAC")
private String deviceMac; private String deviceMac;
@Schema(name = "蓝牙名称") @Schema(title = "蓝牙名称")
private String bluetoothName; private String bluetoothName;
/** /**
* 设备IMEI * 设备IMEI
* device_imei * device_imei
*/ */
@Schema(name = "设备IMEI") @Schema(title = "设备IMEI")
private String deviceImei; private String deviceImei;
@Schema(name = "设备SN") @Schema(title = "设备SN")
private String deviceSn; private String deviceSn;
@Schema(name = "经度") @Schema(title = "经度")
private String longitude; private String longitude;
@Schema(name = "纬度") @Schema(title = "纬度")
private String latitude; private String latitude;
@Schema(name = "备注") @Schema(title = "备注")
private String remark; private String remark;
/** /**
@ -110,7 +110,7 @@ public class Device extends TenantEntity {
* 0 失效 * 0 失效
* 1 正常 * 1 正常
*/ */
@Schema(name = "设备状态") @Schema(title = "设备状态")
private Integer deviceStatus; private Integer deviceStatus;
/** /**
@ -118,7 +118,7 @@ public class Device extends TenantEntity {
* 0 未绑定 * 0 未绑定
* 1 已绑定 * 1 已绑定
*/ */
@Schema(name = "绑定状态") @Schema(title = "绑定状态")
private Integer bindingStatus; private Integer bindingStatus;
/** /**
@ -151,7 +151,7 @@ public class Device extends TenantEntity {
* 出厂日期 * 出厂日期
* production_date * production_date
*/ */
@Schema(name = "出厂日期") @Schema(title = "出厂日期")
private Date productionDate; private Date productionDate;
} }

22
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java
View File

@ -18,42 +18,42 @@ import lombok.Data;
public class DeviceType extends TenantEntity { public class DeviceType extends TenantEntity {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
@Schema(name = "ID", hidden = true) @Schema(title = "ID", hidden = true)
private Long id; private Long id;
@Schema(name = "客户号") @Schema(title = "客户号")
private Long customerId; private Long customerId;
@Schema(name = "创建该类型的客户") @Schema(title = "创建该类型的客户")
private Long ownerCustomerId; private Long ownerCustomerId;
/** /**
* 原始所有者（创建者） * 原始所有者（创建者）
* original_owner_id * original_owner_id
*/ */
@Schema(name = "原始所有者（创建者）") @Schema(title = "原始所有者（创建者）")
private Long originalOwnerId; private Long originalOwnerId;
/** /**
* 原始设备 * 原始设备
*/ */
@Schema(name = "原始设备类型") @Schema(title = "原始设备类型")
private Long originalDeviceId; private Long originalDeviceId;
@NotBlank(message = "设备类型名称不能为空") @NotBlank(message = "设备类型名称不能为空")
@Schema(name = "类型名称", required = true) @Schema(title = "类型名称", required = true)
private String typeName; private String typeName;
@Schema(name = "是否支持蓝牙") @Schema(title = "是否支持蓝牙")
private Boolean isSupportBle; private Boolean isSupportBle;
@Schema(name = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗") @Schema(title = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗")
private String locateMode; private String locateMode;
@Schema(name = "联网方式", example = "0:无;1:4G;2:WIFI") @Schema(title = "联网方式", example = "0:无;1:4G;2:WIFI")
private String networkWay; private String networkWay;
@Schema(name = "通讯方式", example = "0:4G;1:蓝牙") @Schema(title = "通讯方式", example = "0:4G;1:蓝牙")
private String communicationMode; private String communicationMode;
/** /**
@ -68,7 +68,7 @@ public class DeviceType extends TenantEntity {
/** /**
* 型号字典用于APP页面跳转 * 型号字典用于APP页面跳转
*/ */
@Schema(name = "型号字典用于APP页面跳转") @Schema(title = "型号字典用于APP页面跳转")
private String modelDictionary; private String modelDictionary;

10
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java
View File

@ -30,21 +30,21 @@ public class DeviceGroupBo extends BaseEntity {
/** /**
* 分组名称 * 分组名称
*/ */
@Schema(name = "分组名称") @Schema(title = "分组名称")
@NotBlank(message = "分组名称不能为空", groups = { AddGroup.class, EditGroup.class }) @NotBlank(message = "分组名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String groupName; private String groupName;
/** /**
* 状态：0-禁用，1-正常 * 状态：0-禁用，1-正常
*/ */
@Schema(name = "状态：0-禁用，1-正常") @Schema(title = "状态：0-禁用，1-正常")
// @NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class })
private Long status; private Long status;
/** /**
* 父分组ID * 父分组ID
*/ */
@Schema(name = "父分组ID") @Schema(title = "父分组ID")
private Long parentId; private Long parentId;
/** /**
@ -59,10 +59,10 @@ public class DeviceGroupBo extends BaseEntity {
private Long isDeleted; private Long isDeleted;
@Schema(name = "页码", example = "1") @Schema(title = "页码", example = "1")
private Integer pageNum = 1; private Integer pageNum = 1;
@Schema(name = "每页数据量", example = "10") @Schema(title = "每页数据量", example = "10")
private Integer pageSize = 10; private Integer pageSize = 10;
} }

2
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java
View File

@ -40,7 +40,7 @@ public class DeviceForm {
@Schema(title = "设备MAC") @Schema(title = "设备MAC")
private String deviceMac; private String deviceMac;
@Schema(name = "蓝牙名称") @Schema(title = "蓝牙名称")
private String bluetoothName; private String bluetoothName;

14
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java
View File

@ -11,28 +11,28 @@ import lombok.Data;
@Data @Data
public class DeviceTypeForm { public class DeviceTypeForm {
@Schema(name = "ID", hidden = true) @Schema(title = "ID", hidden = true)
private Long id; private Long id;
@Schema(name = "类型名称", required = true) @Schema(title = "类型名称", required = true)
private String typeName; private String typeName;
@Schema(name = "是否支持蓝牙") @Schema(title = "是否支持蓝牙")
private Boolean isSupportBle; private Boolean isSupportBle;
@Schema(name = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗") @Schema(title = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗")
private String locateMode; private String locateMode;
@Schema(name = "联网方式", example = "0:无;1:4G;2:WIFI") @Schema(title = "联网方式", example = "0:无;1:4G;2:WIFI")
private String networkWay; private String networkWay;
@Schema(name = "通讯方式", example = "0:4G;1:蓝牙") @Schema(title = "通讯方式", example = "0:4G;1:蓝牙")
private String communicationMode; private String communicationMode;
/** /**
* 型号字典用于APP页面跳转 * 型号字典用于APP页面跳转
*/ */
@Schema(name = "型号字典用于APP页面跳转") @Schema(title = "型号字典用于APP页面跳转")
private String modelDictionary; private String modelDictionary;
} }

14
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java
View File

@ -15,25 +15,25 @@ import java.util.Set;
@Data @Data
public class DeviceTypeQueryCriteria extends BaseEntity implements Serializable { public class DeviceTypeQueryCriteria extends BaseEntity implements Serializable {
@Schema(name = "设备类型id") @Schema(title = "设备类型id")
private Long deviceTypeId; private Long deviceTypeId;
@Schema(name = "型号名称") @Schema(title = "型号名称")
private String typeName; private String typeName;
@Schema(name = "所属客户") @Schema(title = "所属客户")
private Set<Long> customerIds; private Set<Long> customerIds;
@Schema(name = "所属客户") @Schema(title = "所属客户")
private Long customerId; private Long customerId;
@Schema(name = "com.fuyuanshen") @Schema(title = "com.fuyuanshen")
private Long tenantId; private Long tenantId;
@Schema(name = "页码", example = "1") @Schema(title = "页码", example = "1")
private Integer pageNum = 1; private Integer pageNum = 1;
@Schema(name = "每页数据量", example = "10") @Schema(title = "每页数据量", example = "10")
private Integer pageSize = 10; private Integer pageSize = 10;

4
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/CustomerVo.java
View File

@ -16,11 +16,11 @@ import java.util.List;
@Validated @Validated
public class CustomerVo { public class CustomerVo {
@Schema(name = "客户ID") @Schema(title = "客户ID")
@NotNull(message = "客户ID不能为空") @NotNull(message = "客户ID不能为空")
private Long customerId; private Long customerId;
@Schema(name = "设备ID") @Schema(title = "设备ID")
@NotNull(message = "设备ID不能为空") @NotNull(message = "设备ID不能为空")
private List<Long> deviceIds; private List<Long> deviceIds;