Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/DmMeetingApproveController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 预约审批表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-07
- */
-@Controller
-@RequestMapping("/dmMeetingApprove")
-public class DmMeetingApproveController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/MeetingApproveController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 预约审批表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Controller
-@RequestMapping("/meetingApprove")
-public class MeetingApproveController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/MeetingApproveUserController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 会议审批用户 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Controller
-@RequestMapping("/meetingApproveUser")
-public class MeetingApproveUserController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/MeetingAttendeeController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 会议参会人员关联表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Controller
-@RequestMapping("/meetingAttendee")
-public class MeetingAttendeeController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/MeetingDeviceController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 设备表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Controller
-@RequestMapping("/meetingDevice")
-public class MeetingDeviceController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/MeetingFaceController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Controller
-@RequestMapping("/meetingFace")
-public class MeetingFaceController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/MeetingFaceVefLogController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Controller
-@RequestMapping("/meetingFaceVefLog")
-public class MeetingFaceVefLogController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/MeetingFileController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 会议文件 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Controller
-@RequestMapping("/meetingFile")
-public class MeetingFileController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/MeetingFloorController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 楼层表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Controller
-@RequestMapping("/meetingFloor")
-public class MeetingFloorController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/MeetingInfoController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 会议表(预约成功) 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Controller
-@RequestMapping("/meetingInfo")
-public class MeetingInfoController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/controller/web/MeetingRoomController.java

@@ -1,21 +0,0 @@
-package com.usky.meet.controller.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- * 会议室表 前端控制器
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Controller
-@RequestMapping("/meetingRoom")
-public class MeetingRoomController {
-
-}
-

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/DmMeetingApprove.java

@@ -1,55 +0,0 @@
-package com.usky.meet.domain;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 预约审批表
- * </p>
- *
- * @author zyj
- * @since 2024-03-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class DmMeetingApprove implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    /**
-     * 会议室预约id
-     */
-    private Long meetingId;
-
-    /**
-     * 申请用户id
-     */
-    private Long initiatorId;
-
-    /**
-     * 审批人
-     */
-    private Long approveUserId;
-
-    /**
-     * 审批结果
-     */
-    private String approveResult;
-
-    /**
-     * 审批建议
-     */
-    private String approveSuggest;
-
-    /**
-     * 审批时间
-     */
-    private LocalDateTime approveDate;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingApprove.java

@@ -1,55 +0,0 @@
-package com.usky.meet.domain;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 预约审批表
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeetingApprove implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    /**
-     * 会议室预约id
-     */
-    private Long meetingId;
-
-    /**
-     * 申请用户id
-     */
-    private Long initiatorId;
-
-    /**
-     * 审批人
-     */
-    private Long approveUserId;
-
-    /**
-     * 审批结果
-     */
-    private String approveResult;
-
-    /**
-     * 审批建议
-     */
-    private String approveSuggest;
-
-    /**
-     * 审批时间
-     */
-    private LocalDateTime approveDate;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingApproveUser.java

@@ -1,37 +0,0 @@
-package com.usky.meet.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 会议审批用户
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeetingApproveUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 会议id
-     */
-    private Long meetingId;
-
-    /**
-     * 审批用户id
-     */
-    private String dmUserId;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingAttendee.java

@@ -1,63 +0,0 @@
-package com.usky.meet.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 会议参会人员关联表
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeetingAttendee implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 会议id
-     */
-    private Long meetingId;
-
-    /**
-     * 参与人id
-     */
-    private String userId;
-
-    /**
-     * 是否签到(0-否 1-是)
-     */
-    private Long isSign;
-
-    /**
-     * 签到时间
-     */
-    private LocalDateTime signDate;
-
-    /**
-     * 是否签退(0-否 1-是)
-     */
-    private Long isSignOut;
-
-    /**
-     * 签退时间
-     */
-    private LocalDateTime signOutDate;
-
-    /**
-     * 签到方式(0.人工签到 1.人脸签到)
-     */
-    private Long signType;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingDevice.java

@@ -1,90 +0,0 @@
-package com.usky.meet.domain;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 设备表
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeetingDevice implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String deviceId;
-
-    /**
-     * 设备名称
-     */
-    private String deviceName;
-
-    /**
-     * 文件存储id(tool_local_storage)
-     */
-    private Long storageId;
-
-    /**
-     * 设备图片
-     */
-    private String imgPath;
-
-    /**
-     * 设备铭牌
-     */
-    private String nameplate;
-
-    /**
-     * 所属会议室
-     */
-    private String roomId;
-
-    /**
-     * 登记时间
-     */
-    private LocalDateTime registerDate;
-
-    /**
-     * 维护人
-     */
-    private String maintainer;
-
-    /**
-     * 联系方式
-     */
-    private String contacts;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingFace.java

@@ -1,76 +0,0 @@
-package com.usky.meet.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeetingFace implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "fid", type = IdType.AUTO)
-    private Integer fid;
-
-    /**
-     * 图片数据 base_64编码
-     */
-    private String faceBase;
-
-    /**
-     * 插入时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 验证次数
-     */
-    private Integer vefNum;
-
-    /**
-     * 人脸名称
-     */
-    private String faceName;
-
-    /**
-     * 人脸备注
-     */
-    private String remark;
-
-    /**
-     * 人脸是否可用，(0==可用，1,不可用)
-     */
-    private Integer faceStatus;
-
-    /**
-     * 扩展字段1(user_id)
-     */
-    private String updateExtend1;
-
-    /**
-     * 扩展字段2
-     */
-    private String updateExtend2;
-
-    /**
-     * 扩展字段3
-     */
-    private String updateExtend3;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingFaceVefLog.java

