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

pom.xml

@@ -77,7 +77,7 @@
 
 
 
-    <module>service-meet</module>
+    <module>service-meeting</module>
 
   </modules>
           

service-meet/service-meet-biz/src/main/java/com/usky/demo/controller/api/SysUserControllerApi.java

@@ -1,60 +0,0 @@
-//package com.usky.demo.controller.api;
-//
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-//import com.usky.common.core.bean.ApiResult;
-//import com.usky.common.core.exception.BusinessException;
-//import com.usky.common.core.util.BeanMapperUtils;
-//import com.usky.common.core.util.FileUtils;
-//import com.usky.common.core.util.GlobalUtils;
-//import com.usky.demo.domain.SysUser;
-//import com.usky.demo.service.SysUserService;
-//import com.usky.system.RemoteUserService;
-//import com.usky.system.domain.SysUserVO;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.RestController;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import java.io.File;
-//import java.io.IOException;
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Optional;
-//
-//@RestController
-//public class SysUserControllerApi implements RemoteUserService {
-//
-//    @Autowired
-//    private SysUserService sysUserService;
-//    @Override
-//    public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-//        LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
-//        queryWrapper.eq(SysUser::getUserName,userName);
-//        return ApiResult.success(BeanMapperUtils.mapList(sysUserService.list(queryWrapper),SysUser.class,SysUserVO.class));
-//    }
-//
-//    @Override
-//    public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-//        sysUserService.save(BeanMapperUtils.map(sysUserVO, SysUser.class));
-//        return ApiResult.success(new ArrayList<>());
-//    }
-//
-//    @Override
-//    public ApiResult<String> upload(MultipartFile multipartFile) {
-//        Optional.ofNullable(multipartFile).orElseThrow(() ->  new BusinessException("文件为空"));
-//        String originalFilename = multipartFile.getOriginalFilename();
-//        String newFileName = System.currentTimeMillis() + originalFilename;
-//        File file = FileUtils.getFile(GlobalUtils.getTempBaseDir(), newFileName);
-//        String urlPath = "";
-//        try {
-//            try {
-//                multipartFile.transferTo(file);
-//            } catch (IOException e) {
-//                throw new BusinessException("文件上传失败");
-//            }
-//        } catch (Exception e) {
-//
-//        }
-//        return ApiResult.success(urlPath);
-//    }
-//}

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

@@ -1,36 +0,0 @@
-package com.usky.demo.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.demo.domain.SysUser;
-import com.usky.demo.service.SysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * <p>
- * 用户信息表 前端控制器
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-@RestController
-@RequestMapping("/sysUser")
-public class SysUserController {
-
-
-    @Autowired
-    private SysUserService sysUserService;
-
-    @GetMapping("/list")
-    public ApiResult<List<SysUser>> list(){
-        return ApiResult.success(sysUserService.list());
-    }
-}
-

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

@@ -1,123 +0,0 @@
-package com.usky.demo.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;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 用户信息表
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysUser implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 用户ID
-     */
-    @TableId(value = "user_id", type = IdType.AUTO)
-    private Long userId;
-
-    /**
-     * 部门ID
-     */
-    private Long deptId;
-
-    /**
-     * 用户账号
-     */
-    private String userName;
-
-    /**
-     * 用户昵称
-     */
-    private String nickName;
-
-    /**
-     * 用户类型（00系统用户）
-     */
-    private String userType;
-
-    /**
-     * 用户邮箱
-     */
-    private String email;
-
-    /**
-     * 手机号码
-     */
-    private String phonenumber;
-
-    /**
-     * 用户性别（0男 1女 2未知）
-     */
-    private String sex;
-
-    /**
-     * 头像地址
-     */
-    private String avatar;
-
-    /**
-     * 密码
-     */
-    private String password;
-
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private String delFlag;
-
-    /**
-     * 最后登录IP
-     */
-    private String loginIp;
-
-    /**
-     * 最后登录时间
-     */
-    private LocalDateTime loginDate;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-}

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

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

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

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

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

