diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java index 902874c1..d166aacb 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java @@ -22,10 +22,10 @@ public class Device extends TenantEntity { * id */ @TableId(value = "id", type = IdType.AUTO) - @Schema(name = "ID") + @Schema(title = "ID") private Long id; - @Schema(name = "设备记录ID") + @Schema(title = "设备记录ID") @TableField(exist = false) private Long assignId; @@ -33,76 +33,76 @@ public class Device extends TenantEntity { * 设备分组 * group_id */ - @Schema(name = "设备分组") + @Schema(title = "设备分组") private Long groupId; /** * device_type */ - @Schema(name = "设备类型") + @Schema(title = "设备类型") private Long deviceType; - @Schema(name = "设备类型名称") + @Schema(title = "设备类型名称") private String typeName; - @Schema(name = "客户号") + @Schema(title = "客户号") private Long customerId; - @Schema(name = "所属客户") + @Schema(title = "所属客户") private String customerName; /** * 当前所有者 * current_owner_id */ - @Schema(name = "当前所有者") + @Schema(title = "当前所有者") private Long currentOwnerId; /** * 原始所有者(创建者) * original_owner_id */ - @Schema(name = "原始所有者(创建者)") + @Schema(title = "原始所有者(创建者)") private Long originalOwnerId; /** * 原始设备 */ - @Schema(name = "原始设备") + @Schema(title = "原始设备") private Long originalDeviceId; - @Schema(name = "设备编号") + @Schema(title = "设备编号") private String deviceNo; - @Schema(name = "设备名称") + @Schema(title = "设备名称") private String deviceName; - @Schema(name = "设备图片") + @Schema(title = "设备图片") private String devicePic; - @Schema(name = "设备MAC") + @Schema(title = "设备MAC") private String deviceMac; - @Schema(name = "蓝牙名称") + @Schema(title = "蓝牙名称") private String bluetoothName; /** * 设备IMEI * device_imei */ - @Schema(name = "设备IMEI") + @Schema(title = "设备IMEI") private String deviceImei; - @Schema(name = "设备SN") + @Schema(title = "设备SN") private String deviceSn; - @Schema(name = "经度") + @Schema(title = "经度") private String longitude; - @Schema(name = "纬度") + @Schema(title = "纬度") private String latitude; - @Schema(name = "备注") + @Schema(title = "备注") private String remark; /** @@ -110,7 +110,7 @@ public class Device extends TenantEntity { * 0 失效 * 1 正常 */ - @Schema(name = "设备状态") + @Schema(title = "设备状态") private Integer deviceStatus; /** @@ -118,7 +118,7 @@ public class Device extends TenantEntity { * 0 未绑定 * 1 已绑定 */ - @Schema(name = "绑定状态") + @Schema(title = "绑定状态") private Integer bindingStatus; /** @@ -151,7 +151,7 @@ public class Device extends TenantEntity { * 出厂日期 * production_date */ - @Schema(name = "出厂日期") + @Schema(title = "出厂日期") private Date productionDate; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java index 32bd32e3..fe1db44a 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java @@ -18,42 +18,42 @@ import lombok.Data; public class DeviceType extends TenantEntity { @TableId(value = "id", type = IdType.AUTO) - @Schema(name = "ID", hidden = true) + @Schema(title = "ID", hidden = true) private Long id; - @Schema(name = "客户号") + @Schema(title = "客户号") private Long customerId; - @Schema(name = "创建该类型的客户") + @Schema(title = "创建该类型的客户") private Long ownerCustomerId; /** * 原始所有者(创建者) * original_owner_id */ - @Schema(name = "原始所有者(创建者)") + @Schema(title = "原始所有者(创建者)") private Long originalOwnerId; /** * 原始设备 */ - @Schema(name = "原始设备类型") + @Schema(title = "原始设备类型") private Long originalDeviceId; @NotBlank(message = "设备类型名称不能为空") - @Schema(name = "类型名称", required = true) + @Schema(title = "类型名称", required = true) private String typeName; - @Schema(name = "是否支持蓝牙") + @Schema(title = "是否支持蓝牙") 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; - @Schema(name = "联网方式", example = "0:无;1:4G;2:WIFI") + @Schema(title = "联网方式", example = "0:无;1:4G;2:WIFI") private String networkWay; - @Schema(name = "通讯方式", example = "0:4G;1:蓝牙") + @Schema(title = "通讯方式", example = "0:4G;1:蓝牙") private String communicationMode; /** @@ -68,7 +68,7 @@ public class DeviceType extends TenantEntity { /** * 型号字典用于APP页面跳转 */ - @Schema(name = "型号字典用于APP页面跳转") + @Schema(title = "型号字典用于APP页面跳转") private String modelDictionary; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java index 064c5aa2..e0ac783e 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceGroupBo.java @@ -30,21 +30,21 @@ public class DeviceGroupBo extends BaseEntity { /** * 分组名称 */ - @Schema(name = "分组名称") + @Schema(title = "分组名称") @NotBlank(message = "分组名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String groupName; /** * 状态:0-禁用,1-正常 */ - @Schema(name = "状态:0-禁用,1-正常") + @Schema(title = "状态:0-禁用,1-正常") // @NotNull(message = "状态:0-禁用,1-正常不能为空", groups = { AddGroup.class, EditGroup.class }) private Long status; /** * 父分组ID */ - @Schema(name = "父分组ID") + @Schema(title = "父分组ID") private Long parentId; /** @@ -59,10 +59,10 @@ public class DeviceGroupBo extends BaseEntity { private Long isDeleted; - @Schema(name = "页码", example = "1") + @Schema(title = "页码", example = "1") private Integer pageNum = 1; - @Schema(name = "每页数据量", example = "10") + @Schema(title = "每页数据量", example = "10") private Integer pageSize = 10; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java index 2de4ca34..a51e13bd 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java @@ -40,7 +40,7 @@ public class DeviceForm { @Schema(title = "设备MAC") private String deviceMac; - @Schema(name = "蓝牙名称") + @Schema(title = "蓝牙名称") private String bluetoothName; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java index 7fc8a103..d5e1df70 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java @@ -11,28 +11,28 @@ import lombok.Data; @Data public class DeviceTypeForm { - @Schema(name = "ID", hidden = true) + @Schema(title = "ID", hidden = true) private Long id; - @Schema(name = "类型名称", required = true) + @Schema(title = "类型名称", required = true) private String typeName; - @Schema(name = "是否支持蓝牙") + @Schema(title = "是否支持蓝牙") 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; - @Schema(name = "联网方式", example = "0:无;1:4G;2:WIFI") + @Schema(title = "联网方式", example = "0:无;1:4G;2:WIFI") private String networkWay; - @Schema(name = "通讯方式", example = "0:4G;1:蓝牙") + @Schema(title = "通讯方式", example = "0:4G;1:蓝牙") private String communicationMode; /** * 型号字典用于APP页面跳转 */ - @Schema(name = "型号字典用于APP页面跳转") + @Schema(title = "型号字典用于APP页面跳转") private String modelDictionary; } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java index 2beea69a..5080edc6 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceTypeQueryCriteria.java @@ -15,25 +15,25 @@ import java.util.Set; @Data public class DeviceTypeQueryCriteria extends BaseEntity implements Serializable { - @Schema(name = "设备类型id") + @Schema(title = "设备类型id") private Long deviceTypeId; - @Schema(name = "型号名称") + @Schema(title = "型号名称") private String typeName; - @Schema(name = "所属客户") + @Schema(title = "所属客户") private Set customerIds; - @Schema(name = "所属客户") + @Schema(title = "所属客户") private Long customerId; - @Schema(name = "com.fuyuanshen") + @Schema(title = "com.fuyuanshen") private Long tenantId; - @Schema(name = "页码", example = "1") + @Schema(title = "页码", example = "1") private Integer pageNum = 1; - @Schema(name = "每页数据量", example = "10") + @Schema(title = "每页数据量", example = "10") private Integer pageSize = 10; diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/CustomerVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/CustomerVo.java index b2ff0481..3debd670 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/CustomerVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/CustomerVo.java @@ -16,11 +16,11 @@ import java.util.List; @Validated public class CustomerVo { - @Schema(name = "客户ID") + @Schema(title = "客户ID") @NotNull(message = "客户ID不能为空") private Long customerId; - @Schema(name = "设备ID") + @Schema(title = "设备ID") @NotNull(message = "设备ID不能为空") private List deviceIds;