add meeting

.gitignore

@@ -70,4 +70,5 @@ xueyi-modules/xueyi-system/target/
 xueyi-modules/xueyi-tenant/target/
 xueyi-visual/xueyi-monitor/target/
 docker/mysql/data/
-docker/nacos/logs/
+docker/nacos/logs/
+logs/

scpJar.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+scp xueyi-modules/xueyi-system/target/xueyi-modules-system.jar root@39.107.77.235:/home/MultiSaas/xueyi-modules/xueyi-system/target/
+
+scp xueyi-modules/xueyi-file/target/xueyi-modules-file.jar root@39.107.77.235:/home/MultiSaas/xueyi-modules/xueyi-file/target/
+
+scp xueyi-modules/xueyi-job/target/xueyi-modules-job.jar root@39.107.77.235:/home/MultiSaas/xueyi-modules/xueyi-job/target/
+
+scp xueyi-modules/xueyi-tenant/target/xueyi-modules-tenant.jar root@39.107.77.235:/home/MultiSaas/xueyi-modules/xueyi-tenant/target/
+
+scp xueyi-modules/xueyi-gen/target/xueyi-modules-gen.jar root@39.107.77.235:/home/MultiSaas/xueyi-modules/xueyi-gen/target/
+
+scp xueyi-auth/target/xueyi-auth.jar root@39.107.77.235:/home/MultiSaas/xueyi-auth/target/
+
+scp  xueyi-gateway/target/xueyi-gateway.jar root@39.107.77.235:/home/MultiSaas/xueyi-gateway/target/
+
+scp  xueyi-api/xueyi-api-file/target/xueyi-api-file-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-api/xueyi-api-file/target/
+
+scp  xueyi-api/xueyi-api-job/target/xueyi-api-job-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-api/xueyi-api-job/target/
+
+scp  xueyi-api/xueyi-api-system/target/xueyi-api-system-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-api/xueyi-api-system/target/
+
+scp  xueyi-api/xueyi-api-tenant/target/xueyi-api-tenant-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-api/xueyi-api-tenant/target/
+
+scp  xueyi-api/xueyi-api-tenant/target/xueyi-api-tenant-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-api/xueyi-api-tenant/target/
+
+scp  xueyi-gateway/target/xueyi-gateway.jar root@39.107.77.235:/home/MultiSaas/xueyi-gateway/target/
+
+scp  xueyi-common/xueyi-common-log/target/xueyi-common-log-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-common/xueyi-common-log/target/
+
+scp  xueyi-common/xueyi-common-cache/target/xueyi-common-cache-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-common/xueyi-common-cache/target/
+
+scp  xueyi-common/xueyi-common-datascope/target/xueyi-common-datascope-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-common/xueyi-common-datascope/target/
+
+scp  xueyi-common/xueyi-common-seata/target/xueyi-common-seata-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-common/xueyi-common-seata/target/
+
+scp  xueyi-common/xueyi-common-swagger/target/xueyi-common-swagger-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-common/xueyi-common-swagger/target/
+
+scp  xueyi-common/xueyi-common-core/target/xueyi-common-core-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-common/xueyi-common-core/target/
+
+scp  xueyi-common/xueyi-common-datasource/target/xueyi-common-datasource-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-common/xueyi-common-datasource/target/
+
+scp  xueyi-common/xueyi-common-redis/target/xueyi-common-redis-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-common/xueyi-common-redis/target/
+
+scp  xueyi-common/xueyi-common-security/target/xueyi-common-security-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-common/xueyi-common-security/target/
+
+scp  xueyi-common/xueyi-common-web/target/xueyi-common-web-2.5.0.jar root@39.107.77.235:/home/MultiSaas/xueyi-common/xueyi-common-web/target/

scpSys.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+scp xueyi-modules/xueyi-system/target/xueyi-modules-system.jar root@39.107.77.235:/home/MultiSaas/xueyi-modules/xueyi-system/target/

scpSysDocker.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+scp xueyi-modules/xueyi-system/target/xueyi-modules-system.jar root@39.107.77.235:/tmp
+
+docker cp /tmp/xueyi-modules-system.jar xueyi-modules-system:/home/xueyi
+docker restart xueyi-modules-system

xueyi-api/xueyi-api-file/xueyi-api-file.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-api/xueyi-api-job/xueyi-api-job.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-api/xueyi-api-system/xueyi-api-system.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-api/xueyi-api-tenant/xueyi-api-tenant.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-api/xueyi-api.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-auth/xueyi-auth.iml