@@ -1,15 +0,0 @@
-package com.usky.demo.mapper;
-
-import com.usky.common.mybatis.core.CrudMapper;
-import com.usky.demo.domain.SysUser;
-
-/**
- * <p>
- * 用户信息表 Mapper 接口
- * </p>
- *
- * @since 2022-04-21
- */
-public interface SysUserMapper extends CrudMapper<SysUser> {
-
-}

service-meet/service-meet-biz/src/main/java/com/usky/demo/service/FaceVefLogService.java

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

service-meet/service-meet-biz/src/main/java/com/usky/demo/service/SysUserService.java

@@ -1,17 +0,0 @@
-package com.usky.demo.service;
-
-import com.usky.common.mybatis.core.CrudService;
-import com.usky.demo.domain.SysUser;
-
-
-/**
- * <p>
- * 用户信息表 服务类
- * </p>
- *
- * @author ya
- * @since 2022-04-21
- */
-public interface SysUserService extends CrudService<SysUser> {
-
-}

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

@@ -1,20 +0,0 @@
-package com.usky.demo.service.impl;
-
-import com.usky.demo.domain.FaceVefLog;
-import com.usky.demo.mapper.FaceVefLogMapper;
-import com.usky.demo.service.FaceVefLogService;
-import com.usky.common.mybatis.core.AbstractCrudService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zyj
- * @since 2024-03-06
- */
-@Service
-public class FaceVefLogServiceImpl extends AbstractCrudService<FaceVefLogMapper, FaceVefLog> implements FaceVefLogService {
-
-}

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

@@ -1,18 +0,0 @@
-package com.usky.demo.service.impl;
-
-import com.usky.common.mybatis.core.AbstractCrudService;
-import com.usky.demo.domain.SysUser;
-import com.usky.demo.mapper.SysUserMapper;
-import com.usky.demo.service.SysUserService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 用户信息表 服务实现类
- * </p>
- *
- */
-@Service
-public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUser> implements SysUserService {
-
-}

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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,55 @@
+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

@@ -0,0 +1,55 @@
+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

@@ -0,0 +1,37 @@
+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

@@ -0,0 +1,63 @@
+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

@@ -0,0 +1,90 @@
+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/demo/domain/Face.java → service-meet/service-meet-biz/src/main/java/com/usky/meet/domain/MeetingFace.java

