zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:硬件广播、硬件授权代码修改

Browse Source
This commit is contained in:
dzc committed 2025-04-11 15:25:27 +08:00
1 parent 7ea1f7937e
commit 0ff7a302ea
15 files changed
+412 -95
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardAuthDto.java
+9
View File
@@ -3,6 +3,15 @@ package com.bsd.pjcloud.hard.api.dto;
import com.bsd.pjcloud.hard.api.entity.HardAuthEntity;
import lombok.Data;
import java.time.LocalDate;
@Data
public class HardAuthDto extends HardAuthEntity {
private LocalDate[] createTimeList;
private LocalDate[] authTimeList;
private LocalDate[] isDoneTimeList;
}
pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardBroadcastDto.java
+7
View File
@@ -3,6 +3,13 @@ package com.bsd.pjcloud.hard.api.dto;
import com.bsd.pjcloud.hard.api.entity.HardBroadcastEntity;
import lombok.Data;
import java.time.LocalDate;
@Data
public class HardBroadcastDto extends HardBroadcastEntity {
private LocalDate[] createTimeList;
private LocalDate[] isDoneTimeList;
}
pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java
+64 -57
View File
@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.bsd.pjcloud.common.core.util.TenantTable;
import java.time.LocalDateTime;
/**
@@ -19,88 +20,94 @@ import java.time.LocalDateTime;
public class HardAuthEntity extends Model<HardAuthEntity> {
/**
* 编号
*/
/**
* 编号
*/
@TableId(type = IdType.ASSIGN_ID)
@Schema(description="编号")
@Schema(description = "编号")
private Long id;
/**
* 预定用户
*/
@Schema(description="预定用户")
/**
* 预定用户
*/
@Schema(description = "预定用户")
private Long userId;
/**
* 硬件id
*/
@Schema(description="硬件id")
/**
* 硬件id
*/
@Schema(description = "硬件id")
private Long hardId;
/**
* 是否授权
*/
@Schema(description="是否授权")
/**
* 是否授权
*/
@Schema(description = "是否授权")
private String authType;
/**
* 是否授权
*/
@Schema(description = "是否授权")
private String authStatus;
/**
* 授权时间
*/
@Schema(description="授权时间")
/**
* 授权时间
*/
@Schema(description = "授权时间")
private LocalDateTime authTime;
/**
* 是否完成
*/
@Schema(description="是否完成")
/**
* 是否完成
*/
@Schema(description = "是否完成")
private String isDone;
/**
* 完成时间
*/
@Schema(description="完成时间")
/**
* 完成时间
*/
@Schema(description = "完成时间")
private LocalDateTime isDoneTime;
/**
* 创建人
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description="创建人")
/**
* 创建人
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description = "创建人")
private String createBy;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description="创建时间")
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description = "创建时间")
private LocalDateTime createTime;
/**
* 修改人
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description="修改人")
/**
* 修改人
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description = "修改人")
private String updateBy;
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description="修改时间")
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(description = "修改时间")
private LocalDateTime updateTime;
/**
* 删除标记
*/
/**
* 删除标记
*/
@TableLogic
@TableField(fill = FieldFill.INSERT)
@Schema(description="删除标记")
@TableField(fill = FieldFill.INSERT)
@Schema(description = "删除标记")
private String delFlag;
/**
* 租户ID
*/
@Schema(description="租户ID")
/**
* 租户ID
*/
@Schema(description = "租户ID")
private Long tenantId;
}
pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardAuthVo.java
+28 -1
View File
@@ -1,8 +1,35 @@
package com.bsd.pjcloud.hard.api.vo;
import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface;
import com.bsd.pjcloud.hard.api.entity.HardAuthEntity;
import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
import lombok.Data;
import java.util.List;
@Data
public class HardAuthVo extends HardAuthEntity {
public class HardAuthVo extends HardAuthEntity implements BaseHardInterface, BaseUserDeptInterface {
/**
* 设备相关
*/
private String hardName;
private String hardType;
private List<String> hardTypeCodes;
/**
* 用户相关
*/
private String username;
private String userMobile;
private String userAvatar;
private Long userDeptId;
private String userDeptName;
}
pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/HardBroadcastVo.java
+29 -1
View File
@@ -1,8 +1,36 @@
package com.bsd.pjcloud.hard.api.vo;
import com.bsd.pjcloud.admin.api.vo.base.BaseUserDeptInterface;
import com.bsd.pjcloud.hard.api.entity.HardBroadcastEntity;
import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
import lombok.Data;
import java.util.List;
@Data
public class HardBroadcastVo extends HardBroadcastEntity {
public class HardBroadcastVo extends HardBroadcastEntity implements BaseHardInterface, BaseUserDeptInterface {
/**
* 设备相关
*/
private String hardName;
private String hardType;
private List<String> hardTypeCodes;
/**
* 用户相关
*/
private String username;
private String userMobile;
private String userAvatar;
private Long userDeptId;
private String userDeptName;
}