@@ -10,7 +10,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common-cache/xueyi-common-cache.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common-core/xueyi-common-core.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common-datascope/xueyi-common-datascope.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common-datasource/xueyi-common-datasource.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common-log/xueyi-common-log.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common-redis/xueyi-common-redis.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common-seata/xueyi-common-seata.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common-security/xueyi-common-security.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common-swagger/xueyi-common-swagger.iml

@@ -10,7 +10,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common-web/pom.xml

@@ -15,6 +15,11 @@
         xueyi-common-web通信模块
     </description>
 
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
     <dependencies>
 
         <!-- Mysql Connector -->

xueyi-common/xueyi-common-web/xueyi-common-web.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-common/xueyi-common.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-gateway/xueyi-gateway.iml

@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-modules/xueyi-file/xueyi-modules-file.iml

@@ -10,7 +10,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-modules/xueyi-gen/src/main/java/com/xueyi/gen/service/impl/GenTableServiceImpl.java

@@ -130,6 +130,9 @@ public class GenTableServiceImpl extends BaseServiceImpl<GenTableQuery, GenTable
         try {
             tableList.forEach(table -> {
                 GenUtils.initTable(table);
+                if(null == table.getPrefix()){
+                    table.setPrefix("dm");
+                }
                 int row = baseManager.insert(table);
                 if (row > 0) {
                     List<GenTableColumnDto> columnList = subService.selectDbTableColumnsByName(table.getName());

xueyi-modules/xueyi-gen/src/main/resources/bootstrap.yml

@@ -14,9 +14,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
+#        server-addr: 172.17.0.1:18848
         server-addr: 192.168.65.4:8848
       config:
         # 配置中心地址
+#        server-addr: 172.17.0.1:18848
         server-addr: 192.168.65.4:8848
         # 配置文件格式
         file-extension: yml

xueyi-modules/xueyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="schema"/>
 -- 		where table_schema = (select database())
 		where table_schema LIKE 'xy-%'
-		AND table_name LIKE 'dm_%'
+		AND (table_name LIKE 'dm_%' or table_name LIKE 'sys_%')
 --         AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
 -- 		AND table_name NOT IN (select name from gen_table)
 
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="schema"/>
 -- 		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
 		where table_schema LIKE 'xy-%'
-		AND table_name LIKE 'dm_%'
+		AND (table_name LIKE 'dm_%' or table_name LIKE 'sys_%')
 		and table_name in
 	    <foreach collection="array" item="name" open="(" separator="," close=")">
  			#{name}

xueyi-modules/xueyi-gen/xueyi-modules-gen.iml

@@ -10,7 +10,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-modules/xueyi-job/xueyi-modules-job.iml

@@ -10,7 +10,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-modules/xueyi-modules.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/DmMeetingOrdersController.java

@@ -0,0 +1,108 @@
+package com.xueyi.system.meeting.controller;
+
+import com.xueyi.common.core.web.result.AjaxResult;
+import com.xueyi.common.core.web.validate.V_A;
+import com.xueyi.common.core.web.validate.V_E;
+import com.xueyi.common.log.annotation.Log;
+import com.xueyi.common.log.enums.BusinessType;
+import com.xueyi.common.security.annotation.RequiresPermissions;
+import com.xueyi.common.web.entity.controller.BaseController;
+import com.xueyi.system.meeting.domain.dto.DmMeetingOrdersDto;
+import com.xueyi.system.meeting.domain.query.DmMeetingOrdersQuery;
+import com.xueyi.system.meeting.service.IDmMeetingOrdersService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 会议室预约管理 业务处理
+ *
+ * @author xueyi
+ */
+@RestController
+@RequestMapping("/meeting/orders")
+public class DmMeetingOrdersController extends BaseController<DmMeetingOrdersQuery, DmMeetingOrdersDto, IDmMeetingOrdersService> {
+
+    /** 定义节点名称 */
+    @Override
+    protected String getNodeName() {
+        return "会议室预约" ;
+    }
+
+    /**
+     * 查询会议室预约列表
+     */
+    @Override
+    @GetMapping("/list")
+    @RequiresPermissions(Auth.DM_MEETING_ORDERS_LIST)
+    public AjaxResult list(DmMeetingOrdersQuery dmMeetingOrders) {
+        return super.list(dmMeetingOrders);
+    }
+
+    /**
+     * 查询会议室预约详细
+     */
+    @Override
+    @GetMapping(value = "/{id}")
+    @RequiresPermissions(Auth.DM_MEETING_ORDERS_SINGLE)
+    public AjaxResult getInfo(@PathVariable Serializable id) {
+        return super.getInfo(id);
+    }
+
+    /**
+     * 会议室预约新增
+     */
+    @Override
+    @PostMapping
+    @RequiresPermissions(Auth.DM_MEETING_ORDERS_ADD)
+    @Log(title = "会议室预约管理", businessType = BusinessType.INSERT)
+    public AjaxResult add(@Validated({V_A.class}) @RequestBody DmMeetingOrdersDto dmMeetingOrders) {
+        return super.add(dmMeetingOrders);
+    }
+
+    /**
+     * 会议室预约修改
+     */
+    @Override
+    @PutMapping
+    @RequiresPermissions(Auth.DM_MEETING_ORDERS_EDIT)
+    @Log(title = "会议室预约管理", businessType = BusinessType.UPDATE)
+    public AjaxResult edit(@Validated({V_E.class}) @RequestBody DmMeetingOrdersDto dmMeetingOrders) {
+        return super.edit(dmMeetingOrders);
+    }
+
+    /**
+     * 会议室预约批量删除
+     */
+    @Override
+    @DeleteMapping("/batch/{idList}")
+    @RequiresPermissions(Auth.DM_MEETING_ORDERS_DEL)
+    @Log(title = "会议室预约管理", businessType = BusinessType.DELETE)
+    public AjaxResult batchRemove(@PathVariable List<Long> idList) {
+        return super.batchRemove(idList);
+    }
+
+    /**
+     * 获取会议室预约选择框列表
+     */
+    @Override
+    @GetMapping("/option")
+    public AjaxResult option() {
+        return super.option();
+    }
+
+    interface Auth {
+        /** 系统 - 会议室预约管理 - 列表 */
+        String DM_MEETING_ORDERS_LIST = "meeting:orders:meeting/orders:list";
+        /** 系统 - 会议室预约管理 - 详情 */
+        String DM_MEETING_ORDERS_SINGLE = "meeting:orders:meeting/orders:single";
+        /** 系统 - 会议室预约管理 - 新增 */
+        String DM_MEETING_ORDERS_ADD = "meeting:orders:meeting/orders:add";
+        /** 系统 - 会议室预约管理 - 修改 */
+        String DM_MEETING_ORDERS_EDIT = "meeting:orders:meeting/orders:edit";
+        /** 系统 - 会议室预约管理 - 删除 */
+        String DM_MEETING_ORDERS_DEL = "meeting:orders:meeting/orders:delete";
+    }
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/DmMeetingRoomsController.java

@@ -0,0 +1,135 @@
+package com.xueyi.system.meeting.controller;
+
+import com.xueyi.common.core.web.result.AjaxResult;
+import com.xueyi.common.core.web.validate.V_A;
+import com.xueyi.common.core.web.validate.V_E;
+import com.xueyi.common.log.annotation.Log;
+import com.xueyi.common.log.enums.BusinessType;
+import com.xueyi.common.security.annotation.Logical;
+import com.xueyi.common.security.annotation.RequiresPermissions;
+import com.xueyi.common.web.entity.controller.BaseController;
+import com.xueyi.system.meeting.domain.dto.DmMeetingRoomsDto;
+import com.xueyi.system.meeting.domain.query.DmMeetingRoomsQuery;
+import com.xueyi.system.meeting.service.IDmMeetingRoomsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 会议室管理 业务处理
+ *
+ * @author xueyi
+ */
+@RestController
+@RequestMapping("/meeting/rooms")
+public class DmMeetingRoomsController extends BaseController<DmMeetingRoomsQuery, DmMeetingRoomsDto, IDmMeetingRoomsService> {
+
+    @Autowired
+    IDmMeetingRoomsService iDmMeetingRoomsService;
+
+    /** 定义节点名称 */
+    @Override
+    protected String getNodeName() {
+        return "会议室" ;
+    }
+
+    /**
+     * 查询会议室列表
+     */
+    @Override
+    @GetMapping("/list")
+    @RequiresPermissions(Auth.DM_MEETING_ROOMS_LIST)
+    public AjaxResult list(DmMeetingRoomsQuery dmMeetingRooms) {
+//        List<DmMeetingRoomsPo> list = iDmMeetingRoomsService.selectRoomList(dmMeetingRooms);
+        //return AjaxResult.success(list);
+//        dmMeetingRooms.setd
+//        return super.list(dmMeetingRooms);
+
+
+        startPage();
+        List<DmMeetingRoomsDto> list = baseService.selectListScope(dmMeetingRooms);
+//        list.forEach(item -> baseService.userDesensitized(item));
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询会议室详细
+     */
+    @Override
+    @GetMapping(value = "/{id}")
+    @RequiresPermissions(Auth.DM_MEETING_ROOMS_SINGLE)
+    public AjaxResult getInfo(@PathVariable Serializable id) {
+        return super.getInfo(id);
+    }
+
+    /**
+     * 会议室新增
+     */
+    @Override
+    @PostMapping
+    @RequiresPermissions(Auth.DM_MEETING_ROOMS_ADD)
+    @Log(title = "会议室管理", businessType = BusinessType.INSERT)
+    public AjaxResult add(@Validated({V_A.class}) @RequestBody DmMeetingRoomsDto dmMeetingRooms) {
+        return super.add(dmMeetingRooms);
+    }
+
+    /**
+     * 会议室修改
+     */
+    @Override
+    @PutMapping
+    @RequiresPermissions(Auth.DM_MEETING_ROOMS_EDIT)
+    @Log(title = "会议室管理", businessType = BusinessType.UPDATE)
+    public AjaxResult edit(@Validated({V_E.class}) @RequestBody DmMeetingRoomsDto dmMeetingRooms) {
+        return super.edit(dmMeetingRooms);
+    }
+
+    /**
+     * 会议室修改状态
+     */
+    @Override
+    @PutMapping("/status")
+    @RequiresPermissions(value = {Auth.DM_MEETING_ROOMS_EDIT, Auth.DM_MEETING_ROOMS_ES}, logical = Logical.OR)
+    @Log(title = "会议室管理", businessType = BusinessType.UPDATE_STATUS)
+    public AjaxResult editStatus(@RequestBody DmMeetingRoomsDto dmMeetingRooms) {
+        return super.editStatus(dmMeetingRooms);
+    }
+
+    /**
+     * 会议室批量删除
+     */
+    @Override
+    @DeleteMapping("/batch/{idList}")
+    @RequiresPermissions(Auth.DM_MEETING_ROOMS_DEL)
+    @Log(title = "会议室管理", businessType = BusinessType.DELETE)
+    public AjaxResult batchRemove(@PathVariable List<Long> idList) {
+        return super.batchRemove(idList);
+    }
+
+    /**
+     * 获取会议室选择框列表
+     */
+    @Override
+    @GetMapping("/option")
+    public AjaxResult option() {
+        return super.option();
+    }
+
+    interface Auth {
+        /** 系统 - 会议室管理 - 列表 */
+        String DM_MEETING_ROOMS_LIST = "meeting:rooms:meeting/rooms:list";
+        /** 系统 - 会议室管理 - 详情 */
+        String DM_MEETING_ROOMS_SINGLE = "meeting:rooms:meeting/rooms:single";
+        /** 系统 - 会议室管理 - 新增 */
+        String DM_MEETING_ROOMS_ADD = "meeting:rooms:meeting/rooms:add";
+        /** 系统 - 会议室管理 - 修改 */
+        String DM_MEETING_ROOMS_EDIT = "meeting:rooms:meeting/rooms:edit";
+        /** 系统 - 会议室管理 - 修改状态 */
+        String DM_MEETING_ROOMS_ES = "meeting:rooms:meeting/rooms:es";
+        /** 系统 - 会议室管理 - 删除 */
+        String DM_MEETING_ROOMS_DEL = "meeting:rooms:meeting/rooms:delete";
+    }
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/domain/dto/DmMeetingOrdersDto.java

@@ -0,0 +1,21 @@
+package com.xueyi.system.meeting.domain.dto;
+
+import com.xueyi.system.meeting.domain.po.DmMeetingOrdersPo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 会议室预约 数据传输对象
+ *
+ * @author xueyi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DmMeetingOrdersDto extends DmMeetingOrdersPo {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/domain/dto/DmMeetingRoomsDto.java

@@ -0,0 +1,21 @@
+package com.xueyi.system.meeting.domain.dto;
+
+import com.xueyi.system.meeting.domain.po.DmMeetingRoomsPo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 会议室 数据传输对象
+ *
+ * @author xueyi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DmMeetingRoomsDto extends DmMeetingRoomsPo {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/domain/model/DmMeetingOrdersConverter.java

@@ -0,0 +1,17 @@
+package com.xueyi.system.meeting.domain.model;
+
+import com.xueyi.common.core.web.entity.model.BaseConverter;
+import com.xueyi.system.meeting.domain.dto.DmMeetingOrdersDto;
+import com.xueyi.system.meeting.domain.po.DmMeetingOrdersPo;
+import com.xueyi.system.meeting.domain.query.DmMeetingOrdersQuery;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+
+/**
+ * 会议室预约 对象映射器
+ *
+ * @author xueyi
+ */
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface DmMeetingOrdersConverter extends BaseConverter<DmMeetingOrdersQuery, DmMeetingOrdersDto, DmMeetingOrdersPo> {
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/domain/model/DmMeetingRoomsConverter.java

@@ -0,0 +1,17 @@
+package com.xueyi.system.meeting.domain.model;
+
+import com.xueyi.common.core.web.entity.model.BaseConverter;
+import com.xueyi.system.meeting.domain.dto.DmMeetingRoomsDto;
+import com.xueyi.system.meeting.domain.po.DmMeetingRoomsPo;
+import com.xueyi.system.meeting.domain.query.DmMeetingRoomsQuery;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingConstants;
+
+/**
+ * 会议室 对象映射器
+ *
+ * @author xueyi
+ */
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface DmMeetingRoomsConverter extends BaseConverter<DmMeetingRoomsQuery, DmMeetingRoomsDto, DmMeetingRoomsPo> {
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/domain/po/DmMeetingOrdersPo.java

@@ -0,0 +1,76 @@
+package com.xueyi.system.meeting.domain.po;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xueyi.common.core.web.tenant.base.TBaseEntity;
+import com.xueyi.system.meeting.domain.dto.DmMeetingOrdersDto;
+import com.xueyi.common.core.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+import static com.xueyi.common.core.constant.basic.EntityConstants.STATUS;
+import static com.xueyi.common.core.constant.basic.EntityConstants.SORT;
+import static com.xueyi.common.core.constant.basic.EntityConstants.REMARK;
+
+/**
+ * 会议室预约 持久化对象
+ *
+ * @author xueyi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "dm_meeting_orders", excludeProperty = { STATUS, SORT, REMARK })
+public class DmMeetingOrdersPo extends TBaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /** 会议室ID */
+    @Excel(name = "会议室ID")
+    protected Long roomId;
+
+    /** 昵称 */
+    @Excel(name = "昵称")
+    protected String nickName;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    protected String address;
+
+    /** 会议主题 */
+    @Excel(name = "会议主题")
+    protected String meetingTitle;
+
+    /** 会议时长 */
+    @Excel(name = "会议时长")
+    protected BigDecimal meetingDuration;
+
+    /** 预定时间 */
+    @Excel(name = "预定时间")
+    protected Date orderDate;
+
+    /** 预定会议开始时间 */
+    @Excel(name = "预定会议开始时间")
+    protected Date startTime;
+
+    /** 预定会议结束时间 */
+    @Excel(name = "预定会议结束时间")
+    protected Date endTime;
+
+    /** 预定人ID */
+    @Excel(name = "预定人ID")
+    protected Long orderBy;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    protected String remarks;
+
+    /** 所属组织ID */
+    @Excel(name = "所属组织ID")
+    protected Long deptId;
+
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/domain/po/DmMeetingRoomsPo.java

@@ -0,0 +1,41 @@
+package com.xueyi.system.meeting.domain.po;
+
+import com.xueyi.common.core.web.tenant.base.TBaseEntity;
+import com.xueyi.system.meeting.domain.dto.DmMeetingRoomsDto;
+import com.xueyi.common.core.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+import static com.xueyi.common.core.constant.basic.EntityConstants.STATUS;
+import static com.xueyi.common.core.constant.basic.EntityConstants.SORT;
+import static com.xueyi.common.core.constant.basic.EntityConstants.REMARK;
+
+/**
+ * 会议室 持久化对象
+ *
+ * @author xueyi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "dm_spaces", excludeProperty = { STATUS, SORT, REMARK })
+public class DmMeetingRoomsPo extends TBaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /** 昵称 */
+    @Excel(name = "昵称")
+    protected String nickName;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    protected String address;
+
+    /** 所属组织ID */
+    @Excel(name = "所属组织ID")
+    protected Long deptId;
+
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/domain/query/DmMeetingOrdersQuery.java

@@ -0,0 +1,20 @@
+package com.xueyi.system.meeting.domain.query;
+
+import com.xueyi.system.meeting.domain.po.DmMeetingOrdersPo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 会议室预约 数据查询对象
+ *
+ * @author xueyi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DmMeetingOrdersQuery extends DmMeetingOrdersPo {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/domain/query/DmMeetingRoomsQuery.java

@@ -0,0 +1,23 @@
+package com.xueyi.system.meeting.domain.query;
+
+import com.xueyi.system.meeting.domain.po.DmMeetingRoomsPo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 会议室 数据查询对象
+ *
+ * @author xueyi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DmMeetingRoomsQuery extends DmMeetingRoomsPo {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /** 部门Id - 查询 */
+    private Long deptId;
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/manager/IDmMeetingOrdersManager.java

@@ -0,0 +1,13 @@
+package com.xueyi.system.meeting.manager;
+
+import com.xueyi.system.meeting.domain.dto.DmMeetingOrdersDto;
+import com.xueyi.system.meeting.domain.query.DmMeetingOrdersQuery;
+import com.xueyi.common.web.entity.manager.IBaseManager;
+
+/**
+ * 会议室预约管理 数据封装层
+ *
+ * @author xueyi
+ */
+public interface IDmMeetingOrdersManager extends IBaseManager<DmMeetingOrdersQuery, DmMeetingOrdersDto> {
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/manager/IDmMeetingRoomsManager.java

@@ -0,0 +1,13 @@
+package com.xueyi.system.meeting.manager;
+
+import com.xueyi.system.meeting.domain.dto.DmMeetingRoomsDto;
+import com.xueyi.system.meeting.domain.query.DmMeetingRoomsQuery;
+import com.xueyi.common.web.entity.manager.IBaseManager;
+
+/**
+ * 会议室管理 数据封装层
+ *
+ * @author xueyi
+ */
+public interface IDmMeetingRoomsManager extends IBaseManager<DmMeetingRoomsQuery, DmMeetingRoomsDto> {
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/manager/impl/DmMeetingOrdersManager.java

@@ -0,0 +1,19 @@
+package com.xueyi.system.meeting.manager.impl;
+
+import com.xueyi.common.web.entity.manager.impl.BaseManagerImpl;
+import com.xueyi.system.meeting.domain.po.DmMeetingOrdersPo;
+import com.xueyi.system.meeting.domain.dto.DmMeetingOrdersDto;
+import com.xueyi.system.meeting.domain.query.DmMeetingOrdersQuery;
+import com.xueyi.system.meeting.domain.model.DmMeetingOrdersConverter;
+import com.xueyi.system.meeting.mapper.DmMeetingOrdersMapper;
+import com.xueyi.system.meeting.manager.IDmMeetingOrdersManager;
+import org.springframework.stereotype.Component;
+
+/**
+ * 会议室预约管理 数据封装层处理
+ *
+ * @author xueyi
+ */
+@Component
+public class DmMeetingOrdersManager extends BaseManagerImpl<DmMeetingOrdersQuery, DmMeetingOrdersDto, DmMeetingOrdersPo, DmMeetingOrdersMapper, DmMeetingOrdersConverter> implements IDmMeetingOrdersManager {
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/manager/impl/DmMeetingRoomsManager.java

@@ -0,0 +1,19 @@
+package com.xueyi.system.meeting.manager.impl;
+
+import com.xueyi.common.web.entity.manager.impl.BaseManagerImpl;
+import com.xueyi.system.meeting.domain.po.DmMeetingRoomsPo;
+import com.xueyi.system.meeting.domain.dto.DmMeetingRoomsDto;
+import com.xueyi.system.meeting.domain.query.DmMeetingRoomsQuery;
+import com.xueyi.system.meeting.domain.model.DmMeetingRoomsConverter;
+import com.xueyi.system.meeting.mapper.DmMeetingRoomsMapper;
+import com.xueyi.system.meeting.manager.IDmMeetingRoomsManager;
+import org.springframework.stereotype.Component;
+
+/**
+ * 会议室管理 数据封装层处理
+ *
+ * @author xueyi
+ */
+@Component
+public class DmMeetingRoomsManager extends BaseManagerImpl<DmMeetingRoomsQuery, DmMeetingRoomsDto, DmMeetingRoomsPo, DmMeetingRoomsMapper, DmMeetingRoomsConverter> implements IDmMeetingRoomsManager {
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/mapper/DmMeetingOrdersMapper.java

@@ -0,0 +1,16 @@
+package com.xueyi.system.meeting.mapper;
+
+import com.xueyi.system.meeting.domain.query.DmMeetingOrdersQuery;
+import com.xueyi.system.meeting.domain.dto.DmMeetingOrdersDto;
+import com.xueyi.system.meeting.domain.po.DmMeetingOrdersPo;
+import com.xueyi.common.web.entity.mapper.BaseMapper;
+import com.xueyi.common.datasource.annotation.Isolate;
+
+/**
+ * 会议室预约管理 数据层
+ *
+ * @author xueyi
+ */
+@Isolate
+public interface DmMeetingOrdersMapper extends BaseMapper<DmMeetingOrdersQuery, DmMeetingOrdersDto, DmMeetingOrdersPo> {
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/mapper/DmMeetingRoomsMapper.java

@@ -0,0 +1,19 @@
+package com.xueyi.system.meeting.mapper;
+
+import com.xueyi.system.meeting.domain.query.DmMeetingRoomsQuery;
+import com.xueyi.system.meeting.domain.dto.DmMeetingRoomsDto;
+import com.xueyi.system.meeting.domain.po.DmMeetingRoomsPo;
+import com.xueyi.common.web.entity.mapper.BaseMapper;
+import com.xueyi.common.datasource.annotation.Isolate;
+
+import java.util.List;
+
+/**
+ * 会议室管理 数据层
+ *
+ * @author xueyi
+ */
+@Isolate
+public interface DmMeetingRoomsMapper extends BaseMapper<DmMeetingRoomsQuery, DmMeetingRoomsDto, DmMeetingRoomsPo> {
+    List<DmMeetingRoomsPo>  selectRoomList(DmMeetingRoomsPo po);
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/service/IDmMeetingOrdersService.java

@@ -0,0 +1,17 @@
+package com.xueyi.system.meeting.service;
+
+import com.xueyi.common.web.entity.service.IBaseService;
+import com.xueyi.system.meeting.domain.dto.DmMeetingOrdersDto;
+import com.xueyi.system.meeting.domain.po.DmMeetingOrdersPo;
+import com.xueyi.system.meeting.domain.query.DmMeetingOrdersQuery;
+
+import java.util.List;
+
+/**
+ * 会议室预约管理 服务层
+ *
+ * @author xueyi
+ */
+public interface IDmMeetingOrdersService extends IBaseService<DmMeetingOrdersQuery, DmMeetingOrdersDto> {
+    List<DmMeetingOrdersPo> selectRoomList(DmMeetingOrdersPo query);
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/service/IDmMeetingRoomsService.java

@@ -0,0 +1,18 @@
+package com.xueyi.system.meeting.service;
+
+import com.xueyi.system.meeting.domain.po.DmMeetingRoomsPo;
+import com.xueyi.system.meeting.domain.query.DmMeetingRoomsQuery;
+import com.xueyi.system.meeting.domain.dto.DmMeetingRoomsDto;
+import com.xueyi.common.web.entity.service.IBaseService;
+
+import java.util.List;
+
+/**
+ * 会议室管理 服务层
+ *
+ * @author xueyi
+ */
+public interface IDmMeetingRoomsService extends IBaseService<DmMeetingRoomsQuery, DmMeetingRoomsDto> {
+
+    List<DmMeetingRoomsPo> selectRoomList(DmMeetingRoomsPo query);
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/service/impl/DmMeetingOrdersServiceImpl.java

@@ -0,0 +1,37 @@
+package com.xueyi.system.meeting.service.impl;
+
+import com.xueyi.system.meeting.domain.dto.DmMeetingOrdersDto;
+import com.xueyi.system.meeting.domain.po.DmMeetingOrdersPo;
+import com.xueyi.system.meeting.domain.query.DmMeetingOrdersQuery;
+import com.xueyi.system.meeting.service.IDmMeetingOrdersService;
+import com.xueyi.system.meeting.manager.IDmMeetingOrdersManager;
+import com.xueyi.common.web.entity.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 会议室预约管理 服务层处理
+ *
+ * @author xueyi
+ */
+@Service
+public class DmMeetingOrdersServiceImpl extends BaseServiceImpl<DmMeetingOrdersQuery, DmMeetingOrdersDto, IDmMeetingOrdersManager> implements IDmMeetingOrdersService {
+
+    /**
+     * 查询会议室预约对象列表 | 数据权限
+     *
+     * @param dmMeetingOrders 会议室预约对象
+     * @return 会议室预约对象集合
+     */
+    @Override
+    //@DataScope(userAlias = "createBy", mapperScope = {"DmMeetingOrdersMapper"})
+    public List<DmMeetingOrdersDto> selectListScope(DmMeetingOrdersQuery dmMeetingOrders) {
+        return baseManager.selectList(dmMeetingOrders);
+    }
+
+    @Override
+    public List<DmMeetingOrdersPo> selectRoomList(DmMeetingOrdersPo query) {
+        return null;
+    }
+}

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/service/impl/DmMeetingRoomsServiceImpl.java

@@ -0,0 +1,46 @@
+package com.xueyi.system.meeting.service.impl;
+
+import com.xueyi.system.meeting.domain.dto.DmMeetingRoomsDto;
+import com.xueyi.system.meeting.domain.po.DmMeetingRoomsPo;
+import com.xueyi.system.meeting.domain.query.DmMeetingRoomsQuery;
+import com.xueyi.system.meeting.mapper.DmMeetingRoomsMapper;
+import com.xueyi.system.meeting.service.IDmMeetingRoomsService;
+import com.xueyi.system.meeting.manager.IDmMeetingRoomsManager;
+import com.xueyi.common.web.entity.service.impl.BaseServiceImpl;
+import com.xueyi.system.staff.domain.po.DmStaffPo;
+import com.xueyi.system.staff.mapper.DmStaffMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 会议室管理 服务层处理
+ *
+ * @author xueyi
+ */
+@Service
+public class DmMeetingRoomsServiceImpl extends BaseServiceImpl<DmMeetingRoomsQuery, DmMeetingRoomsDto, IDmMeetingRoomsManager> implements IDmMeetingRoomsService {
+
+
+    @Autowired
+    DmMeetingRoomsMapper dmMeetingRoomsMapper;
+    /**
+     * 查询会议室对象列表 | 数据权限
+     *
+     * @param dmMeetingRooms 会议室对象
+     * @return 会议室对象集合
+     */
+    @Override
+    //@DataScope(userAlias = "createBy", mapperScope = {"DmMeetingRoomsMapper"})
+    public List<DmMeetingRoomsDto> selectListScope(DmMeetingRoomsQuery dmMeetingRooms) {
+        return baseManager.selectList(dmMeetingRooms);
+    }
+
+    @Override
+    public List<DmMeetingRoomsPo> selectRoomList(DmMeetingRoomsPo query) {
+        List<DmMeetingRoomsPo> result = dmMeetingRoomsMapper.selectRoomList(query);
+//        List<DmMeetingRoomsPo> po = dmMeetingRoomsMapper.selectList(null);
+        return result;
+    }
+}

xueyi-modules/xueyi-system/src/main/resources/bootstrap.yml

@@ -17,11 +17,16 @@ spring:
   cloud:
     nacos:
       discovery:
+#        namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
+        namespace: fa62d4b3-e7b6-4ffa-aa90-8e322dafecfd
         # 服务注册地址
-        server-addr: 172.17.0.1:18848
+        server-addr: 127.0.0.1:8848
+#        server-addr: 39.107.77.235:18848
+
       config:
+        namespace: fa62d4b3-e7b6-4ffa-aa90-8e322dafecfd
         # 配置中心地址
-        server-addr: 172.17.0.1:18848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

xueyi-modules/xueyi-system/src/main/resources/mapper/meeting/DmMeetingOrdersMapper.xml

@@ -0,0 +1,10 @@
+<?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.xueyi.system.meeting.mapper.DmMeetingRoomsMapper">
+
+    <select id="selectRoomList" parameterType="DmMeetingRoomsPo" >
+        select * from dm_spaces u
+    </select>
+</mapper>

xueyi-modules/xueyi-system/src/main/resources/mapper/meeting/DmMeetingRoomsMapper.xml

@@ -0,0 +1,10 @@
+<?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.xueyi.system.meeting.mapper.DmMeetingOrdersMapper">
+
+    <select id="selectOrdersList" parameterType="DmMeetingOrdersPo" >
+        select * from dm_meeting_orders u
+    </select>
+</mapper>

xueyi-modules/xueyi-system/src/main/resources/mapper/staff/DmVisitorMapper.xml

@@ -4,11 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xueyi.system.staff.mapper.DmVisitorMapper">
 
-    <resultMap type="DmVisitorPo" id="DmVisitorResult">
+    <resultMap type="DmVisitorsPo" id="DmVisitorResult">
         <result property="userName"      column="user_name"       />
     </resultMap>
 
-    <select id="selectStaffList" parameterType="DmVisitorPo" resultMap="DmVisitorResult">
+    <select id="selectStaffList" parameterType="DmVisitorsPo" resultMap="DmVisitorResult">
         select * from dm_staff u
     </select>
 </mapper>

xueyi-modules/xueyi-system/xueyi-modules-system.iml

@@ -10,7 +10,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-modules/xueyi-tenant/xueyi-modules-tenant.iml

@@ -10,7 +10,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-visual/xueyi-monitor/xueyi-visual-monitor.iml

@@ -10,7 +10,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

xueyi-visual/xueyi-visual.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_15">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">