From b780ea9ad88deb7aeff31175c277e343a3f0e2a5 Mon Sep 17 00:00:00 2001
From: zhangzhikang <1013400931@qq.com>
Date: Tue, 16 Aug 2022 14:02:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E7=9A=84=E6=96=B0=E5=A2=9E=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/V4.8__t_meeting_add_table.sql          | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 renren-admin/src/main/resources/db/V4.8__t_meeting_add_table.sql

diff --git a/renren-admin/src/main/resources/db/V4.8__t_meeting_add_table.sql b/renren-admin/src/main/resources/db/V4.8__t_meeting_add_table.sql
new file mode 100644
index 00000000..d58fa37f
--- /dev/null
+++ b/renren-admin/src/main/resources/db/V4.8__t_meeting_add_table.sql
@@ -0,0 +1,35 @@
+CREATE TABLE `t_meetingroom` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '房间号',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '名称',
+  `area` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '面积',
+  `capacity` int DEFAULT NULL COMMENT '可容纳人数',
+  `pic` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '会议室图片',
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '描述',
+  `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `modify_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+  `del_flag` int DEFAULT '0' COMMENT '是否删除',
+  `creator` bigint DEFAULT NULL COMMENT '创建者',
+  `modifier` bigint DEFAULT NULL COMMENT '修改者',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='会议室';
+
+CREATE TABLE `t_meetingroom_book` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `room_id` bigint NOT NULL COMMENT '会议室id',
+  `book_date` datetime DEFAULT NULL COMMENT '预约日期',
+  `start_time` datetime DEFAULT NULL COMMENT '预约开始时间',
+  `end_time` datetime DEFAULT NULL COMMENT '预约结束时间',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '预约人',
+  `phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '联系电话',
+  `dept` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '预约部门',
+  `matter` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '使用事项',
+  `file` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '附件',
+  `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `creator` bigint DEFAULT NULL COMMENT '创建者',
+  `state` int DEFAULT '0' COMMENT '审核状态',
+  `audit_viem` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '审核意见',
+  `auditor` bigint DEFAULT NULL COMMENT '审核者',
+  `audit_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '审核时间',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='会议室预约';
\ No newline at end of file

From 1e5231a197a255046cadd9ec6fb5f97792d1ac04 Mon Sep 17 00:00:00 2001
From: dinggang <2498628697@qq.com>
Date: Tue, 16 Aug 2022 13:58:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/service/impl/ResourceServiceImpl.java   |  5 +----
 .../resources/db/R__init_sys_menuAndLanguage.sql     | 12 ++++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index 9ff0329b..a0c10375 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -144,9 +144,6 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     @Autowired
     private AttrDao attrDao;
 
-    @Autowired
-    private ResourceBrowseDao resourceBrowseDao;
-
     @Autowired
     private SysDeptDao sysDeptDao;
 
@@ -445,7 +442,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                         logger.error("失败", exception);
                     }
                 } else { // 西海岸普通资源
-                    logger.info("西海岸基普通");
+                    logger.info("西海岸普通");
                     resultPage = common(resultPage, selectDTOPageSpecilTotal, resourceDTO, orderField, orderType, pageNum, pageSize);
                 }
             }
diff --git a/renren-admin/src/main/resources/db/R__init_sys_menuAndLanguage.sql b/renren-admin/src/main/resources/db/R__init_sys_menuAndLanguage.sql
index 92dd83c6..55de6141 100644
--- a/renren-admin/src/main/resources/db/R__init_sys_menuAndLanguage.sql
+++ b/renren-admin/src/main/resources/db/R__init_sys_menuAndLanguage.sql
@@ -159,7 +159,6 @@ REPLACE INTO `sys_menu` VALUES (1481447556422651905, 1481447555369881602, 'comme
 REPLACE INTO `sys_menu` VALUES (1481447556770779137, 1481447555369881602, 'comment/bscomment', 'comment:bscomment:delete', 1, NULL, 3, 1067246875800000001, '2022-01-13 10:06:36', 1067246875800000001, '2022-01-13 10:06:36');
 REPLACE INTO `sys_menu` VALUES (1481447557123100673, 1481447555369881602, 'comment/bscomment', 'comment:bscomment:export', 1, NULL, 4, 1067246875800000001, '2022-01-13 10:06:36', 1067246875800000001, '2022-01-13 10:06:36');
 REPLACE INTO `sys_menu` VALUES (1513775256278900737, 1150941310262235138, 'activiti/demo/correction-process', '', 0, 'icon-check-circle', 0, 1067246875800000001, '2022-04-12 15:05:20', 1067246875800000001, '2022-04-12 15:08:24');
-REPLACE INTO `sys_menu` VALUES (1513797246491648001, 0, '/ability/IntegratedServices', '', 0, 'icon-medicinebox-fill', 10, 1067246875800000001, '2022-04-12 16:32:43', 1067246875800000001, '2022-07-14 10:04:35');
 REPLACE INTO `sys_menu` VALUES (1514156880712777730, 1150941310262235138, 'activiti/demo/correction-process2', '', 0, 'icon-meh', 0, 1513435534798127105, '2022-04-13 16:21:47', 1513435534798127105, '2022-04-13 16:22:11');
 REPLACE INTO `sys_menu` VALUES (1523928422334148609, 1150941310262235138, 'activiti/my-work-dynamics', 'sys:correction:all,sys:process:all,sys:running:all,sys:task:all', 0, 'icon-carryout', 6, 1067246875800000001, '2022-05-10 15:30:24', 1067246875800000001, '2022-05-10 15:30:45');
 REPLACE INTO `sys_menu` VALUES (1526084841978781697, 0, '', '', 0, 'icon-edit-square', 4, 1067246875800000001, '2022-05-16 14:19:14', 1067246875800000001, '2022-05-16 14:27:13');
@@ -191,6 +190,11 @@ REPLACE INTO `sys_menu` VALUES (1545312045695377410, 1541261628388888578, '/myAg
 REPLACE INTO `sys_menu` VALUES (1545313018614521857, 1541261628388888578, '/myAgent/AbilityResourcesRemoved', '', 0, 'icon-logout', 3, 1067246875800000001, '2022-07-08 15:45:09', 1067246875800000001, '2022-07-08 15:45:09');
 REPLACE INTO `sys_menu` VALUES (1545313754106699777, 1541261628388888578, '/myAgent/CommentModeration', '', 0, 'icon-reloadtime', 4, 1067246875800000001, '2022-07-08 15:48:04', 1067246875800000001, '2022-07-08 15:48:04');
 REPLACE INTO `sys_menu` VALUES (1546381109252136961, 1067246875800000046, 'sys/log-data-modification-log', '', 0, 'icon-reloadtime', 3, 1067246875800000001, '2022-07-11 14:29:21', 1067246875800000001, '2022-07-11 15:38:19');
+REPLACE INTO `sys_menu` VALUES (1554294862931562498, 1541261628388888578, '/myAgent/ConferenceRoom', '', 0, 'icon-laptop', 5, 1067246875800000001, '2022-08-02 10:35:47', 1067246875800000001, '2022-08-16 11:02:53');
+REPLACE INTO `sys_menu` VALUES (1556618294872526850, 1150941310262235138, 'activiti/RoomExamineAdmin', '', 0, 'icon-read', 7, 1067246875800000001, '2022-08-08 20:28:17', 1067246875800000001, '2022-08-08 20:32:24');
+REPLACE INTO `sys_menu` VALUES (1557271824436301825, 1479714553140961281, '/ability/IntegratedServices', '', 0, 'icon-compass', 0, 1067246875800000001, '2022-08-10 15:45:10', 1067246875800000001, '2022-08-10 15:45:10');
+REPLACE INTO `sys_menu` VALUES (1557271925414170626, 1479714553140961281, '/ability/assignedScene/index', '', 0, 'icon-control', 0, 1067246875800000001, '2022-08-10 15:45:34', 1067246875800000001, '2022-08-10 15:45:34');
+REPLACE INTO `sys_menu` VALUES (1559375615193255938, 0, '/myAgent/ConferenceRoom', '', 0, 'icon-check-circle', 0, 1067246875800000001, '2022-08-16 11:04:53', 1067246875800000001, '2022-08-16 11:04:53');
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1067246875800000002, 'name', 'Authority Management', 'en-US');
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1067246875800000002, 'name', '权限管理', 'zh-CN');
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1067246875800000002, 'name', '權限管理', 'zh-TW');
@@ -635,7 +639,6 @@ REPLACE INTO `sys_language` VALUES ('sys_menu', 1481447557123100673, 'name', 'Ex
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1481447557123100673, 'name', '导出', 'zh-CN');
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1481447557123100673, 'name', '導出', 'zh-TW');
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1513775256278900737, 'name', '转正表单', 'zh-CN');
-REPLACE INTO `sys_language` VALUES ('sys_menu', 1513797246491648001, 'name', '融合服务', 'zh-CN');
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1514156880712777730, 'name', '能力申请表单', 'zh-CN');
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1523928422334148609, 'name', '工作动态', 'zh-CN');
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1526084841978781697, 'name', '算法仓管理', 'zh-CN');
@@ -667,3 +670,8 @@ REPLACE INTO `sys_language` VALUES ('sys_menu', 1545312045695377410, 'name', '
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1545313018614521857, 'name', '能力资源下架', 'zh-CN');
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1545313754106699777, 'name', '评论审核', 'zh-CN');
 REPLACE INTO `sys_language` VALUES ('sys_menu', 1546381109252136961, 'name', '数据修改日志', 'zh-CN');
+REPLACE INTO `sys_language` VALUES ('sys_menu', 1554294862931562498, 'name', '会议室', 'zh-CN');
+REPLACE INTO `sys_language` VALUES ('sys_menu', 1556618294872526850, 'name', '会议室审核管理', 'zh-CN');
+REPLACE INTO `sys_language` VALUES ('sys_menu', 1557271824436301825, 'name', '融合服务', 'zh-CN');
+REPLACE INTO `sys_language` VALUES ('sys_menu', 1557271925414170626, 'name', '赋能场景', 'zh-CN');
+REPLACE INTO `sys_language` VALUES ('sys_menu', 1559375615193255938, 'name', '会议室管理', 'zh-CN');