@@ -1,51 +0,0 @@
-package com.usky.meet.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeetingFaceVefLog implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "lid", type = IdType.AUTO)
-    private Integer lid;
-
-    /**
-     * 验证时间
-     */
-    private LocalDateTime vefTime;
-
-    /**
-     * 返回code
-     */
-    private Integer vefCode;
-
-    /**
-     * 返回的消息
-     */
-    private String vefMsg;
-
-    /**
-     * 验证人
-     */
-    private String loginName;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingFile.java

@@ -1,58 +0,0 @@
-package com.usky.meet.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 会议文件
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeetingFile implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "file_id", type = IdType.AUTO)
-    private Long fileId;
-
-    /**
-     * 会议id
-     */
-    private Long meetingId;
-
-    /**
-     * 文件存储id(tool_local_storage)
-     */
-    private Long storageId;
-
-    /**
-     * 文件存储地址
-     */
-    private String fileUrl;
-
-    /**
-     * 文件类型(0-会议所需文件,1-会议记录文件,2-高层会议文件)
-     */
-    private Long fileType;
-
-    /**
-     * 上传用户(dm_user)
-     */
-    private String uploadUser;
-
-    /**
-     * 上传日期
-     */
-    private LocalDateTime uploadTime;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingFloor.java

@@ -1,65 +0,0 @@
-package com.usky.meet.domain;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 楼层表
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeetingFloor implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long floorId;
-
-    /**
-     * 楼层名称
-     */
-    private String floorName;
-
-    /**
-     * 楼层负责人(person in charge)
-     */
-    private String floorPic;
-
-    /**
-     * 联系方式
-     */
-    private String contacts;
-
-    /**
-     * 排序
-     */
-    private Integer sortIndex;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingInfo.java

@@ -1,165 +0,0 @@
-package com.usky.meet.domain;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 会议表(预约成功)
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeetingInfo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long meetingId;
-
-    /**
-     * 会议议题
-     */
-    private String meetingName;
-
-    /**
-     * 会议室id
-     */
-    private Long roomId;
-
-    /**
-     * 会议室名称
-     */
-    private String roomName;
-
-    /**
-     * 会议介绍
-     */
-    private String meetingDescribe;
-
-    /**
-     * 会议类型(如研讨会、部门会议等)
-     */
-    private String meetingType;
-
-    /**
-     * 参与部门
-     */
-    private String deptId;
-
-    /**
-     * 发起人id
-     */
-    private String initiatorId;
-
-    /**
-     * 开始时间
-     */
-    private LocalDateTime startDate;
-
-    /**
-     * 结束时间
-     */
-    private LocalDateTime endDate;
-
-    /**
-     * 审批状态(0-审批中 1-审批通过 2-审批驳回)
-     */
-    private Long approveStatus;
-
-    /**
-     * 审批者意见
-     */
-    private String approveSuggest;
-
-    /**
-     * 实际签到人数
-     */
-    private Integer actualCount;
-
-    /**
-     * 应到人数/计划人数
-     */
-    private Integer planCount;
-
-    /**
-     * 是否延期(会议是否需要延期30分钟)
-     */
-    private Long isDelay;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 会议状态(未开始/进行中/已结束)
-     */
-    private Long meetingStatus;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * activiti任务id
-     */
-    private String taskId;
-
-    /**
-     * 流程实例id
-     */
-    private String procInstId;
-
-    /**
-     * 是否取消
-     */
-    private Long isCancel;
-
-    /**
-     * 通知类型(APP/Email/MSG短信)
-     */
-    private String sendType;
-
-    /**
-     * 会议性质(1-高层会议/0-普通会议)
-     */
-    private String meetingProp;
-
-    /**
-     * 是否需要审批(0-否 1-是)
-     */
-    private Long isApprove;
-
-    /**
-     * 高层会议-指定用户
-     */
-    private String gcAssignUser;
-
-    /**
-     * 会议模式(0-线下会议 1-线上会议 2-线下同步线上会议)
-     */
-    private String meetingMode;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingRoom.java

@@ -1,125 +0,0 @@
-package com.usky.meet.domain;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 会议室表
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class MeetingRoom implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long roomId;
-
-    /**
-     * 会议室名称
-     */
-    private String roomName;
-
-    /**
-     * 所在楼层
-     */
-    private String floorId;
-
-    /**
-     * 会议室简介
-     */
-    private String description;
-
-    /**
-     * 文件存储id(tool_local_storage)
-     */
-    private String storageId;
-
-    /**
-     * 会议室图片
-     */
-    private String imgPath;
-
-    /**
-     * 容纳人数
-     */
-    private Integer capacity;
-
-    /**
-     * 会议室所在位置
-     */
-    private String position;
-
-    /**
-     * 维护人
-     */
-    private String maintainer;
-
-    /**
-     * 联系方式
-     */
-    private String contacts;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 会议室使用状态(0-未使用 1-使用中)
-     */
-    private Long roomStatus;
-
-    /**
-     * 会议室预约状态(0-未预约 1-已预约)
-     */
-    private Long reserveStatus;
-
-    /**
-     * 会议室状态(00.启用 01.停用)
-     */
-    private String status;
-
-    /**
-     * 会议室环境
-     */
-    private String environmental;
-
-    /**
-     * 最近一次使用时间(正在使用的会议室,在预约时间外延后一小时开发预约)
-     */
-    private LocalDateTime lastUseTime;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 是否需要审批(0-否 1-是)
-     */
-    private Long isApprove;
-
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/DmMeetingApproveMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.DmMeetingApprove;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 预约审批表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-07
- */
-public interface DmMeetingApproveMapper extends CrudMapper<DmMeetingApprove> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/MeetingApproveMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.MeetingApprove;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 预约审批表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingApproveMapper extends CrudMapper<MeetingApprove> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/MeetingApproveUserMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.MeetingApproveUser;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 会议审批用户 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingApproveUserMapper extends CrudMapper<MeetingApproveUser> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/MeetingAttendeeMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.MeetingAttendee;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 会议参会人员关联表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingAttendeeMapper extends CrudMapper<MeetingAttendee> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/MeetingDeviceMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.MeetingDevice;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 设备表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingDeviceMapper extends CrudMapper<MeetingDevice> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/MeetingFaceMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.MeetingFace;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingFaceMapper extends CrudMapper<MeetingFace> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/MeetingFaceVefLogMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.MeetingFaceVefLog;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingFaceVefLogMapper extends CrudMapper<MeetingFaceVefLog> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/MeetingFileMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.MeetingFile;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 会议文件 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingFileMapper extends CrudMapper<MeetingFile> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/MeetingFloorMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.MeetingFloor;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 楼层表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingFloorMapper extends CrudMapper<MeetingFloor> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/MeetingInfoMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.MeetingInfo;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 会议表(预约成功) Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingInfoMapper extends CrudMapper<MeetingInfo> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/mapper/MeetingRoomMapper.java