@@ -1,4 +1,4 @@
-package com.usky.demo.domain;
+package com.usky.meet.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,11 +13,11 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author zyj
- * @since 2024-03-06
+ * @since 2024-03-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class Face implements Serializable {
+public class MeetingFace implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,4 +1,4 @@
-package com.usky.demo.domain;
+package com.usky.meet.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,11 +13,11 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author zyj
- * @since 2024-03-06
+ * @since 2024-03-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class FaceVefLog implements Serializable {
+public class MeetingFaceVefLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -0,0 +1,58 @@
+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

@@ -0,0 +1,65 @@
+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

@@ -0,0 +1,165 @@
+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

@@ -0,0 +1,125 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,20 @@
+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.demo/SysUserMapper.xml

@@ -1,28 +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.demo.mapper.SysUserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.demo.domain.SysUser">
-        <id column="user_id" property="userId" />
-        <result column="dept_id" property="deptId" />
-        <result column="user_name" property="userName" />
-        <result column="nick_name" property="nickName" />
-        <result column="user_type" property="userType" />
-        <result column="email" property="email" />
-        <result column="phonenumber" property="phonenumber" />
-        <result column="sex" property="sex" />
-        <result column="avatar" property="avatar" />
-        <result column="password" property="password" />
-        <result column="status" property="status" />
-        <result column="del_flag" property="delFlag" />
-        <result column="login_ip" property="loginIp" />
-        <result column="login_date" property="loginDate" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>

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

@@ -0,0 +1,16 @@
+<?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

@@ -0,0 +1,16 @@
+<?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

@@ -0,0 +1,12 @@
+<?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

@@ -0,0 +1,17 @@
+<?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

@@ -0,0 +1,23 @@
+<?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/demo/FaceMapper.xml → service-meet/service-meet-biz/src/main/resources/mapper/meet/MeetingFaceMapper.xml

@@ -1,9 +1,9 @@
 <?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.demo.mapper.FaceMapper">
+<mapper namespace="com.usky.meet.mapper.MeetingFaceMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.demo.domain.Face">
+    <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" />

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

@@ -1,9 +1,9 @@
 <?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.demo.mapper.FaceVefLogMapper">
+<mapper namespace="com.usky.meet.mapper.MeetingFaceVefLogMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.demo.domain.FaceVefLog">
+    <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" />

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

@@ -0,0 +1,16 @@
+<?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

@@ -0,0 +1,18 @@
+<?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

@@ -0,0 +1,38 @@
+<?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

@@ -0,0 +1,30 @@
+<?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-meet/pom.xml → service-meeting/pom.xml

@@ -7,11 +7,11 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-meet</artifactId>
+    <artifactId>service-meeting</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>service-meet-biz</module>
-        <module>service-meet-api</module>
+        <module>service-meeting-biz</module>
+        <module>service-meeting-api</module>
   </modules>
 
 </project>

service-meet/service-meet-api/pom.xml → service-meeting/service-meeting-api/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>service-meet</artifactId>
+        <artifactId>service-meeting</artifactId>
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-meet-api</artifactId>
+    <artifactId>service-meeting-api</artifactId>
     <!-- SpringCloud Openfeign -->
     <dependencies>
         <dependency>

service-meet/service-meet-biz/pom.xml → service-meeting/service-meeting-biz/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>service-meet</artifactId>
+        <artifactId>service-meeting</artifactId>
         <groupId>com.usky</groupId>
         <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>service-meet-biz</artifactId>
+    <artifactId>service-meeting-biz</artifactId>
     <dependencies>
         <dependency>
             <groupId>com.usky</groupId>
@@ -89,6 +89,16 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>2.2</version>
+        </dependency>
+        <!--引入JPA依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

service-meet/service-meet-biz/src/main/java/com/usky/demo/ApplicationRun.java → service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/ApplicationRun.java

@@ -1,4 +1,4 @@
-package com.usky.demo;
+package com.usky.meeting;
 
 
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
@@ -11,7 +11,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -25,7 +24,7 @@ import java.net.UnknownHostException;
 @EnableCustomSwagger2
 //@EnableSwagger2
 @EnableFeignClients(basePackages = "com.usky")
-@MapperScan(value = "com.usky.demo.mapper")
+@MapperScan(value = "com.usky.meeting.mapper")
 @ComponentScan("com.usky")
 @SpringBootApplication
 public class ApplicationRun

service-meet/service-meet-biz/src/main/java/com/usky/demo/MybatisGenerator.java → service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/MybatisGenerator.java

@@ -1,4 +1,4 @@
-package com.usky.demo;//package com.usky.demo.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
+package com.usky.meeting;//package com.usky.demo.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
 
 
 
@@ -17,7 +17,7 @@ import java.util.List;
 public class MybatisGenerator {
     public static void main(String[] args) {
 
-            shell("service-meet","service-meet-biz");
+            shell("service-meeting","service-meeting-biz");
     }
 
     private static void shell(String parentName,String model) {
@@ -42,7 +42,7 @@ public class MybatisGenerator {
         //2、数据源配置
         //修改数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://172.16.120.165:3306/dm_meeting?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setUrl("jdbc:mysql://172.16.120.165:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
         dsc.setDriverName("com.mysql.jdbc.Driver");
         dsc.setUsername("usky");
         dsc.setPassword("Yt#75Usky");
@@ -50,7 +50,7 @@ public class MybatisGenerator {
 
         // 3、包配置
         PackageConfig pc = new PackageConfig();
-        pc.setParent("com.usky.demo");
+        pc.setParent("com.usky.meeting");
         pc.setController("controller.web");
         pc.setEntity("domain");
         pc.setMapper("mapper");
@@ -70,7 +70,7 @@ public class MybatisGenerator {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("face","face_vef_log");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("meeting_approve","meeting_approve_user","meeting_attendee","meeting_device","meeting_face","meeting_face_vef_log","meeting_file","meeting_floor","meeting_info","meeting_room");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录
@@ -93,7 +93,7 @@ public class MybatisGenerator {
             @Override
             public String outputFile(TableInfo tableInfo) {
                 // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
-                return finalProjectPath + "/src/main/resources/mapper/demo" + "/"
+                return finalProjectPath + "/src/main/resources/mapper/meeting" + "/"
                         + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
             }
         });

service-meet/service-meet-biz/src/main/java/com/usky/demo/annotation/FaceLog.java → service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/annotation/FaceLog.java

@@ -1,4 +1,4 @@
-package com.usky.demo.annotation;
+package com.usky.meeting.annotation;
 
 import java.lang.annotation.*;
 

service-meet/service-meet-biz/src/main/java/com/usky/demo/annotation/aspect/FaceAspect.java → service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/annotation/aspect/FaceAspect.java

@@ -1,18 +1,17 @@
-package com.usky.demo.annotation.aspect;
+package com.usky.meeting.annotation.aspect;
 
 
-import com.usky.demo.domain.FaceVefLog;
-import com.usky.demo.service.FaceVefLogService;
-import com.usky.demo.service.vo.FaceResultVO;
+
+import com.usky.meeting.domain.MeetingFaceVefLog;
+import com.usky.meeting.service.MeetingFaceVefLogService;
+import com.usky.meeting.service.vo.FaceResultVO;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * @author tanyongpeng
@@ -23,12 +22,12 @@ import java.util.Date;
 public class FaceAspect {
 
     @Autowired
-    private FaceVefLogService faceVefLogService;
+    private MeetingFaceVefLogService faceVefLogService;
 
-    @AfterReturning(value = "@annotation(com.usky.demo.annotation.FaceLog)",returning = "res")
+    @AfterReturning(value = "@annotation(com.usky.meeting.annotation.FaceLog)",returning = "res")
     public void addLog(JoinPoint joinPoint ,Object res){
         FaceResultVO result = (FaceResultVO)res;
-        FaceVefLog faceVefLog = new FaceVefLog();
+        MeetingFaceVefLog faceVefLog = new MeetingFaceVefLog();
         faceVefLog.setVefTime(LocalDateTime.now());
         faceVefLog.setVefCode(result.getCode());
         faceVefLog.setVefMsg(result.getMsg());

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

@@ -0,0 +1,21 @@
+package com.usky.meeting.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-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingApproveUserController.java

@@ -0,0 +1,21 @@
+package com.usky.meeting.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-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingAttendeeController.java

@@ -0,0 +1,21 @@
+package com.usky.meeting.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-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingDeviceController.java

@@ -0,0 +1,21 @@
+package com.usky.meeting.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/demo/controller/web/FaceController.java → service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingFaceController.java

@@ -1,14 +1,14 @@
-package com.usky.demo.controller.web;
+package com.usky.meeting.controller.web;
 
 
 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.demo.annotation.FaceLog;
-import com.usky.demo.domain.Face;
-import com.usky.demo.service.FaceService;
-import com.usky.demo.service.vo.FaceResultVO;
+import com.usky.meeting.annotation.FaceLog;
+import com.usky.meeting.domain.MeetingFace;
+import com.usky.meeting.service.MeetingFaceService;
+import com.usky.meeting.service.vo.FaceResultVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.stereotype.Controller;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * <p>
@@ -26,16 +25,15 @@ import java.util.Date;
  * </p>
  *
  * @author zyj
- * @since 2024-03-06
+ * @since 2024-03-08
  */
 @RestController
-@RequestMapping("/face")
+@RequestMapping("/meetingFace")
 @Api("人脸验证接口")
 @Slf4j
-public class FaceController {
-
+public class MeetingFaceController {
     @Autowired
-    FaceService faceService;
+    MeetingFaceService faceService;
 
     @PostMapping("/vef")
     @ApiOperation(value="人脸验证", notes="根据传入的base64编码和数据的base64编码进行对比")
@@ -52,7 +50,7 @@ public class FaceController {
             @RequestParam(required = false) String faceName,
             @RequestParam(required = false) String faceStatus
     ){
-        IPage<Face> page = faceService.page(new Page(current, size), new QueryWrapper<Face>()
+        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);
@@ -74,7 +72,7 @@ public class FaceController {
 
     @PostMapping("/save")
     @ApiOperation(value = "添加")
-    public FaceResultVO save(@RequestBody Face face){
+    public FaceResultVO save(@RequestBody MeetingFace face){
         face.setVefNum(0);
         face.setCreateTime(LocalDateTime.now());
         faceService.save(face);
@@ -83,10 +81,9 @@ public class FaceController {
 
     @PostMapping("/update")
     @ApiOperation(value = "修改")
-    public FaceResultVO update(@RequestBody Face face){
+    public FaceResultVO update(@RequestBody MeetingFace face){
         faceService.updateById(face);
         return FaceResultVO.success("修改成功");
     }
-
 }
 

service-meet/service-meet-biz/src/main/java/com/usky/demo/controller/web/FaceVefLogController.java → service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingFaceVefLogController.java

@@ -1,13 +1,13 @@
-package com.usky.demo.controller.web;
+package com.usky.meeting.controller.web;
 
 
 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.demo.domain.FaceVefLog;
-import com.usky.demo.service.FaceVefLogService;
-import com.usky.demo.service.vo.FaceResultVO;
+import com.usky.meeting.domain.MeetingFaceVefLog;
+import com.usky.meeting.service.MeetingFaceVefLogService;
+import com.usky.meeting.service.vo.FaceResultVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -25,16 +25,16 @@ import org.springframework.web.bind.annotation.RestController;
  * </p>
  *
  * @author zyj
- * @since 2024-03-06
+ * @since 2024-03-08
  */
 @RestController
-@RequestMapping("/face/log")
+@RequestMapping("/meetingFaceVefLog")
 @Api("人脸日志接口")
 @Slf4j
-public class FaceVefLogController {
+public class MeetingFaceVefLogController {
 
     @Autowired
-    FaceVefLogService faceVefLogService;
+    MeetingFaceVefLogService faceVefLogService;
 
     @GetMapping("/list")
     @ApiOperation(value = "日志接口",notes = "查询所有验证人脸日志信息")
@@ -46,7 +46,7 @@ public class FaceVefLogController {
             @RequestParam(required = false) String vefCode,
             @RequestParam(required = false) String loginName
     ){
-        IPage<FaceVefLog> page = faceVefLogService.page(new Page(current, size), new QueryWrapper<FaceVefLog>()
+        IPage<MeetingFaceVefLog> page = faceVefLogService.page(new Page(current, size), new QueryWrapper<MeetingFaceVefLog>()
                 .like(StrUtil.isNotBlank(vefCode),"vef_code",vefCode)
                 .like(StrUtil.isNotBlank(loginName),"login_name",loginName)
                 .between(StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime),"vef_time",startTime,endTime)

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

@@ -0,0 +1,21 @@
+package com.usky.meeting.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-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingFloorController.java

@@ -0,0 +1,21 @@
+package com.usky.meeting.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-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingInfoController.java

@@ -0,0 +1,21 @@
+package com.usky.meeting.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-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingRoomController.java

@@ -0,0 +1,53 @@
+package com.usky.meeting.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.meeting.domain.MeetingRoom;
+import com.usky.meeting.service.MeetingRoomService;
+import com.usky.meeting.service.vo.MeetingRoomRequestVO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 会议室表 前端控制器
+ * </p>
+ *
+ * @author zyj
+ * @since 2024-03-08
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/meetingRoom")
+public class MeetingRoomController {
+    @Autowired
+    private MeetingRoomService meetingRoomService;
+
+    /**
+     * 首页统计
+     * @param year
+     * @return
+     */
+    @GetMapping("FirstPageStatistic")
+    public ApiResult<Map<String,Object>> FirstPageStatistic(@RequestParam(value = "year") String year){
+        return ApiResult.success(meetingRoomService.FirstPageStatistic(year));
+
+    }
+
+    /**
+     * 会议室列表
+     * @param requestVO
+     * @return
+     */
+    @PostMapping("dmMeetingRoomList")
+    public ApiResult<CommonPage<MeetingRoom>> dmMeetingRoomList(@RequestBody MeetingRoomRequestVO requestVO){
+        return ApiResult.success(meetingRoomService.dmMeetingRoomList(requestVO));
+
+    }
+
+}
+

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

@@ -0,0 +1,55 @@
+package com.usky.meeting.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-meeting/service-meeting-biz/src/main/java/com/usky/meeting/domain/MeetingApproveUser.java

@@ -0,0 +1,37 @@
+package com.usky.meeting.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;
+
+
+}