实体提交

zd-api/zd-system-api/src/main/java/com/zd/system/api/bo/SysLoginBo.java

@@ -0,0 +1,29 @@
+package com.zd.system.api.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+/***
+ * <p>SysLoginBo</p>
+ *
+ * @author linft
+ * @date 6/21/2023
+ * @version 3.0
+ */
+@Data
+public class SysLoginBo implements Serializable {
+    private static final long serialVersionUID = 3887470861037486953L;
+
+    @ApiModelProperty("登录账号")
+    private String account;
+
+    @ApiModelProperty("密码")
+    private String password;
+
+    @ApiModelProperty("授权类型")
+    private String grantType;
+
+    @ApiModelProperty("登录类型")
+    private Integer loginType;
+}

zd-api/zd-system-api/src/main/java/com/zd/system/api/dto/SysUserPageDto.java

@@ -0,0 +1,43 @@
+package com.zd.system.api.dto;
+
+import com.zd.model.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description 用户分页查询dto
+ * @Author hzw
+ * @Date 2023/4/25 10:56
+ * @Version 2.0
+ */
+@Data
+@ApiModel("用户分页查询dto")
+public class SysUserPageDto  extends BaseEntity {
+
+    @ApiModelProperty("学院id")
+    private Long deptId;
+    @ApiModelProperty("用户id")
+    private Long[] userIds;
+    @ApiModelProperty("已选用户ids")
+    private Long[] selectedUserIds;
+    @ApiModelProperty("过滤类型，1是过滤，2是不过滤")
+    private Integer filtType;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("页码")
+    private Integer pageNum = 1;
+    /**
+     * 页显示数量
+     */
+    @ApiModelProperty("页大小")
+    private Integer pageSize = 10;
+
+    /**
+     * 关键字
+     */
+    @ApiModelProperty("关键字")
+    private String searchValue;
+}

zd-api/zd-system-api/src/main/java/com/zd/system/api/vo/CheckUserVo.java

@@ -0,0 +1,42 @@
+package com.zd.system.api.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 用户vo
+ * @Author hzw
+ * @Date 2023/4/25 10:59
+ * @Version 2.0
+ */
+@Data
+@ApiModel("用户vo")
+public class CheckUserVo implements Serializable {
+
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    @ApiModelProperty("用户昵称")
+    private String nickName;
+
+    @ApiModelProperty("用户账号（工号）")
+    private String userName;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("用户类型（00系统用户，11 教职工，22 学生，99 大屏）")
+    private String userType;
+
+    @ApiModelProperty("导师名称")
+    private String tutorName;
+
+    @ApiModelProperty("班级名称")
+    private String className;
+}

zd-api/zd-system-api/src/main/java/com/zd/system/api/vo/SysUserApiVo.java

@@ -0,0 +1,68 @@
+package com.zd.system.api.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>用户基础数据类</p>
+ *
+ * @author cyl
+ * @version 1.0
+ * @date 04/24/2023
+ */
+@Data
+public class SysUserApiVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("检查人员主键id")
+    private Long id;
+
+    @ApiModelProperty("实验室id")
+    private Long subId;
+
+    @ApiModelProperty("实验室名称")
+    private String subName;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    @ApiModelProperty("实验室房间号")
+    private String subRomm;
+
+    @ApiModelProperty("用户真实姓名")
+    private String nickName;
+
+    @ApiModelProperty("学号")
+    private String userNumber;
+
+    @ApiModelProperty("手机号")
+    private String phonenumber;
+
+    @ApiModelProperty("有效期开始时间")
+    private LocalDateTime validBeginTime;
+
+    @ApiModelProperty("有效期结束时间")
+    private LocalDateTime validEndTime;
+
+    @ApiModelProperty("归属类型，1是安全负责人，2是安全责任人，3是老师，4是学生")
+    private Integer attriType;
+
+    @ApiModelProperty("人员类型：1是检查人员，2是整改人员")
+    private Integer staffType;
+
+    @ApiModelProperty("实验室id 为了结合新老服务字段交替")
+    private Long subjectId;
+
+    @ApiModelProperty("删除")
+    private int delFlag;
+
+}

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/vo/SysUserDto.java

@@ -0,0 +1,30 @@
+package com.zd.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Controller
+ *
+ * @author cyl
+ * @date 2023/4/21
+ */
+@Data
+public class SysUserDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("身份类型")
+    private String identityTypeStr;
+
+    @ApiModelProperty("实验室负责人")
+    private String subAdmin;
+
+    @ApiModelProperty("实验室安全责任人")
+    private String subSafe;
+
+    @ApiModelProperty("实验室白名单")
+    private String subWhite;
+}

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/vo/SysUserVo.java

@@ -0,0 +1,43 @@
+package com.zd.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Controller
+ *
+ * @author cyl
+ * @date 2023/4/21
+ */
+@Data
+public class SysUserVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("实验室id")
+    private Long subId;
+
+    @ApiModelProperty("实验室名称")
+    private String subName;
+
+    @ApiModelProperty("实验室房间号")
+    private String subRomm;
+
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("用户id")
+    private Long userId;
+
+    @ApiModelProperty("用户真实姓名")
+    private String nickName;
+
+    @ApiModelProperty("归属类型，1是安全负责人，2是安全责任人，3是老师，4是学生")
+    private Integer attriType;
+
+}