@@ -1,16 +0,0 @@
-package com.usky.meet.mapper;
-
-import com.usky.meet.domain.MeetingRoom;
-import com.usky.common.mybatis.core.CrudMapper;
-
-/**
- * <p>
- * 会议室表 Mapper 接口
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingRoomMapper extends CrudMapper<MeetingRoom> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/DmMeetingApproveService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.DmMeetingApprove;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 预约审批表 服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-07
- */
-public interface DmMeetingApproveService extends CrudService<DmMeetingApprove> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/MeetingApproveService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.MeetingApprove;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 预约审批表 服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingApproveService extends CrudService<MeetingApprove> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/MeetingApproveUserService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.MeetingApproveUser;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 会议审批用户 服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingApproveUserService extends CrudService<MeetingApproveUser> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/MeetingAttendeeService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.MeetingAttendee;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 会议参会人员关联表 服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingAttendeeService extends CrudService<MeetingAttendee> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/MeetingDeviceService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.MeetingDevice;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 设备表 服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingDeviceService extends CrudService<MeetingDevice> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/MeetingFaceService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.MeetingFace;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingFaceService extends CrudService<MeetingFace> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/MeetingFaceVefLogService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.MeetingFaceVefLog;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingFaceVefLogService extends CrudService<MeetingFaceVefLog> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/MeetingFileService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.MeetingFile;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 会议文件 服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingFileService extends CrudService<MeetingFile> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/MeetingFloorService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.MeetingFloor;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 楼层表 服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingFloorService extends CrudService<MeetingFloor> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/MeetingInfoService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.MeetingInfo;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 会议表(预约成功) 服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingInfoService extends CrudService<MeetingInfo> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/MeetingRoomService.java

