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

添加设备

Browse Source
This commit is contained in:
daiyongfei
2025-06-30 16:59:12 +08:00
parent 0969a7cd1f
commit eac1b2e016
21 changed files with 567 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,71 +21,71 @@ import lombok.Data;
public class Device extends TenantEntity {
@TableId(value = "id", type = IdType.AUTO)
// @ApiModelProperty(value = "ID")
// @Schema(value = "ID")
private Long id;
// @ApiModelProperty(value = "设备记录ID")
// @Schema(value = "设备记录ID")
@TableField(exist = false)
private Long assignId;
// @ApiModelProperty(value = "设备类型")
// @Schema(value = "设备类型")
private Long deviceType;
// @ApiModelProperty(value = "设备类型名称")
// @Schema(value = "设备类型名称")
private String typeName;
// @ApiModelProperty(value = "客户号")
// @Schema(value = "客户号")
private Long customerId;
/**
* 当前所有者
* current_owner_id
*/
// @ApiModelProperty(value = "当前所有者")
// @Schema(value = "当前所有者")
private Long currentOwnerId;
/**
* 原始所有者（创建者）
* original_owner_id
*/
// @ApiModelProperty(value = "原始所有者（创建者）")
// @Schema(value = "原始所有者（创建者）")
private Long originalOwnerId;
// @ApiModelProperty(value = "所属客户")
// @Schema(value = "所属客户")
private String customerName;
/*@ApiModelProperty(value = "设备编号")
/*@Schema(value = "设备编号")
private String deviceNo;*/
// @ApiModelProperty(value = "设备名称")
// @Schema(value = "设备名称")
private String deviceName;
// @ApiModelProperty(value = "设备图片")
// @Schema(value = "设备图片")
private String devicePic;
// @ApiModelProperty(value = "设备MAC")
// @Schema(value = "设备MAC")
private String deviceMac;
// @ApiModelProperty(value = "设备IMEI")
// @Schema(value = "设备IMEI")
private String deviceImei;
// @ApiModelProperty(value = "设备SN")
// @Schema(value = "设备SN")
private String deviceSn;
// @ApiModelProperty(value = "经度")
// @Schema(value = "经度")
private String longitude;
// @ApiModelProperty(value = "纬度")
// @Schema(value = "纬度")
private String latitude;
// @ApiModelProperty(value = "备注")
// @Schema(value = "备注")
private String remark;
/**
* 租户ID
*/
// @TableField(value = "tenant_id")
// // @ApiModelProperty(hidden = true)
// // @Schema(hidden = true)
// private Long tenantId;
/**
@ -93,7 +93,7 @@ public class Device extends TenantEntity {
* 0 失效
* 1 正常
*/
// @ApiModelProperty(value = "设备状态")
// @Schema(value = "设备状态")
private Integer deviceStatus;
/**
@ -101,7 +101,7 @@ public class Device extends TenantEntity {
* 0 未绑定
* 1 已绑定
*/
// @ApiModelProperty(value = "绑定状态")
// @Schema(value = "绑定状态")
private Integer bindingStatus;

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

@ -18,19 +18,19 @@ import lombok.Data;
public class DeviceLog extends TenantEntity {
@TableId(value = "id", type = IdType.AUTO)
// @ApiModelProperty(value = "ID")
// @Schema(value = "ID")
private Long id;
// @ApiModelProperty(value = "设备行为")
// @Schema(value = "设备行为")
private String deviceAction;
// @ApiModelProperty(value = "设备名称")
// @Schema(value = "设备名称")
private String deviceName;
// @ApiModelProperty(value = "数据来源")
// @Schema(value = "数据来源")
private String dataSource;
// @ApiModelProperty(value = "内容")
// @Schema(value = "内容")
private String content;
public void copy(DeviceLog source){

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

@ -19,36 +19,36 @@ import lombok.Data;
public class DeviceType extends TenantEntity {
@TableId(value = "id", type = IdType.AUTO)
// @ApiModelProperty(value = "ID", hidden = true)
// @Schema(value = "ID", hidden = true)
private Long id;
// @ApiModelProperty(value = "客户号")
// @Schema(value = "客户号")
private Long customerId;
// @ApiModelProperty(value = "创建该类型的客户")
// @Schema(value = "创建该类型的客户")
private Long ownerCustomerId;
/**
* 租户ID
*/
// @TableField(value = "tenant_id")
// @ApiModelProperty(hidden = true)
// @Schema(hidden = true)
// private Long tenantId;
@NotBlank(message = "设备类型名称不能为空")
// @ApiModelProperty(value = "类型名称", required = true)
// @Schema(value = "类型名称", required = true)
private String typeName;
// @ApiModelProperty(value = "是否支持蓝牙")
// @Schema(value = "是否支持蓝牙")
private Boolean isSupportBle;
// @ApiModelProperty(value = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗")
// @Schema(value = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗")
private String locateMode;
// @ApiModelProperty(value = "联网方式", example = "0:无;1:4G;2:WIFI")
// @Schema(value = "联网方式", example = "0:无;1:4G;2:WIFI")
private String networkWay;
// @ApiModelProperty(value = "通讯方式", example = "0:4G;1:蓝牙")
// @Schema(value = "通讯方式", example = "0:4G;1:蓝牙")
private String communicationMode;

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

@ -0,0 +1,56 @@
package com.fuyuanshen.equipment.domain.form;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
/**
* @Description: 设备表单
* @Author: WY
* @Date: 2025/5/17
**/
@Data
public class DeviceForm {
@Schema(title = "ID", hidden = true)
private Long id;
@Schema(title = "设备记录ID")
private Long assignId;
@Schema(title = "设备类型")
private Long deviceType;
@Schema(title = "客户号")
private Long customerId;
/*@Schema(value = "设备编号")
private String deviceNo;*/
@NotBlank(message = "设备名称不能为空")
@Schema(title = "设备名称", required = true)
private String deviceName;
@Schema(title = "设备图片存储路径", hidden = true)
private String devicePic;
// @NotBlank(message = "设备MAC不能为空")
@Schema(title = "设备MAC")
private String deviceMac;
@Schema(title = "设备IMEI")
private String deviceImei;
// @NotBlank(message = "设备SN不能为空")
@Schema(title = "设备SN", required = true)
private String deviceSn;
@Schema(title = "设备图片")
private MultipartFile file;
@Schema(title = "备注")
private String remark;
}

28
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceQueryCriteria.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java
View File

@ -1,4 +1,4 @@
package com.fuyuanshen.equipment.domain.dto;
package com.fuyuanshen.equipment.domain.query;
import lombok.Data;
@ -16,19 +16,19 @@ import java.util.Set;
@Data
public class DeviceQueryCriteria {
// @ApiModelProperty(value = "设备名称")
// @Schema(value = "设备名称")
private String deviceName;
// @ApiModelProperty(value = "设备类型")
// @Schema(value = "设备类型")
private Long deviceType;
// @ApiModelProperty(value = "设备MAC")
// @Schema(value = "设备MAC")
private String deviceMac;
// @ApiModelProperty(value = "设备IMEI")
// @Schema(value = "设备IMEI")
private String deviceImei;
// @ApiModelProperty(value = "设备SN")
// @Schema(value = "设备SN")
private String deviceSn;
/**
@ -36,29 +36,29 @@ public class DeviceQueryCriteria {
* 0 失效
* 1 正常
*/
// @ApiModelProperty(value = "设备状态 0 失效 1 正常 ")
// @Schema(value = "设备状态 0 失效 1 正常 ")
private Integer deviceStatus;
// @ApiModelProperty(value = "创建时间")
// @Schema(value = "创建时间")
private List<Timestamp> createTime;
// @ApiModelProperty(value = "页码", example = "1")
// @Schema(value = "页码", example = "1")
private Integer page = 1;
// @ApiModelProperty(value = "每页数据量", example = "10")
// @Schema(value = "每页数据量", example = "10")
private Integer size = 10;
// @ApiModelProperty(value = "客户id")
// @Schema(value = "客户id")
private Long customerId;
private Set<Long> customerIds;
// @ApiModelProperty(value = "当前所有者")
// @Schema(value = "当前所有者")
private Long currentOwnerId;
// @ApiModelProperty(value = "租户ID")
// @Schema(value = "租户ID")
private Long tenantId;
// @ApiModelProperty(value = "通讯方式", example = "0:4G;1:蓝牙")
// @Schema(value = "通讯方式", example = "0:4G;1:蓝牙")
private Integer communicationMode;
}