@@ -1,16 +0,0 @@
-package com.usky.meet.service;
-
-import com.usky.meet.domain.MeetingRoom;
-import com.usky.common.mybatis.core.CrudService;
-
-/**
- * <p>
- * 会议室表 服务类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-public interface MeetingRoomService extends CrudService<MeetingRoom> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/DmMeetingApproveServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.DmMeetingApprove;
-import com.usky.meet.mapper.DmMeetingApproveMapper;
-import com.usky.meet.service.DmMeetingApproveService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 预约审批表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-07
- */
-@Service
-public class DmMeetingApproveServiceImpl extends AbstractCrudService<DmMeetingApproveMapper, DmMeetingApprove> implements DmMeetingApproveService {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/MeetingApproveServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.MeetingApprove;
-import com.usky.meet.mapper.MeetingApproveMapper;
-import com.usky.meet.service.MeetingApproveService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 预约审批表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Service
-public class MeetingApproveServiceImpl extends AbstractCrudService<MeetingApproveMapper, MeetingApprove> implements MeetingApproveService {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/MeetingApproveUserServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.MeetingApproveUser;
-import com.usky.meet.mapper.MeetingApproveUserMapper;
-import com.usky.meet.service.MeetingApproveUserService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 会议审批用户 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Service
-public class MeetingApproveUserServiceImpl extends AbstractCrudService<MeetingApproveUserMapper, MeetingApproveUser> implements MeetingApproveUserService {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/MeetingAttendeeServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.MeetingAttendee;
-import com.usky.meet.mapper.MeetingAttendeeMapper;
-import com.usky.meet.service.MeetingAttendeeService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 会议参会人员关联表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Service
-public class MeetingAttendeeServiceImpl extends AbstractCrudService<MeetingAttendeeMapper, MeetingAttendee> implements MeetingAttendeeService {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/MeetingDeviceServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.MeetingDevice;
-import com.usky.meet.mapper.MeetingDeviceMapper;
-import com.usky.meet.service.MeetingDeviceService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 设备表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Service
-public class MeetingDeviceServiceImpl extends AbstractCrudService<MeetingDeviceMapper, MeetingDevice> implements MeetingDeviceService {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/MeetingFaceServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.MeetingFace;
-import com.usky.meet.mapper.MeetingFaceMapper;
-import com.usky.meet.service.MeetingFaceService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Service
-public class MeetingFaceServiceImpl extends AbstractCrudService<MeetingFaceMapper, MeetingFace> implements MeetingFaceService {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/MeetingFaceVefLogServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.MeetingFaceVefLog;
-import com.usky.meet.mapper.MeetingFaceVefLogMapper;
-import com.usky.meet.service.MeetingFaceVefLogService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Service
-public class MeetingFaceVefLogServiceImpl extends AbstractCrudService<MeetingFaceVefLogMapper, MeetingFaceVefLog> implements MeetingFaceVefLogService {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/MeetingFileServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.MeetingFile;
-import com.usky.meet.mapper.MeetingFileMapper;
-import com.usky.meet.service.MeetingFileService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 会议文件 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Service
-public class MeetingFileServiceImpl extends AbstractCrudService<MeetingFileMapper, MeetingFile> implements MeetingFileService {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/MeetingFloorServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.MeetingFloor;
-import com.usky.meet.mapper.MeetingFloorMapper;
-import com.usky.meet.service.MeetingFloorService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 楼层表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Service
-public class MeetingFloorServiceImpl extends AbstractCrudService<MeetingFloorMapper, MeetingFloor> implements MeetingFloorService {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/MeetingInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.MeetingInfo;
-import com.usky.meet.mapper.MeetingInfoMapper;
-import com.usky.meet.service.MeetingInfoService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 会议表(预约成功) 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Service
-public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMapper, MeetingInfo> implements MeetingInfoService {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/meet/service/impl/MeetingRoomServiceImpl.java

@@ -1,20 +0,0 @@
-package com.usky.meet.service.impl;
-
-import com.usky.meet.domain.MeetingRoom;
-import com.usky.meet.mapper.MeetingRoomMapper;
-import com.usky.meet.service.MeetingRoomService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 会议室表 服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-08
- */
-@Service
-public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMapper, MeetingRoom> implements MeetingRoomService {
-
-}

service-meet/service-meet-biz/src/main/resources/mapper/meet/DmMeetingApproveMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.DmMeetingApproveMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.DmMeetingApprove">
-        <id column="id" property="id" />
-        <result column="meeting_id" property="meetingId" />
-        <result column="initiator_id" property="initiatorId" />
-        <result column="approve_user_id" property="approveUserId" />
-        <result column="approve_result" property="approveResult" />
-        <result column="approve_suggest" property="approveSuggest" />
-        <result column="approve_date" property="approveDate" />
-    </resultMap>
-
-</mapper>

service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingApproveMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.MeetingApproveMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.MeetingApprove">
-        <id column="id" property="id" />
-        <result column="meeting_id" property="meetingId" />
-        <result column="initiator_id" property="initiatorId" />
-        <result column="approve_user_id" property="approveUserId" />
-        <result column="approve_result" property="approveResult" />
-        <result column="approve_suggest" property="approveSuggest" />
-        <result column="approve_date" property="approveDate" />
-    </resultMap>
-
-</mapper>

service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingApproveUserMapper.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.MeetingApproveUserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.MeetingApproveUser">
-        <id column="id" property="id" />
-        <result column="meeting_id" property="meetingId" />
-        <result column="dm_user_id" property="dmUserId" />
-    </resultMap>
-
-</mapper>

service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingAttendeeMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.MeetingAttendeeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.MeetingAttendee">
-        <id column="id" property="id" />
-        <result column="meeting_id" property="meetingId" />
-        <result column="user_id" property="userId" />
-        <result column="is_sign" property="isSign" />
-        <result column="sign_date" property="signDate" />
-        <result column="is_sign_out" property="isSignOut" />
-        <result column="sign_out_date" property="signOutDate" />
-        <result column="sign_type" property="signType" />
-    </resultMap>
-
-</mapper>

service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingDeviceMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.MeetingDeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.MeetingDevice">
-        <id column="device_id" property="deviceId" />
-        <result column="device_name" property="deviceName" />
-        <result column="storage_id" property="storageId" />
-        <result column="img_path" property="imgPath" />
-        <result column="nameplate" property="nameplate" />
-        <result column="room_id" property="roomId" />
-        <result column="register_date" property="registerDate" />
-        <result column="maintainer" property="maintainer" />
-        <result column="contacts" property="contacts" />
-        <result column="remark" property="remark" />
-        <result column="create_by" property="createBy" />
-        <result column="update_by" property="updateBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingFaceMapper.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.MeetingFaceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.MeetingFace">
-        <id column="fid" property="fid" />
-        <result column="face_base" property="faceBase" />
-        <result column="create_time" property="createTime" />
-        <result column="vef_num" property="vefNum" />
-        <result column="face_name" property="faceName" />
-        <result column="remark" property="remark" />
-        <result column="face_status" property="faceStatus" />
-        <result column="update_extend1" property="updateExtend1" />
-        <result column="update_extend2" property="updateExtend2" />
-        <result column="update_extend3" property="updateExtend3" />
-    </resultMap>
-
-</mapper>

service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingFaceVefLogMapper.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.MeetingFaceVefLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.MeetingFaceVefLog">
-        <id column="lid" property="lid" />
-        <result column="vef_time" property="vefTime" />
-        <result column="vef_code" property="vefCode" />
-        <result column="vef_msg" property="vefMsg" />
-        <result column="login_name" property="loginName" />
-    </resultMap>
-
-</mapper>

service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingFileMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.MeetingFileMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.MeetingFile">
-        <id column="file_id" property="fileId" />
-        <result column="meeting_id" property="meetingId" />
-        <result column="storage_id" property="storageId" />
-        <result column="file_url" property="fileUrl" />
-        <result column="file_type" property="fileType" />
-        <result column="upload_user" property="uploadUser" />
-        <result column="upload_time" property="uploadTime" />
-    </resultMap>
-
-</mapper>

service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingFloorMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.MeetingFloorMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.MeetingFloor">
-        <id column="floor_id" property="floorId" />
-        <result column="floor_name" property="floorName" />
-        <result column="floor_pic" property="floorPic" />
-        <result column="contacts" property="contacts" />
-        <result column="sort_index" property="sortIndex" />
-        <result column="create_by" property="createBy" />
-        <result column="update_by" property="updateBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingInfoMapper.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.MeetingInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.MeetingInfo">
-        <id column="meeting_id" property="meetingId" />
-        <result column="meeting_name" property="meetingName" />
-        <result column="room_id" property="roomId" />
-        <result column="room_name" property="roomName" />
-        <result column="meeting_describe" property="meetingDescribe" />
-        <result column="meeting_type" property="meetingType" />
-        <result column="dept_id" property="deptId" />
-        <result column="initiator_id" property="initiatorId" />
-        <result column="start_date" property="startDate" />
-        <result column="end_date" property="endDate" />
-        <result column="approve_status" property="approveStatus" />
-        <result column="approve_suggest" property="approveSuggest" />
-        <result column="actual_count" property="actualCount" />
-        <result column="plan_count" property="planCount" />
-        <result column="is_delay" property="isDelay" />
-        <result column="remark" property="remark" />
-        <result column="meeting_status" property="meetingStatus" />
-        <result column="create_by" property="createBy" />
-        <result column="update_by" property="updateBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="task_id" property="taskId" />
-        <result column="proc_inst_id" property="procInstId" />
-        <result column="is_cancel" property="isCancel" />
-        <result column="send_type" property="sendType" />
-        <result column="meeting_prop" property="meetingProp" />
-        <result column="is_approve" property="isApprove" />
-        <result column="gc_assign_user" property="gcAssignUser" />
-        <result column="meeting_mode" property="meetingMode" />
-    </resultMap>
-
-</mapper>

service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingRoomMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.meet.mapper.MeetingRoomMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.meet.domain.MeetingRoom">
-        <id column="room_id" property="roomId" />
-        <result column="room_name" property="roomName" />
-        <result column="floor_id" property="floorId" />
-        <result column="description" property="description" />
-        <result column="storage_id" property="storageId" />
-        <result column="img_path" property="imgPath" />
-        <result column="capacity" property="capacity" />
-        <result column="position" property="position" />
-        <result column="maintainer" property="maintainer" />
-        <result column="contacts" property="contacts" />
-        <result column="remark" property="remark" />
-        <result column="room_status" property="roomStatus" />
-        <result column="reserve_status" property="reserveStatus" />
-        <result column="status" property="status" />
-        <result column="environmental" property="environmental" />
-        <result column="last_use_time" property="lastUseTime" />
-        <result column="create_by" property="createBy" />
-        <result column="update_by" property="updateBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-        <result column="is_approve" property="isApprove" />
-    </resultMap>
-
-</mapper>

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingDeviceController.java

@@ -1,7 +1,14 @@
 package com.usky.meeting.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.meeting.domain.MeetingDevice;
+import com.usky.meeting.service.MeetingDeviceService;
+import com.usky.meeting.service.vo.MeetingDeviceRequestVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 
@@ -13,9 +20,56 @@ import org.springframework.stereotype.Controller;
  * @author zyj
  * @since 2024-03-08
  */
-@Controller
+@RestController
+@RequiredArgsConstructor
 @RequestMapping("/meetingDevice")
 public class MeetingDeviceController {
 
+    @Autowired
+    private MeetingDeviceService meetingDeviceService;
+
+    /**
+     * 设备列表
+     * @param requestVO
+     * @return
+     */
+    @PostMapping("meetingDeviceList")
+    public ApiResult<CommonPage<MeetingDevice>> meetingDeviceList(@RequestBody MeetingDeviceRequestVO requestVO){
+        return ApiResult.success(meetingDeviceService.meetingDeviceList(requestVO));
+    }
+
+    /**
+     * 新增
+     * @param meetingDevice
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody MeetingDevice meetingDevice){
+        meetingDeviceService.add(meetingDevice);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改
+     * @param meetingDevice
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody MeetingDevice meetingDevice){
+        meetingDeviceService.edit(meetingDevice);
+        return ApiResult.success();
+    }
+
+    /**
+     * 删除
+     * @param deviceId
+     * @return
+     */
+    @DeleteMapping
+    public ApiResult<Void> remove(@RequestParam Long deviceId){
+        meetingDeviceService.remove(deviceId);
+        return ApiResult.success();
+    }
+
 }
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingFaceController.java

@@ -5,6 +5,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.meeting.annotation.FaceLog;
 import com.usky.meeting.domain.MeetingFace;
 import com.usky.meeting.service.MeetingFaceService;
@@ -44,7 +46,7 @@ public class MeetingFaceController {
 
     @GetMapping("/faceList")
     @ApiOperation(value = "人脸列表",notes = "查询所有的人脸信息")
-    public FaceResultVO faceList(
+    public ApiResult<CommonPage<MeetingFace>> faceList(
             @RequestParam Integer current,
             @RequestParam Integer size,
             @RequestParam(required = false) String faceName,
@@ -53,7 +55,7 @@ public class MeetingFaceController {
         IPage<MeetingFace> page = faceService.page(new Page(current, size), new QueryWrapper<MeetingFace>()
                 .like(StrUtil.isNotBlank(faceName),"face_name",faceName)
                 .like(StrUtil.isNotBlank(faceStatus),"face_status",faceStatus));
-        return FaceResultVO.success(page);
+        return ApiResult.success(new CommonPage<>(page.getRecords(),page.getTotal(),size,current));
     }
 
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingFaceVefLogController.java

@@ -5,6 +5,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.meeting.domain.MeetingFaceVefLog;
 import com.usky.meeting.service.MeetingFaceVefLogService;
 import com.usky.meeting.service.vo.FaceResultVO;
@@ -38,7 +40,7 @@ public class MeetingFaceVefLogController {
 
     @GetMapping("/list")
     @ApiOperation(value = "日志接口",notes = "查询所有验证人脸日志信息")
-    public FaceResultVO faceList(
+    public ApiResult<CommonPage<MeetingFaceVefLog>> faceList(
             @RequestParam Integer current,
             @RequestParam Integer size,
             @RequestParam(required = false) String startTime,
@@ -51,7 +53,7 @@ public class MeetingFaceVefLogController {
                 .like(StrUtil.isNotBlank(loginName),"login_name",loginName)
                 .between(StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime),"vef_time",startTime,endTime)
                 .orderByDesc("vef_time"));
-        return FaceResultVO.success(page);
+        return ApiResult.success(new CommonPage<>(page.getRecords(),page.getTotal(),size,current));
     }
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingFloorController.java

@@ -1,7 +1,15 @@
 package com.usky.meeting.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.meeting.domain.MeetingFloor;
+import com.usky.meeting.service.MeetingFloorService;
+import com.usky.meeting.service.vo.MeetingFloorRequestVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 
@@ -13,9 +21,55 @@ import org.springframework.stereotype.Controller;
  * @author zyj
  * @since 2024-03-08
  */
-@Controller
+@RestController
+@RequiredArgsConstructor
 @RequestMapping("/meetingFloor")
 public class MeetingFloorController {
+    @Autowired
+    private MeetingFloorService meetingFloorService;
+
+    /**
+     * 楼层列表
+     * @param requestVO
+     * @return
+     */
+    @PostMapping("meetingFloorList")
+    public ApiResult<CommonPage<MeetingFloor>> meetingFloorList(@RequestBody MeetingFloorRequestVO requestVO){
+        return ApiResult.success(meetingFloorService.meetingFloorList(requestVO));
+    }
+
+    /**
+     * 新增
+     * @param meetingFloor
+     * @return
+     */
+    @PostMapping
+    public ApiResult<Void> add(@RequestBody MeetingFloor meetingFloor){
+        meetingFloorService.add(meetingFloor);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改
+     * @param meetingFloor
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Void> edit(@RequestBody MeetingFloor meetingFloor){
+        meetingFloorService.edit(meetingFloor);
+        return  ApiResult.success();
+    }
+
+    /**
+     * 删除
+     * @param floorId
+     * @return
+     */
+    @DeleteMapping
+    public ApiResult<Void> remove(@RequestParam(value = "floorId") Long floorId){
+        meetingFloorService.remove(floorId);
+        return ApiResult.success();
+    }
 
 }
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingApprove.java

@@ -51,5 +51,15 @@ public class MeetingApprove implements Serializable {
      */
     private LocalDateTime approveDate;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingApproveUser.java

@@ -33,5 +33,15 @@ public class MeetingApproveUser implements Serializable {
      */
     private String dmUserId;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingAttendee.java

@@ -59,5 +59,15 @@ public class MeetingAttendee implements Serializable {
      */
     private Long signType;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingDevice.java

@@ -2,9 +2,15 @@ package com.usky.meeting.domain;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
 /**
  * <p>
  * 设备表
@@ -14,12 +20,16 @@ import lombok.EqualsAndHashCode;
  * @since 2024-03-08
  */
 @Data
+@Entity
+@TableName("meeting_device")
 @EqualsAndHashCode(callSuper = false)
 public class MeetingDevice implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private String deviceId;
+    @Id
+    @TableId
+    private Long deviceId;
 
     /**
      * 设备名称
@@ -86,5 +96,15 @@ public class MeetingDevice implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingFace.java

@@ -72,5 +72,15 @@ public class MeetingFace implements Serializable {
      */
     private String updateExtend3;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingFaceVefLog.java

@@ -47,5 +47,15 @@ public class MeetingFaceVefLog implements Serializable {
      */
     private String loginName;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingFile.java

@@ -54,5 +54,15 @@ public class MeetingFile implements Serializable {
      */
     private LocalDateTime uploadTime;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingFloor.java

@@ -2,9 +2,15 @@ package com.usky.meeting.domain;
 
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
 /**
  * <p>
  * 楼层表
@@ -14,11 +20,15 @@ import lombok.EqualsAndHashCode;
  * @since 2024-03-08
  */
 @Data
+@Entity
+@TableName("meeting_floor")
 @EqualsAndHashCode(callSuper = false)
 public class MeetingFloor implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Id
+    @TableId
     private Long floorId;
 
     /**
@@ -61,5 +71,15 @@ public class MeetingFloor implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingInfo.java

@@ -166,5 +166,10 @@ public class MeetingInfo implements Serializable {
      */
     private String meetingMode;
 
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingRoom.java

@@ -136,5 +136,15 @@ public class MeetingRoom implements Serializable {
     @TableField(exist = false)
     private MeetingFloor meetingFloor;
 
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
 
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/MeetingDeviceService.java

@@ -1,7 +1,10 @@
 package com.usky.meeting.service;
 
+import com.usky.common.core.bean.CommonPage;
 import com.usky.meeting.domain.MeetingDevice;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.meeting.service.vo.MeetingDeviceRequestVO;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -13,4 +16,12 @@ import com.usky.common.mybatis.core.CrudService;
  */
 public interface MeetingDeviceService extends CrudService<MeetingDevice> {
 
+    CommonPage<MeetingDevice> meetingDeviceList(MeetingDeviceRequestVO requestVO);
+
+    void add(MeetingDevice meetingDevice);
+
+    void edit(MeetingDevice meetingDevice);
+
+    void remove(Long deviceId);
+
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/MeetingFloorService.java

@@ -1,7 +1,10 @@
 package com.usky.meeting.service;
 
+import com.usky.common.core.bean.CommonPage;
 import com.usky.meeting.domain.MeetingFloor;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.meeting.service.vo.MeetingFloorRequestVO;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * <p>
@@ -13,4 +16,11 @@ import com.usky.common.mybatis.core.CrudService;
  */
 public interface MeetingFloorService extends CrudService<MeetingFloor> {
 
+    CommonPage<MeetingFloor> meetingFloorList(MeetingFloorRequestVO requestVO);
+
+    void add(MeetingFloor meetingFloor);
+
+    void edit(MeetingFloor meetingFloor);
+
+    void remove(Long floorId);
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingDeviceServiceImpl.java

@@ -1,11 +1,31 @@
 package com.usky.meeting.service.impl;
 
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.meeting.domain.MeetingDevice;
+import com.usky.meeting.domain.MeetingFloor;
 import com.usky.meeting.mapper.MeetingDeviceMapper;
 import com.usky.meeting.service.MeetingDeviceService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.meeting.service.vo.MeetingDeviceRequestVO;
+import net.bytebuddy.implementation.bytecode.Throw;
+import org.aspectj.weaver.patterns.ThisOrTargetAnnotationPointcut;
+import org.bouncycastle.jcajce.provider.symmetric.AES;
+import org.springframework.data.util.Optionals;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * <p>
  * 设备表 服务实现类
@@ -17,4 +37,62 @@ import org.springframework.stereotype.Service;
 @Service
 public class MeetingDeviceServiceImpl extends AbstractCrudService<MeetingDeviceMapper, MeetingDevice> implements MeetingDeviceService {
 
+    @Override
+    public CommonPage<MeetingDevice> meetingDeviceList(MeetingDeviceRequestVO requestVO){
+        Integer current = requestVO.getCurrent();
+        Integer size = requestVO.getSize();
+        IPage<MeetingDevice> page = new Page<>(current,size);
+        LambdaQueryWrapper<MeetingDevice> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(requestVO.getDeviceName()),MeetingDevice::getDeviceName,requestVO.getDeviceName())
+                .like(StringUtils.isNotBlank(requestVO.getNameplate()),MeetingDevice::getNameplate,requestVO.getNameplate())
+                .like(StringUtils.isNotBlank(requestVO.getMaintainer()),MeetingDevice::getMaintainer,requestVO.getMaintainer())
+                .like(StringUtils.isNotBlank(requestVO.getContacts()),MeetingDevice::getContacts,requestVO.getContacts())
+                .like(StringUtils.isNotBlank(requestVO.getRemark()),MeetingDevice::getRemark,requestVO.getRemark())
+                .orderByAsc(MeetingDevice::getDeviceId);
+        page = this.page(page,queryWrapper);
+
+        return new CommonPage<>(page.getRecords(),page.getTotal(),size,current);
+    }
+
+    @Override
+    public void add(MeetingDevice meetingDevice){
+        if(checkNameUnique(meetingDevice)){
+            throw new BusinessException("新增会议室设备失败，"+meetingDevice.getDeviceName()+"已经存在");
+        }
+//        Snowflake snowflake = IdUtil.createSnowflake(1,1);
+//        meetingDevice.setDeviceId(snowflake.nextId());
+        meetingDevice.setCreateBy(SecurityUtils.getUsername());
+        meetingDevice.setCreateTime(LocalDateTime.now());
+        meetingDevice.setTenantId(SecurityUtils.getTenantId());
+        this.save(meetingDevice);
+
+    }
+
+    @Override
+    public void edit(MeetingDevice meetingDevice){
+        if(checkNameUnique(meetingDevice)){
+            throw new BusinessException("修改会议室设备失败，"+meetingDevice.getDeviceName()+"已经存在");
+        }
+        meetingDevice.setUpdateBy(SecurityUtils.getUsername());
+        meetingDevice.setUpdateTime(LocalDateTime.now());
+
+        this.updateById(meetingDevice);
+    }
+
+    @Override
+    public void remove(Long deviceId){
+        MeetingDevice meetingDevice = this.getById(deviceId);
+        Optional.ofNullable(meetingDevice).orElseThrow(() -> new BusinessException("该会议室设备不存在"));
+        this.removeById(deviceId);
+
+    }
+
+    public boolean checkNameUnique(MeetingDevice meetingDevice){
+        Long deviceId = null == meetingDevice.getDeviceId()?-1:meetingDevice.getDeviceId();
+        LambdaQueryWrapper<MeetingDevice> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(MeetingDevice::getDeviceName,meetingDevice.getDeviceName())
+                .eq(MeetingDevice::getTenantId,SecurityUtils.getTenantId());
+        MeetingDevice one = this.getOne(queryWrapper);
+        return null != one && !Objects.equals(one.getDeviceId(),deviceId);
+    }
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingFloorServiceImpl.java

@@ -1,11 +1,27 @@
 package com.usky.meeting.service.impl;
 
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.security.utils.SecurityUtils;
 import com.usky.meeting.domain.MeetingFloor;
 import com.usky.meeting.mapper.MeetingFloorMapper;
 import com.usky.meeting.service.MeetingFloorService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.meeting.service.vo.MeetingFloorRequestVO;
+import net.bytebuddy.implementation.bytecode.Throw;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * <p>
  * 楼层表 服务实现类
@@ -17,4 +33,63 @@ import org.springframework.stereotype.Service;
 @Service
 public class MeetingFloorServiceImpl extends AbstractCrudService<MeetingFloorMapper, MeetingFloor> implements MeetingFloorService {
 
+    @Override
+    public CommonPage<MeetingFloor> meetingFloorList(MeetingFloorRequestVO requestVO){
+        Integer current = requestVO.getCurrent();
+        Integer size = requestVO.getSize();
+        IPage<MeetingFloor> page = new Page<>(current,size);
+        LambdaQueryWrapper<MeetingFloor> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(requestVO.getFloorName()),MeetingFloor::getFloorName,requestVO.getFloorName())
+                .like(StringUtils.isNotBlank(requestVO.getFloorPic()),MeetingFloor::getFloorPic,requestVO.getFloorPic())
+                .like(StringUtils.isNotBlank(requestVO.getContacts()),MeetingFloor::getContacts,requestVO.getContacts())
+                .eq(MeetingFloor::getTenantId,SecurityUtils.getTenantId())
+                .orderByAsc(MeetingFloor::getSortIndex);
+        page = this.page(page,queryWrapper);
+
+        return new CommonPage<>(page.getRecords(),page.getTotal(),size,current);
+
+    }
+
+    @Override
+    public void add(MeetingFloor meetingFloor){
+        if(checkNameUnique(meetingFloor)){
+            throw new BusinessException("新增楼层信息失败，"+meetingFloor.getFloorName()+"已经存在");
+        }
+//        Snowflake snowflake = IdUtil.createSnowflake(1,1);
+//        meetingFloor.setFloorId(snowflake.nextId());
+        meetingFloor.setCreateBy(SecurityUtils.getUsername());
+        meetingFloor.setCreateTime(LocalDateTime.now());
+        meetingFloor.setTenantId(SecurityUtils.getTenantId());
+
+        this.save(meetingFloor);
+    }
+
+    @Override
+    public void edit(MeetingFloor meetingFloor){
+        if(checkNameUnique(meetingFloor)){
+            throw new BusinessException("修改楼层信息失败，"+meetingFloor.getFloorName()+"已经存在");
+        }
+        meetingFloor.setUpdateBy(SecurityUtils.getUsername());
+        meetingFloor.setUpdateTime(LocalDateTime.now());
+
+        this.updateById(meetingFloor);
+    }
+
+    @Override
+    public void remove(Long floorId){
+        MeetingFloor meetingFloor = this.getById(floorId);
+        Optional.ofNullable(meetingFloor).orElseThrow(() -> new BusinessException("该楼层信息不存在"));
+
+        this.removeById(floorId);
+    }
+
+    public boolean checkNameUnique(MeetingFloor meetingFloor){
+        Long id = null == meetingFloor.getFloorId()?-1:meetingFloor.getFloorId();
+        LambdaQueryWrapper<MeetingFloor> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(MeetingFloor::getFloorName,meetingFloor.getFloorName())
+                .eq(MeetingFloor::getTenantId, SecurityUtils.getTenantId());
+        MeetingFloor one = this.getOne(queryWrapper);
+        return null != one && !Objects.equals(one.getFloorId(),id);
+
+    }
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/vo/MeetingDeviceRequestVO.java

@@ -0,0 +1,41 @@
+package com.usky.meeting.service.vo;
+
+import lombok.Data;
+
+@Data
+public class MeetingDeviceRequestVO {
+
+    /**
+     * 页数
+     */
+    private Integer current;
+    /**
+     * 条数
+     */
+    private Integer size;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备铭牌
+     */
+    private String nameplate;
+
+    /**
+     * 维护人
+     */
+    private String maintainer;
+
+    /**
+     * 联系方式
+     */
+    private String contacts;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/vo/MeetingFloorRequestVO.java

@@ -0,0 +1,32 @@
+package com.usky.meeting.service.vo;
+
+import lombok.Data;
+
+@Data
+public class MeetingFloorRequestVO {
+
+    /**
+     * 页数
+     */
+    private Integer current;
+    /**
+     * 条数
+     */
+    private Integer size;
+
+    /**
+     * 楼层名称
+     */
+    private String floorName;
+
+    /**
+     * 楼层负责人(person in charge)
+     */
+    private String floorPic;
+
+    /**
+     * 联系方式
+     */
+    private String contacts;
+
+}

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingApproveMapper.xml

@@ -11,6 +11,8 @@
         <result column="approve_result" property="approveResult" />
         <result column="approve_suggest" property="approveSuggest" />
         <result column="approve_date" property="approveDate" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingApproveUserMapper.xml

@@ -7,6 +7,8 @@
         <id column="id" property="id" />
         <result column="meeting_id" property="meetingId" />
         <result column="dm_user_id" property="dmUserId" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingAttendeeMapper.xml

@@ -12,6 +12,8 @@
         <result column="is_sign_out" property="isSignOut" />
         <result column="sign_out_date" property="signOutDate" />
         <result column="sign_type" property="signType" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingDeviceMapper.xml

@@ -18,6 +18,8 @@
         <result column="update_by" property="updateBy" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingFaceMapper.xml

@@ -14,6 +14,8 @@
         <result column="update_extend1" property="updateExtend1" />
         <result column="update_extend2" property="updateExtend2" />
         <result column="update_extend3" property="updateExtend3" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingFaceVefLogMapper.xml

@@ -9,6 +9,8 @@
         <result column="vef_code" property="vefCode" />
         <result column="vef_msg" property="vefMsg" />
         <result column="login_name" property="loginName" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingFileMapper.xml

@@ -11,6 +11,8 @@
         <result column="file_type" property="fileType" />
         <result column="upload_user" property="uploadUser" />
         <result column="upload_time" property="uploadTime" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingFloorMapper.xml

@@ -13,6 +13,8 @@
         <result column="update_by" property="updateBy" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingInfoMapper.xml

@@ -33,6 +33,7 @@
         <result column="is_approve" property="isApprove" />
         <result column="gc_assign_user" property="gcAssignUser" />
         <result column="meeting_mode" property="meetingMode" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>

service-meeting/service-meeting-biz/src/main/resources/mapper/meeting/MeetingRoomMapper.xml

@@ -25,6 +25,8 @@
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />
         <result column="is_approve" property="isApprove" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
 
 </mapper>