From 9f510817ff00e1204da1aca43130d2f503d34ce8 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Wed, 20 Jul 2022 17:17:58 +0800 Subject: [PATCH 01/80] =?UTF-8?q?tabilityapplication/in=5Fuse=5Fpage=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=BC=BA=E5=B0=91=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processForm/controller/TAbilityApplicationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index 2eda5676..54e34a72 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -93,7 +93,7 @@ public class TAbilityApplicationController { @ApiImplicitParam(name = "resourceId", value = "资源id", paramType = "query", dataType = "String") } ) - public Result> resourceInUse(Map params) { + public Result> resourceInUse(@ApiIgnore @RequestParam Map params) { PageData page = tAbilityApplicationService.page(params); return new Result>().ok(page); } From 41a06c660cd40240fe2f58e900a917534d6b8e5e Mon Sep 17 00:00:00 2001 From: wangliwen Date: Wed, 20 Jul 2022 17:35:46 +0800 Subject: [PATCH 02/80] ... --- .../service/impl/TAbilityApplicationServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java index 8666f02c..2316d2c3 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java @@ -59,6 +59,8 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl Date: Wed, 20 Jul 2022 18:14:05 +0800 Subject: [PATCH 03/80] ... --- .../renren/common/controller/AbilityCenterControllerV2.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java index 1e8fd77b..9cc4b2ac 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java @@ -132,10 +132,8 @@ public class AbilityCenterControllerV2 { logger.info("申请入参{}", JSON.toJSONString(abilityBatchApplicationDTO)); final Optional deptDTO = Optional.ofNullable(sysDeptService.getByName(bigDateDeptName)); final UserDetail user = SecurityUser.getUser(); - CompletableFuture.runAsync(() -> { - logger.info("处理能力申请！"); - deal(abilityBatchApplicationDTO, deptDTO, applyFlag, user); - }, executor); + + deal(abilityBatchApplicationDTO, deptDTO, applyFlag, user); return new Result().ok(LocalDateTime.now().toString()); } From d7c0fa6dc2a0353ce8846f98ae1ffa4e36b3f4b6 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Wed, 20 Jul 2022 18:14:34 +0800 Subject: [PATCH 04/80] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AEsql=202.=E7=BC=96?= =?UTF-8?q?=E7=9B=AE=E6=9B=B4=E6=96=B0=203.bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/R__init_sys_menuAndLanguage.sql | 723 ++++++++++++++++++ .../resources/db/R__init_tb_data_catagory.sql | 1 + .../resources/mapper/resource/ResourceDao.xml | 2 +- 3 files changed, 725 insertions(+), 1 deletion(-) create mode 100644 renren-admin/src/main/resources/db/R__init_sys_menuAndLanguage.sql 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 new file mode 100644 index 00000000..7f7ad731 --- /dev/null +++ b/renren-admin/src/main/resources/db/R__init_sys_menuAndLanguage.sql @@ -0,0 +1,723 @@ +-- 涉及到的表：sys_menu，sys_language +-- 表数据有更新时直接从Navicat选择转储SQL文件替换文件内容！！！ +-- 替换前建议备份 +-- 注意更新时间 + +/* + Date: 20/07/2022 16:15:01 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for sys_language +-- ---------------------------- +DROP TABLE IF EXISTS `sys_language`; +CREATE TABLE `sys_language` ( +`table_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表名', +`table_id` bigint(20) NOT NULL COMMENT '表主键', +`field_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字段名', +`field_value` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '字段值', +`language` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '语言', +PRIMARY KEY (`table_name`, `table_id`, `field_name`, `language`) USING BTREE, +INDEX `idx_table_id`(`table_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '国际化' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of sys_language +-- ---------------------------- +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000002, 'name', 'Authority Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000002, 'name', '权限管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000002, 'name', '權限管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000003, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000003, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000003, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000004, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000004, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000004, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000005, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000005, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000005, 'name', '刪除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000006, 'name', 'Export', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000006, 'name', '导出', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000006, 'name', '導出', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000007, 'name', 'Role Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000007, 'name', '角色管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000007, 'name', '角色管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000008, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000008, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000008, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000009, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000009, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000009, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000010, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000010, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000010, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000011, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000011, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000011, 'name', '刪除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000012, 'name', 'Department Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000012, 'name', '部门管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000012, 'name', '部門管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000014, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000014, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000014, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000015, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000015, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000015, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000016, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000016, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000016, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000017, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000017, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000017, 'name', '刪除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000018, 'name', 'Process Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000018, 'name', '流程管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000018, 'name', '流程管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000019, 'name', 'Model Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000019, 'name', '模型管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000019, 'name', '模型管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000020, 'name', 'Running Process', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000020, 'name', '运行中的流程', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000020, 'name', '運行中的流程', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000021, 'name', 'SMS Service', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000021, 'name', '短信服务', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000021, 'name', '短信服務', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000022, 'name', 'Mail Template', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000022, 'name', '邮件模板', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000022, 'name', '郵件模板', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000023, 'name', 'Mail Log', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000023, 'name', '邮件发送记录', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000023, 'name', '郵件發送記錄', 'zh-TW '); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000024, 'name', 'Message Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000024, 'name', '消息管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000024, 'name', '消息管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000025, 'name', 'Menu Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000025, 'name', '菜单管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000025, 'name', '菜單管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000026, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000026, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000026, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000027, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000027, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000027, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000028, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000028, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000028, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000029, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000029, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000029, 'name', '刪除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000030, 'name', 'Timed Task', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000030, 'name', '定时任务', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000030, 'name', '定時任務', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000031, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000031, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000031, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000032, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000032, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000032, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000033, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000033, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000033, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000034, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000034, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000034, 'name', '刪除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000035, 'name', 'Setting', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000035, 'name', '系统设置', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000035, 'name', '系統設置', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000036, 'name', 'Pause', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000036, 'name', '暂停', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000036, 'name', '暫停', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000037, 'name', 'Resume', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000037, 'name', '恢复', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000037, 'name', '恢復', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000038, 'name', 'Execute', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000038, 'name', '立即执行', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000038, 'name', '立即執行', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000039, 'name', 'Log List', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000039, 'name', '日志列表', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000039, 'name', '日誌列表', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000040, 'name', 'Parameter Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000040, 'name', '参数管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000040, 'name', '參數管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000041, 'name', 'Dict Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000041, 'name', '字典管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000041, 'name', '字典管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000042, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000042, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000042, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000043, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000043, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000043, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000044, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000044, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000044, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000045, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000045, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000045, 'name', '刪除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000046, 'name', 'Log Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000046, 'name', '日志管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000046, 'name', '日誌管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000047, 'name', 'File Upload', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000047, 'name', '文件上传', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000047, 'name', '文件上傳', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000048, 'name', 'Login Log', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000048, 'name', '登录日志', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000048, 'name', '登錄日誌', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000049, 'name', 'Operation Log', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000049, 'name', '用户行为日志', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000049, 'name', '操作日誌', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000050, 'name', 'Error Log', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000050, 'name', '异常日志', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000050, 'name', '異常日誌', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000051, 'name', 'SQL Monitoring', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000051, 'name', 'SQL监控', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000051, 'name', 'SQL監控', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000052, 'name', 'News Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000052, 'name', '新闻管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000052, 'name', '新聞管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000053, 'name', 'System Monitoring', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000053, 'name', '系统监控', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000053, 'name', '系統監控', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000054, 'name', 'Demo', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000054, 'name', '功能示例', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000054, 'name', '功能示例', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000055, 'name', 'User Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000055, 'name', '用户管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000055, 'name', '用戶管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000056, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000056, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000056, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000057, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000057, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000057, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000058, 'name', 'Export', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000058, 'name', '导出', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000058, 'name', '導出', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000059, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000059, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000059, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000060, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000060, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000060, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000061, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000061, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000061, 'name', '刪除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000300, 'name', 'Station Notice', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000300, 'name', '站内通知', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000300, 'name', '站內通知', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000301, 'name', 'Notice Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000301, 'name', '通知管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000301, 'name', '通知管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000302, 'name', 'My Notice', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000302, 'name', '我的通知', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000302, 'name', '我的通知', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000303, 'name', 'SMS History', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000303, 'name', '短信发送记录', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1067246875800000303, 'name', '短信發送記錄', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150940491508928513, 'name', 'Process Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150940491508928513, 'name', '流程管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150940491508928513, 'name', '流程管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941310262235138, 'name', 'Personal Office', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941310262235138, 'name', '个人办公', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941310262235138, 'name', '個人辦公', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941384811794433, 'name', 'My To-do', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941384811794433, 'name', '我的待办', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941384811794433, 'name', '我的待辦', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941447038488577, 'name', 'Task Already', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941447038488577, 'name', '已办任务', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941447038488577, 'name', '已辦任務', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941506626965506, 'name', 'Initiation Process', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941506626965506, 'name', '发起流程', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941506626965506, 'name', '發起流程', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941588046794754, 'name', 'My Application', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941588046794754, 'name', '我的申请', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1150941588046794754, 'name', '我的申請', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1151384841607028738, 'name', 'To Be Signed', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1151384841607028738, 'name', '待签收任务', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1151384841607028738, 'name', '待簽收任務', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1156748733921165314, 'name', 'Interface Document', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1156748733921165314, 'name', '接口文档', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1156748733921165314, 'name', '接口文檔', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842114, 'name', 'Correction Request', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842114, 'name', '转正申请', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842114, 'name', '轉正申請', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842115, 'name', 'Administrative Regions', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842115, 'name', '行政区域', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842115, 'name', '行政區域', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842116, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842116, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842116, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842117, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842117, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842117, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842118, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842118, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842118, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842119, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842119, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1158267114314842119, 'name', '刪除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501825, 'name', 'Master And Child', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501825, 'name', '主子表演示', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501825, 'name', '主子表演示', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501826, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501826, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501826, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501827, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501827, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501827, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501828, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501828, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501828, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501829, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501829, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1270380959719501829, 'name', '刪除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1300278047072649217, 'name', 'Report Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1300278047072649217, 'name', '报表管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1300278047072649217, 'name', '報表管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1300278435729440769, 'name', 'Report Design', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1300278435729440769, 'name', '报表设计器', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1300278435729440769, 'name', '報表設計器', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1300381796852060161, 'name', 'Report List', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1300381796852060161, 'name', '报表列表', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1300381796852060161, 'name', '報表列表', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302850622416084993, 'name', 'DevTools', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302850622416084993, 'name', '开发者工具', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302850622416084993, 'name', '開發者工具', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302850783288614913, 'name', 'DataSource', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302850783288614913, 'name', '数据源管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302850783288614913, 'name', '數據源管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302862890696564738, 'name', 'Field Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302862890696564738, 'name', '字段管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302862890696564738, 'name', '字段管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302874751835848705, 'name', 'BaseClass', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302874751835848705, 'name', '基类管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1302874751835848705, 'name', '基類管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1304081184014635010, 'name', 'Template', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1304081184014635010, 'name', '模板管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1304081184014635010, 'name', '模板管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1304802103569809410, 'name', 'Code Generation', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1304802103569809410, 'name', '代码生成工具', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1304802103569809410, 'name', '代碼生成工具', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1305513187675144193, 'name', 'Parameter Config', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1305513187675144193, 'name', '参数配置', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1305513187675144193, 'name', '參數配置', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1305532398162145281, 'name', 'Config Info', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1340949288542347266, 'name', 'Page Design', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1340949288542347266, 'name', '页面表单设计', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1340949288542347266, 'name', '頁面表單設計', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622612987906, 'name', 'Job Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622612987906, 'name', '岗位管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622612987906, 'name', '崗位管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622688485377, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622688485377, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622688485377, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622755594242, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622755594242, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622755594242, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622835286018, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622835286018, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622835286018, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622902394881, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622902394881, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341596622902394881, 'name', '刪除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341659662599495681, 'name', 'Online User', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341659662599495681, 'name', '在线用户', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341659662599495681, 'name', '在線用戶', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341676084016852994, 'name', 'Excel Demo', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341676084016852994, 'name', 'Excel导入演示', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1341676084016852994, 'name', 'Excel導入演示', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1343074487777677313, 'name', 'Pay Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1343074487777677313, 'name', '支付管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1343074487777677313, 'name', '支付管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1343074685589442561, 'name', 'Order Management', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1343074685589442561, 'name', '订单管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1343074685589442561, 'name', '訂單管理', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1343074794440019970, 'name', 'AliPay Log', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1343074794440019970, 'name', '支付宝回调日志', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1343074794440019970, 'name', '支付寶回調日誌', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479714171727732737, 'name', '能力目录(编目)管理(普通)', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479714553140961281, 'name', '能力挂接(普通)', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716355429195777, 'name', '能力需求管理(普通)', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716765099450370, 'name', '能力目录列表', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716765099450370, 'name', '能力目录列表', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716765099450370, 'name', '能力目录列表', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716767699918849, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716767699918849, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716767699918849, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716769545412609, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716769545412609, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716769545412609, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716771990691841, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716771990691841, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716771990691841, 'name', '删除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716772791803905, 'name', 'Export', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716772791803905, 'name', '导出', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716772791803905, 'name', '導出', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716915775627265, 'name', '能力目录审核', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716915775627265, 'name', '能力目录审核', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716915775627265, 'name', '能力目录审核', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716916153114625, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716916153114625, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716916153114625, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716916518019073, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716916518019073, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716916518019073, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716916891312129, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716916891312129, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716916891312129, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716917260410882, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716917260410882, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716917260410882, 'name', '删除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716917616926721, 'name', 'Export', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716917616926721, 'name', '导出', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479716917616926721, 'name', '導出', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717972316610562, 'name', '服务', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717972316610562, 'name', '应用资源', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717972316610562, 'name', '服务', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717972710875138, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717972710875138, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717972710875138, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717973096751106, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717973096751106, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717973096751106, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717973830754305, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717973830754305, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717973830754305, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717974791249922, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717974791249922, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717974791249922, 'name', '删除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717975143571457, 'name', 'Export', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717975143571457, 'name', '导出', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479717975143571457, 'name', '導出', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718134397100033, 'name', 'AI算法', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718134397100033, 'name', '组件服务', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718134397100033, 'name', 'AI算法', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718135307264002, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718135307264002, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718135307264002, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718136649441281, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718136649441281, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718136649441281, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718137043705858, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718137043705858, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718137043705858, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718137433776130, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718137433776130, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718137433776130, 'name', '删除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718139103109121, 'name', 'Export', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718139103109121, 'name', '导出', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718139103109121, 'name', '導出', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718537687818241, 'name', '我的需求', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718537687818241, 'name', '我的需求', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718537687818241, 'name', '我的需求', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718538073694209, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718538073694209, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718538073694209, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718538446987266, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718538446987266, 'name', '新增1', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718538446987266, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718538824474626, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718538824474626, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718538824474626, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718539201961985, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718539201961985, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718539201961985, 'name', '删除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718539579449345, 'name', 'Export', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718539579449345, 'name', '导出', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718539579449345, 'name', '導出', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718596517126145, 'name', '需求审核', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718596517126145, 'name', '需求审核', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718596517126145, 'name', '需求审核', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718596907196417, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718596907196417, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718596907196417, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718597293072385, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718597293072385, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718597293072385, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718597674754049, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718597674754049, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718597674754049, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718598052241410, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718598052241410, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718598052241410, 'name', '删除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718598442311682, 'name', 'Export', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718598442311682, 'name', '导出', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1479718598442311682, 'name', '導出', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481106341655306242, 'name', '能力调用情况分析(超管)', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481130021655502850, 'name', '审核', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481151514917556226, 'name', '审核', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481184238046834690, 'name', '能力目录(编目)管理(超管)', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481184729887698946, 'name', '能力需求管理(超管)', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447555369881602, 'name', '审核记录', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447555369881602, 'name', '审核记录(超管)', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447555369881602, 'name', '审核记录', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447555726397442, 'name', 'View', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447555726397442, 'name', '查看', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447555726397442, 'name', '查看', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447556078718977, 'name', 'Add', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447556078718977, 'name', '新增', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447556078718977, 'name', '新增', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447556422651905, 'name', 'Edit', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447556422651905, 'name', '修改', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447556422651905, 'name', '修改', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447556770779137, 'name', 'Delete', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447556770779137, 'name', '删除', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447556770779137, 'name', '删除', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447557123100673, 'name', 'Export', 'en-US'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447557123100673, 'name', '导出', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1481447557123100673, 'name', '導出', 'zh-TW'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1513775256278900737, 'name', '转正表单', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1513797246491648001, 'name', '融合服务', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1514156880712777730, 'name', '能力申请表单', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1523928422334148609, 'name', '工作动态', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1526084841978781697, 'name', '算法仓管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1526085998621024257, 'name', '算法管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1526087445634932737, 'name', '告警展示', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1526087790134091777, 'name', '任务监控', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1538710711974182913, 'name', '资源导入', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1539127096390934529, 'name', '项目管理', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1539128432322826241, 'name', '项目列表', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1539136487160696834, 'name', '项目贡献能力明细', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1539136757919797249, 'name', '项目使用能力明细', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1539155687929511937, 'name', '赋能案例', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1539159216605782017, 'name', '赋能案例', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1539421305375272962, 'name', '基础设施', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1539422109297520641, 'name', '数据资源', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1541049688748081153, 'name', '能力统计', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1541249771661844482, 'name', '工作台', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1541261628388888578, 'name', '我的待办', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1541261780432408577, 'name', '能力申请', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1541982817671380994, 'name', '能力运行监控', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1545238019690090497, 'name', '已办任务', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1545239930820513793, 'name', '能力申请', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1545252736160636929, 'name', '能力资源上架', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1545253936767574018, 'name', '能力需求申请', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1545254965168971778, 'name', '能力资源下架', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1545290496837820418, 'name', '评论审核', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1545292602084827138, 'name', '能力资源上架', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1545312045695377410, 'name', '能力需求申请', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1545313018614521857, 'name', '能力资源下架', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1545313754106699777, 'name', '评论审核', 'zh-CN'); +INSERT INTO `sys_language` VALUES ('sys_menu', 1546381109252136961, 'name', '数据修改日志', 'zh-CN'); + +SET FOREIGN_KEY_CHECKS = 1; + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for sys_menu +-- ---------------------------- +DROP TABLE IF EXISTS `sys_menu`; +CREATE TABLE `sys_menu` ( +`id` bigint(20) NOT NULL COMMENT 'id', +`pid` bigint(20) NULL DEFAULT NULL COMMENT '上级ID，一级菜单为0', +`url` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单URL', +`permissions` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '授权(多个用逗号分隔，如：sys:user:list,sys:user:save)', +`type` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '类型 0：菜单 1：按钮', +`icon` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单图标', +`sort` int(11) NULL DEFAULT NULL COMMENT '排序', +`creator` bigint(20) NULL DEFAULT NULL COMMENT '创建者', +`create_date` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', +`updater` bigint(20) NULL DEFAULT NULL COMMENT '更新者', +`update_date` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', +PRIMARY KEY (`id`) USING BTREE, +INDEX `idx_pid`(`pid`) USING BTREE, +INDEX `idx_sort`(`sort`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单管理' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of sys_menu +-- ---------------------------- +INSERT INTO `sys_menu` VALUES (1067246875800000002, 0, NULL, NULL, 0, 'icon-safetycertificate', 0, 1067246875800000001, '2022-01-08 09:18:30', 1067246875800000001, '2022-01-08 09:18:30'); +INSERT INTO `sys_menu` VALUES (1067246875800000003, 1067246875800000055, NULL, 'sys:user:save,sys:dept:list,sys:role:list', 1, NULL, 1, 1067246875800000001, '2022-01-08 09:18:30', 1067246875800000001, '2022-01-08 09:18:30'); +INSERT INTO `sys_menu` VALUES (1067246875800000004, 1067246875800000055, NULL, 'sys:user:update,sys:dept:list,sys:role:list', 1, NULL, 2, 1067246875800000001, '2022-01-08 09:18:30', 1067246875800000001, '2022-01-08 09:18:30'); +INSERT INTO `sys_menu` VALUES (1067246875800000005, 1067246875800000055, NULL, 'sys:user:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 09:18:30', 1067246875800000001, '2022-01-08 09:18:30'); +INSERT INTO `sys_menu` VALUES (1067246875800000006, 1067246875800000055, NULL, 'sys:user:export', 1, NULL, 4, 1067246875800000001, '2022-01-08 09:18:30', 1067246875800000001, '2022-01-08 09:18:30'); +INSERT INTO `sys_menu` VALUES (1067246875800000007, 1067246875800000002, 'sys/role', NULL, 0, 'icon-team', 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000008, 1067246875800000007, NULL, 'sys:role:page,sys:role:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000009, 1067246875800000007, NULL, 'sys:role:save,sys:menu:select,sys:dept:list', 1, NULL, 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000010, 1067246875800000007, NULL, 'sys:role:update,sys:menu:select,sys:dept:list', 1, NULL, 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000011, 1067246875800000007, NULL, 'sys:role:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000012, 1067246875800000002, 'sys/dept', NULL, 0, 'icon-apartment', 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000014, 1067246875800000012, NULL, 'sys:dept:list,sys:dept:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000015, 1067246875800000012, NULL, 'sys:dept:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000016, 1067246875800000012, NULL, 'sys:dept:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000017, 1067246875800000012, NULL, 'sys:dept:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000018, 1150940491508928513, 'activiti/process', 'sys:process:all', 0, 'icon-detail', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000019, 1150940491508928513, 'activiti/model', 'sys:model:all', 0, 'icon-appstore-fill', 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000020, 1150940491508928513, 'activiti/running', 'sys:running:all', 0, 'icon-play-square', 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000021, 1067246875800000024, 'message/sms', 'sys:sms:all', 0, 'icon-message-fill', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000022, 1067246875800000024, 'message/mail_template', 'sys:mail:all', 0, 'icon-mail', 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000023, 1067246875800000024, 'message/mail_log', 'sys:mail:log', 0, 'icon-detail-fill', 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000024, 0, NULL, NULL, 0, 'icon-message', 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000025, 1067246875800000035, 'sys/menu', NULL, 0, 'icon-unorderedlist', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000026, 1067246875800000025, NULL, 'sys:menu:list,sys:menu:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000027, 1067246875800000025, NULL, 'sys:menu:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000028, 1067246875800000025, NULL, 'sys:menu:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000029, 1067246875800000025, NULL, 'sys:menu:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000030, 1067246875800000035, 'job/schedule', NULL, 0, 'icon-dashboard', 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000031, 1067246875800000030, NULL, 'sys:schedule:page,sys:schedule:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000032, 1067246875800000030, NULL, 'sys:schedule:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000033, 1067246875800000030, NULL, 'sys:schedule:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000034, 1067246875800000030, NULL, 'sys:schedule:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000035, 0, NULL, NULL, 0, 'icon-setting', 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000036, 1067246875800000030, NULL, 'sys:schedule:pause', 1, NULL, 4, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000037, 1067246875800000030, NULL, 'sys:schedule:resume', 1, NULL, 5, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000038, 1067246875800000030, NULL, 'sys:schedule:run', 1, NULL, 6, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000039, 1067246875800000030, NULL, 'sys:schedule:log', 1, NULL, 7, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000040, 1067246875800000035, 'sys/params', '', 0, 'icon-fileprotect', 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000041, 1067246875800000035, 'sys/dict-type', NULL, 0, 'icon-golden-fill', 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000042, 1067246875800000041, NULL, 'sys:dict:page,sys:dict:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000043, 1067246875800000041, NULL, 'sys:dict:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000044, 1067246875800000041, NULL, 'sys:dict:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000045, 1067246875800000041, NULL, 'sys:dict:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000046, 0, NULL, NULL, 0, 'icon-container', 4, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000047, 1067246875800000035, 'oss/oss', 'sys:oss:all', 0, 'icon-upload', 4, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000048, 1067246875800000046, 'sys/log-login', 'sys:log:login', 0, 'icon-filedone', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-07-11 15:38:10'); +INSERT INTO `sys_menu` VALUES (1067246875800000049, 1067246875800000046, 'sys/log-operation', 'sys:log:operation', 0, 'icon-solution', 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-07-11 15:36:37'); +INSERT INTO `sys_menu` VALUES (1067246875800000050, 1067246875800000046, 'sys/log-error', 'sys:log:error', 0, 'icon-file-exception', 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000051, 1067246875800000053, '{{ window.SITE_CONFIG[\"apiURL\"] }}/druid/sql.html', NULL, 0, 'icon-database', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000052, 1067246875800000054, 'demo/news', 'demo:news:all', 0, 'icon-file-word', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000053, 0, NULL, NULL, 0, 'icon-desktop', 5, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000054, 0, NULL, NULL, 0, 'icon-windows', 6, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000055, 1067246875800000002, 'sys/user', NULL, 0, 'icon-user', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000056, 1067246875800000055, NULL, 'sys:user:page,sys:user:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000057, 1067246875800000040, NULL, 'sys:params:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000058, 1067246875800000040, NULL, 'sys:params:export', 1, NULL, 4, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000059, 1067246875800000040, '', 'sys:params:page,sys:params:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000060, 1067246875800000040, NULL, 'sys:params:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000061, 1067246875800000040, '', 'sys:params:delete', 1, '', 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000300, 0, NULL, NULL, 0, 'icon-bell', 4, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000301, 1067246875800000300, 'notice/notice', 'sys:notice:all', 0, 'icon-bell', 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000302, 1067246875800000300, 'notice/notice-user', 'sys:notice:all', 0, 'icon-notification', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1067246875800000303, 1067246875800000024, 'message/sms-log', 'sys:smslog:all', 0, 'icon-unorderedlist', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1150940491508928513, 0, NULL, NULL, 0, 'icon-reloadtime', 4, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1150941310262235138, 0, NULL, NULL, 0, 'icon-user', 4, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1150941384811794433, 1150941310262235138, 'activiti/my-todo-task', 'sys:correction:all,sys:process:all,sys:running:all,sys:task:all', 0, 'icon-dashboard', 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1150941447038488577, 1150941310262235138, 'activiti/my-join-task', 'sys:his:all', 0, 'icon-check-square', 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1150941506626965506, 1150940491508928513, 'activiti/process-initiation', 'sys:process:all', 0, 'icon-play-square', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1150941588046794754, 1150941310262235138, 'activiti/my-apply', 'sys:correction:all,sys:process:all,sys:running:all,sys:task:all', 0, 'icon-edit-square', 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1151384841607028738, 1150941310262235138, 'activiti/my-todo-task-pool', 'sys:correction:all,sys:process:all,sys:running:all,sys:task:all', 0, 'icon-interation', 5, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1156748733921165314, 1067246875800000053, '{{ window.SITE_CONFIG[\"apiURL\"] }}/doc.html', '', 0, 'icon-file-word', 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1158267114314842114, 1150941310262235138, 'activiti/demo/correction', 'sys:correction:all,sys:process:all,sys:running:all,sys:task:all', 0, 'icon-issuesclose', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1158267114314842115, 1067246875800000035, 'sys/region', NULL, 0, 'icon-location', 4, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1158267114314842116, 1158267114314842115, NULL, 'sys:region:list,sys:region:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1158267114314842117, 1158267114314842115, NULL, 'sys:region:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1158267114314842118, 1158267114314842115, NULL, 'sys:region:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1158267114314842119, 1158267114314842115, NULL, 'sys:region:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1270380959719501825, 1067246875800000054, 'demo/product', NULL, 0, 'icon-tag', 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1270380959719501826, 1270380959719501825, NULL, 'demo:product:page,demo:product:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1270380959719501827, 1270380959719501825, NULL, 'demo:product:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1270380959719501828, 1270380959719501825, NULL, 'demo:product:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1270380959719501829, 1270380959719501825, NULL, 'demo:product:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1300278047072649217, 0, '', '', 0, 'icon-filesearch', 3, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1300278435729440769, 1300278047072649217, '{{ window.SITE_CONFIG[\"apiURL\"] }}/ureport/designer', '', 0, 'icon-book', 0, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1300381796852060161, 1300278047072649217, 'ureport/ureport', 'sys:ureport:all', 0, 'icon-up-circle', 1, 1067246875800000001, '2022-01-08 09:18:31', 1067246875800000001, '2022-01-08 09:18:31'); +INSERT INTO `sys_menu` VALUES (1302850622416084993, 0, '', '', 0, 'icon-rocket', 3, 1067246875800000001, '2022-01-08 14:48:03', 1067246875800000001, '2022-01-08 14:48:03'); +INSERT INTO `sys_menu` VALUES (1302850783288614913, 1305532398162145281, 'devtools/datasource', '', 0, 'icon-sync', 0, 1067246875800000001, '2022-01-08 14:48:03', 1067246875800000001, '2022-01-08 14:48:03'); +INSERT INTO `sys_menu` VALUES (1302862890696564738, 1305532398162145281, 'devtools/fieldtype', '', 0, 'icon-eye', 1, 1067246875800000001, '2022-01-08 14:48:03', 1067246875800000001, '2022-01-08 14:48:03'); +INSERT INTO `sys_menu` VALUES (1302874751835848705, 1305532398162145281, 'devtools/baseclass', '', 0, 'icon-info-circle', 3, 1067246875800000001, '2022-01-08 14:48:03', 1067246875800000001, '2022-01-08 14:48:03'); +INSERT INTO `sys_menu` VALUES (1304081184014635010, 1305532398162145281, 'devtools/template', '', 0, 'icon-up-circle', 3, 1067246875800000001, '2022-01-08 14:48:03', 1067246875800000001, '2022-01-08 14:48:03'); +INSERT INTO `sys_menu` VALUES (1304802103569809410, 1302850622416084993, 'devtools/generator', '', 0, 'icon-tags', 0, 1067246875800000001, '2022-01-08 14:48:03', 1067246875800000001, '2022-01-08 14:48:03'); +INSERT INTO `sys_menu` VALUES (1305513187675144193, 1305532398162145281, 'devtools/param', '', 0, 'icon-setting', 5, 1067246875800000001, '2022-01-08 14:48:03', 1067246875800000001, '2022-01-08 14:48:03'); +INSERT INTO `sys_menu` VALUES (1305532398162145281, 1302850622416084993, '', '', 0, 'icon-setting', 3, 1067246875800000001, '2022-01-08 14:48:03', 1067246875800000001, '2022-01-08 14:48:03'); +INSERT INTO `sys_menu` VALUES (1340949288542347266, 1302850622416084993, 'form-generator/form', '', 0, 'icon-edit-square', 0, 1067246875800000001, '2022-01-08 14:48:04', 1067246875800000001, '2022-01-08 14:48:04'); +INSERT INTO `sys_menu` VALUES (1341596622612987906, 1067246875800000002, 'sys/post', NULL, 0, 'icon-pic-left', 1, 1067246875800000001, '2022-01-08 09:18:35', 1067246875800000001, '2022-01-08 09:18:35'); +INSERT INTO `sys_menu` VALUES (1341596622688485377, 1341596622612987906, NULL, 'sys:post:page,sys:post:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 09:18:35', 1067246875800000001, '2022-01-08 09:18:35'); +INSERT INTO `sys_menu` VALUES (1341596622755594242, 1341596622612987906, NULL, 'sys:post:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 09:18:35', 1067246875800000001, '2022-01-08 09:18:35'); +INSERT INTO `sys_menu` VALUES (1341596622835286018, 1341596622612987906, NULL, 'sys:post:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 09:18:35', 1067246875800000001, '2022-01-08 09:18:35'); +INSERT INTO `sys_menu` VALUES (1341596622902394881, 1341596622612987906, NULL, 'sys:post:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 09:18:35', 1067246875800000001, '2022-01-08 09:18:35'); +INSERT INTO `sys_menu` VALUES (1341659662599495681, 1067246875800000053, 'sys/online', 'sys:online:all', 0, 'icon-team', 1, 1067246875800000001, '2022-01-08 09:18:35', 1067246875800000001, '2022-01-08 09:18:35'); +INSERT INTO `sys_menu` VALUES (1341676084016852994, 1067246875800000054, 'demo/excel', 'demo:excel:all', 0, 'icon-table', 1, 1067246875800000001, '2022-01-08 09:18:35', 1067246875800000001, '2022-01-08 09:18:35'); +INSERT INTO `sys_menu` VALUES (1343074487777677313, 0, '', '', 0, 'icon-Dollar', 3, 1067246875800000001, '2022-01-08 09:18:35', 1067246875800000001, '2022-01-08 09:18:35'); +INSERT INTO `sys_menu` VALUES (1343074685589442561, 1343074487777677313, 'pay/order', 'pay:order:all', 0, 'icon-unorderedlist', 0, 1067246875800000001, '2022-01-08 09:18:35', 1067246875800000001, '2022-01-08 09:18:35'); +INSERT INTO `sys_menu` VALUES (1343074794440019970, 1343074487777677313, 'pay/alipaynotifylog', 'pay:alipayNotifyLog:all', 0, 'icon-filedone', 1, 1067246875800000001, '2022-01-08 09:18:35', 1067246875800000001, '2022-01-08 09:18:35'); +INSERT INTO `sys_menu` VALUES (1479714171727732737, 0, '', '', 0, 'icon-laptop', 3, 1067246875800000001, '2022-01-08 15:18:45', 1067246875800000001, '2022-01-14 15:34:22'); +INSERT INTO `sys_menu` VALUES (1479714553140961281, 0, '', '', 0, 'icon-codelibrary', 5, 1067246875800000001, '2022-01-08 15:20:16', 1067246875800000001, '2022-01-13 18:10:50'); +INSERT INTO `sys_menu` VALUES (1479716355429195777, 0, '', '', 0, 'icon-save', 0, 1067246875800000001, '2022-01-08 15:27:26', 1067246875800000001, '2022-01-13 18:09:55'); +INSERT INTO `sys_menu` VALUES (1479716765099450370, 1479714171727732737, '/bscatalogue/bscatalogue', NULL, 0, 'icon-up-circle', 0, 1067246875800000001, '2022-01-08 15:29:03', 1067246875800000001, '2022-01-11 19:44:43'); +INSERT INTO `sys_menu` VALUES (1479716767699918849, 1479716765099450370, '/bscatalogue', 'bscatalogue:bscatalogue:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 15:29:03', 1067246875800000001, '2022-01-11 19:56:32'); +INSERT INTO `sys_menu` VALUES (1479716769545412609, 1479716765099450370, '/bscatalogue', 'bscatalogue:bscatalogue:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 15:29:03', 1067246875800000001, '2022-01-11 19:55:19'); +INSERT INTO `sys_menu` VALUES (1479716771990691841, 1479716765099450370, '/bscatalogue', 'bscatalogue:bscatalogue:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 15:29:03', 1067246875800000001, '2022-01-11 19:56:53'); +INSERT INTO `sys_menu` VALUES (1479716772791803905, 1479716765099450370, '/bscatalogue', 'bscatalogue:export', 1, NULL, 4, 1067246875800000001, '2022-01-08 15:29:03', 1067246875800000001, '2022-01-08 15:29:03'); +INSERT INTO `sys_menu` VALUES (1479716915775627265, 1481184238046834690, '/bscatalogue/bscatalogueExamine', NULL, 0, 'icon-undo', 0, 1067246875800000001, '2022-01-08 15:29:39', 1067246875800000001, '2022-01-12 16:57:32'); +INSERT INTO `sys_menu` VALUES (1479716916153114625, 1479716915775627265, '/bscatalogue', 'bscatalogue:page,bscatalogue:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 15:29:39', 1067246875800000001, '2022-01-08 15:29:39'); +INSERT INTO `sys_menu` VALUES (1479716916518019073, 1479716915775627265, '/bscatalogue', 'bscatalogue:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 15:29:39', 1067246875800000001, '2022-01-08 15:29:39'); +INSERT INTO `sys_menu` VALUES (1479716916891312129, 1479716915775627265, '/bscatalogue', 'bscatalogue:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 15:29:39', 1067246875800000001, '2022-01-08 15:29:39'); +INSERT INTO `sys_menu` VALUES (1479716917260410882, 1479716915775627265, '/bscatalogue', 'bscatalogue:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 15:29:39', 1067246875800000001, '2022-01-08 15:29:39'); +INSERT INTO `sys_menu` VALUES (1479716917616926721, 1479716915775627265, '/bscatalogue', 'bscatalogue:export', 1, NULL, 4, 1067246875800000001, '2022-01-08 15:29:39', 1067246875800000001, '2022-01-08 15:29:39'); +INSERT INTO `sys_menu` VALUES (1479717972316610562, 1479714553140961281, '/ability/bsabilityservice', NULL, 0, 'icon-CodeSandbox', 4, 1067246875800000001, '2022-01-08 15:33:51', 1513433270406643713, '2022-06-20 10:37:06'); +INSERT INTO `sys_menu` VALUES (1479717972710875138, 1479717972316610562, '/ability/bsabilityservice', 'ability:bsabilityservice:page,ability:bsabilityservice:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 15:33:51', 1067246875800000001, '2022-01-08 15:33:51'); +INSERT INTO `sys_menu` VALUES (1479717973096751106, 1479717972316610562, '/ability/bsabilityservice', 'ability:bsabilityservice:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 15:33:51', 1067246875800000001, '2022-01-08 15:33:51'); +INSERT INTO `sys_menu` VALUES (1479717973830754305, 1479717972316610562, '/ability/bsabilityservice', 'ability:bsabilityservice:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 15:33:51', 1067246875800000001, '2022-01-08 15:33:51'); +INSERT INTO `sys_menu` VALUES (1479717974791249922, 1479717972316610562, '/ability/bsabilityservice', 'ability:bsabilityservice:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 15:33:51', 1067246875800000001, '2022-01-08 15:33:51'); +INSERT INTO `sys_menu` VALUES (1479717975143571457, 1479717972316610562, '/ability/bsabilityservice', 'ability:bsabilityservice:export', 1, NULL, 4, 1067246875800000001, '2022-01-08 15:33:51', 1067246875800000001, '2022-01-08 15:33:51'); +INSERT INTO `sys_menu` VALUES (1479718134397100033, 1479714553140961281, '/ability/bsabilityai', NULL, 0, 'icon-Batchfolding', 3, 1067246875800000001, '2022-01-08 15:34:30', 1513433270406643713, '2022-06-20 10:38:05'); +INSERT INTO `sys_menu` VALUES (1479718135307264002, 1479718134397100033, '/ability/bsabilityai', 'ability:bsabilityai:page,ability:bsabilityai:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 15:34:30', 1067246875800000001, '2022-01-08 15:34:30'); +INSERT INTO `sys_menu` VALUES (1479718136649441281, 1479718134397100033, '/ability/bsabilityai', 'ability:bsabilityai:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 15:34:30', 1067246875800000001, '2022-01-08 15:34:30'); +INSERT INTO `sys_menu` VALUES (1479718137043705858, 1479718134397100033, '/ability/bsabilityai', 'ability:bsabilityai:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 15:34:30', 1067246875800000001, '2022-01-08 15:34:30'); +INSERT INTO `sys_menu` VALUES (1479718137433776130, 1479718134397100033, '/ability/bsabilityai', 'ability:bsabilityai:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 15:34:30', 1067246875800000001, '2022-01-08 15:34:30'); +INSERT INTO `sys_menu` VALUES (1479718139103109121, 1479718134397100033, '/ability/bsabilityai', 'ability:bsabilityai:export', 1, NULL, 4, 1067246875800000001, '2022-01-08 15:34:30', 1067246875800000001, '2022-01-08 15:34:30'); +INSERT INTO `sys_menu` VALUES (1479718537687818241, 1479716355429195777, '/demand/bsdemand', NULL, 0, '', 0, 1067246875800000001, '2022-01-08 15:36:06', 1067246875800000001, '2022-01-11 17:15:19'); +INSERT INTO `sys_menu` VALUES (1479718538073694209, 1479718537687818241, '/demand/bsdemand', 'bsdemand:page,bsdemand:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 15:36:06', 1067246875800000001, '2022-01-08 15:36:06'); +INSERT INTO `sys_menu` VALUES (1479718538446987266, 1479718537687818241, '/demand/bsdemand', 'demand:bsdemand:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 15:36:06', 1067246875800000001, '2022-01-11 17:18:45'); +INSERT INTO `sys_menu` VALUES (1479718538824474626, 1479718537687818241, '/demand/bsdemand', 'bsdemand:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 15:36:06', 1067246875800000001, '2022-01-12 13:37:31'); +INSERT INTO `sys_menu` VALUES (1479718539201961985, 1479718537687818241, '/demand/bsdemand', 'bsdemand:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 15:36:06', 1067246875800000001, '2022-01-08 15:36:06'); +INSERT INTO `sys_menu` VALUES (1479718539579449345, 1479718537687818241, '/demand/bsdemand', 'bsdemand:export', 1, NULL, 4, 1067246875800000001, '2022-01-08 15:36:06', 1067246875800000001, '2022-01-08 15:36:06'); +INSERT INTO `sys_menu` VALUES (1479718596517126145, 1481184729887698946, '/demand/deman', NULL, 0, '', 0, 1067246875800000001, '2022-01-08 15:36:20', 1067246875800000001, '2022-01-12 16:57:49'); +INSERT INTO `sys_menu` VALUES (1479718596907196417, 1479718596517126145, '/demand/bsdemand', 'bsdemand:page,bsdemand:info', 1, NULL, 0, 1067246875800000001, '2022-01-08 15:36:20', 1067246875800000001, '2022-01-08 15:36:20'); +INSERT INTO `sys_menu` VALUES (1479718597293072385, 1479718596517126145, '/demand/bsdemand', 'bsdemand:save', 1, NULL, 1, 1067246875800000001, '2022-01-08 15:36:20', 1067246875800000001, '2022-01-11 17:13:45'); +INSERT INTO `sys_menu` VALUES (1479718597674754049, 1479718596517126145, '/demand/bsdemand', 'bsdemand:update', 1, NULL, 2, 1067246875800000001, '2022-01-08 15:36:20', 1067246875800000001, '2022-01-08 15:36:20'); +INSERT INTO `sys_menu` VALUES (1479718598052241410, 1479718596517126145, '/demand/bsdemand', 'bsdemand:delete', 1, NULL, 3, 1067246875800000001, '2022-01-08 15:36:20', 1067246875800000001, '2022-01-08 15:36:20'); +INSERT INTO `sys_menu` VALUES (1479718598442311682, 1479718596517126145, '/demand/bsdemand', 'bsdemand:export', 1, NULL, 4, 1067246875800000001, '2022-01-08 15:36:20', 1067246875800000001, '2022-01-08 15:36:20'); +INSERT INTO `sys_menu` VALUES (1481106341655306242, 0, '/ability/analysis', '', 0, 'icon-project', 6, 1067246875800000001, '2022-01-12 11:30:44', 1067246875800000001, '2022-01-14 15:42:40'); +INSERT INTO `sys_menu` VALUES (1481130021655502850, 1479718596517126145, '/demand/bsdemand', 'bsdemand:examine', 1, NULL, 0, 1067246875800000001, '2022-01-12 13:04:50', 1067246875800000001, '2022-01-12 13:58:58'); +INSERT INTO `sys_menu` VALUES (1481151514917556226, 1479716915775627265, '', 'bscatalogue:examine', 1, '', 0, 1067246875800000001, '2022-01-12 14:30:14', 1067246875800000001, '2022-01-12 14:30:47'); +INSERT INTO `sys_menu` VALUES (1481184238046834690, 0, '/bscatalogue/bscatalogueExamine', '', 0, 'icon-trademark', 4, 1067246875800000001, '2022-01-12 16:40:16', 1067246875800000001, '2022-01-14 15:34:32'); +INSERT INTO `sys_menu` VALUES (1481184729887698946, 0, '', '', 0, 'icon-trademark', 1, 1067246875800000001, '2022-01-12 16:42:13', 1067246875800000001, '2022-01-13 18:10:09'); +INSERT INTO `sys_menu` VALUES (1481447555369881602, 0, 'comment/bscomment', NULL, 0, 'icon-date', 2, 1067246875800000001, '2022-01-13 10:06:36', 1067246875800000001, '2022-01-13 11:08:51'); +INSERT INTO `sys_menu` VALUES (1481447555726397442, 1481447555369881602, 'comment/bscomment', 'comment:bscomment:page,comment:bscomment:info', 1, NULL, 0, 1067246875800000001, '2022-01-13 10:06:36', 1067246875800000001, '2022-01-13 10:06:36'); +INSERT INTO `sys_menu` VALUES (1481447556078718977, 1481447555369881602, 'comment/bscomment', 'comment:bscomment:save', 1, NULL, 1, 1067246875800000001, '2022-01-13 10:06:36', 1067246875800000001, '2022-01-13 10:06:36'); +INSERT INTO `sys_menu` VALUES (1481447556422651905, 1481447555369881602, 'comment/bscomment', 'comment:bscomment:update', 1, NULL, 2, 1067246875800000001, '2022-01-13 10:06:36', 1067246875800000001, '2022-01-13 10:06:36'); +INSERT 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'); +INSERT 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'); +INSERT 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'); +INSERT 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'); +INSERT 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'); +INSERT 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'); +INSERT 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'); +INSERT INTO `sys_menu` VALUES (1526085998621024257, 1526084841978781697, 'algorithm/algorithm-management', '', 0, 'icon-number', 1, 1523593620618321921, '2022-05-16 14:23:50', 1523593620618321921, '2022-05-16 15:10:31'); +INSERT INTO `sys_menu` VALUES (1526087445634932737, 1526084841978781697, 'algorithm/alarm-display.vue', '', 0, 'icon-stop', 3, 1067246875800000001, '2022-05-16 14:29:35', 1523593620618321921, '2022-05-16 16:05:25'); +INSERT INTO `sys_menu` VALUES (1526087790134091777, 1526084841978781697, 'algorithm/task-monitoring.vue', '', 0, 'icon-earth', 2, 1067246875800000001, '2022-05-16 14:30:57', 1523593620618321921, '2022-05-16 15:10:44'); +INSERT INTO `sys_menu` VALUES (1538710711974182913, 1479714553140961281, '/ability/bsabilityimport', '', 0, 'icon-file-fill', 1, 1515973081575276545, '2022-06-20 10:29:56', 1067246875800000001, '2022-06-20 10:38:51'); +INSERT INTO `sys_menu` VALUES (1539127096390934529, 0, '', '', 0, 'icon-reconciliation', 0, 1067246875800000001, '2022-06-21 14:04:30', 1067246875800000001, '2022-06-21 14:04:30'); +INSERT INTO `sys_menu` VALUES (1539128432322826241, 1539127096390934529, 'project/list', '0', 0, 'icon-database', 0, 1067246875800000001, '2022-06-21 14:09:49', 1067246875800000001, '2022-06-21 14:09:49'); +INSERT INTO `sys_menu` VALUES (1539136487160696834, 1539127096390934529, 'project/contribute', '', 0, 'icon-orderedlist', 0, 1067246875800000001, '2022-06-21 14:41:49', 1067246875800000001, '2022-06-21 14:41:49'); +INSERT INTO `sys_menu` VALUES (1539136757919797249, 1539127096390934529, 'project/use', '', 0, 'icon-detail', 0, 1067246875800000001, '2022-06-21 14:42:54', 1067246875800000001, '2022-06-21 14:42:54'); +INSERT INTO `sys_menu` VALUES (1539155687929511937, 0, '', '', 0, 'icon-earth', 5, 1513437369940344833, '2022-06-21 15:58:07', 1513437369940344833, '2022-06-21 16:25:10'); +INSERT INTO `sys_menu` VALUES (1539159216605782017, 1539155687929511937, '/canassigncase/index', '', 0, 'icon-message', 0, 1513437369940344833, '2022-06-21 16:12:08', 1513437369940344833, '2022-06-21 16:12:08'); +INSERT INTO `sys_menu` VALUES (1539421305375272962, 1479714553140961281, '/ability/bsinfrastructure', '', 0, 'icon-layout-fill', 0, 1538070668834201602, '2022-06-22 09:33:35', 1538070668834201602, '2022-06-22 09:34:08'); +INSERT INTO `sys_menu` VALUES (1539422109297520641, 1479714553140961281, '/ability/bsdataresources', '', 0, 'icon-diff-fill', 0, 1538070668834201602, '2022-06-22 09:36:47', 1538070668834201602, '2022-06-22 09:36:47'); +INSERT INTO `sys_menu` VALUES (1541049688748081153, 0, '/abilityStatistics/index', '', 0, 'icon-appstore', 0, 1067246875800000001, '2022-06-26 21:24:12', 1067246875800000001, '2022-06-26 21:24:31'); +INSERT INTO `sys_menu` VALUES (1541249771661844482, 0, '/workBench/workBench', '', 0, 'icon-project', 0, 1517033347649310722, '2022-06-27 10:39:15', 1517397484770328578, '2022-06-29 12:54:06'); +INSERT INTO `sys_menu` VALUES (1541261628388888578, 0, '', '', 0, 'icon-user', 4, 1513433709613187073, '2022-06-27 11:26:22', 1067246875800000001, '2022-06-30 14:58:42'); +INSERT INTO `sys_menu` VALUES (1541261780432408577, 1541261628388888578, '/myAgent/CompetencyApplication', '', 0, 'icon-file-copy', 0, 1513433709613187073, '2022-06-27 11:26:58', 1067246875800000001, '2022-07-08 14:51:32'); +INSERT INTO `sys_menu` VALUES (1541982817671380994, 1067246875800000002, 'sys/CapabilityOperationMonitoring/index.vue', '', 0, 'icon-earth', 0, 1067246875800000001, '2022-06-29 11:12:07', 1067246875800000001, '2022-06-29 11:12:56'); +INSERT INTO `sys_menu` VALUES (1545238019690090497, 0, '', '', 0, 'icon-minus-circle', 4, 1067246875800000001, '2022-07-08 10:47:08', 1067246875800000001, '2022-07-08 10:47:08'); +INSERT INTO `sys_menu` VALUES (1545239930820513793, 1545238019690090497, '/hasToDoTasks/CompetencyApplication', '', 0, 'icon-eye', 0, 1067246875800000001, '2022-07-08 10:54:43', 1067246875800000001, '2022-07-08 11:49:03'); +INSERT INTO `sys_menu` VALUES (1545252736160636929, 1545238019690090497, '/hasToDoTasks/AbilityResourceShelf', '', 0, 'icon-earth', 1, 1067246875800000001, '2022-07-08 11:45:36', 1067246875800000001, '2022-07-08 11:57:37'); +INSERT INTO `sys_menu` VALUES (1545253936767574018, 1545238019690090497, '/hasToDoTasks/ApplicationForCompetencyRequirements', '', 0, 'icon-filedone', 2, 1067246875800000001, '2022-07-08 11:50:23', 1067246875800000001, '2022-07-08 11:50:23'); +INSERT INTO `sys_menu` VALUES (1545254965168971778, 1545238019690090497, '/hasToDoTasks/AbilityResourcesRemoved', '', 0, 'icon-aliwangwang', 3, 1067246875800000001, '2022-07-08 11:54:28', 1067246875800000001, '2022-07-08 11:55:20'); +INSERT INTO `sys_menu` VALUES (1545290496837820418, 1545238019690090497, '/hasToDoTasks/CommentModeration', '', 0, 'icon-message', 4, 1067246875800000001, '2022-07-08 14:15:39', 1067246875800000001, '2022-07-08 14:15:39'); +INSERT INTO `sys_menu` VALUES (1545292602084827138, 1541261628388888578, '/myAgent/AbilityResourceShelf', '', 0, 'icon-message', 1, 1067246875800000001, '2022-07-08 14:24:01', 1067246875800000001, '2022-07-08 14:24:51'); +INSERT INTO `sys_menu` VALUES (1545312045695377410, 1541261628388888578, '/myAgent/ApplicationforCompetencyRequirements', '', 0, 'icon-copyright', 2, 1067246875800000001, '2022-07-08 15:41:17', 1067246875800000001, '2022-07-08 15:41:17'); +INSERT 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'); +INSERT 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'); +INSERT 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'); + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql b/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql index 3479b3b9..b6416211 100644 --- a/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql +++ b/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql @@ -1,3 +1,4 @@ +-- 涉及到的表：tb_data_category -- 表数据有更新时直接从Navicat选择转储SQL文件替换文件内容！！！ -- 替换前建议备份 -- 注意更新时间 diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index a295775e..79f9634e 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -149,7 +149,7 @@ - + AND tdr.type != '知识库' From 162b016d362656a20c78ba67db8c3744b1acfb3a Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Jul 2022 09:40:55 +0800 Subject: [PATCH 05/80] =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../renren/common/controller/ResourceMountController.java | 1 + .../java/io/renren/modules/resource/dto/ResourceDTO.java | 2 ++ .../io/renren/modules/resource/entity/ResourceEntity.java | 6 ++++++ .../dto/TResourceUndercarriageApplyDTO.java | 2 ++ .../src/main/resources/db/V4.1__resource_add_col.sql | 1 + .../src/main/resources/mapper/resource/ResourceDao.xml | 7 +++++-- 6 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 renren-admin/src/main/resources/db/V4.1__resource_add_col.sql diff --git a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java index 595fdfce..fab949b5 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java @@ -190,6 +190,7 @@ public class ResourceMountController { throw new RuntimeException("该资源已发起下架"); } dto.setUndercarriageReason(tResourceUndercarriageApplyDTO.getReason()); + dto.setUndercarriageEnclosure(tResourceUndercarriageApplyDTO.getEnclosure()); dto.setDelFlag(ResourceEntityDelFlag.NORMAL.getFlag()); // 设置为正常 String userId = SecurityUser.getUserId().toString(); Optional userDTO = Optional.ofNullable(sysUserService.get(Long.valueOf(userId))); diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java index 5b8e9c7c..83e0d4ac 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java @@ -103,6 +103,8 @@ public class ResourceDTO extends AuditingBaseDTO implements Serializable { private String undercarriageReason; @ApiModelProperty(value = "提起下架人员姓名") private String undercarriageUserName; + @ApiModelProperty(value = "下架附件") + private String undercarriageEnclosure; @ApiModelProperty(value = "总体评价") private Integer total; diff --git a/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java b/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java index cb3d4958..546dbdfa 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java @@ -134,6 +134,12 @@ public class ResourceEntity extends BaseEntity { */ private String undercarriageUserName; + + /** + * 下架附件 + */ + private String undercarriageEnclosure; + @TableField(value = "info_list", typeHandler = FastjsonTypeHandler.class) private List infoList; diff --git a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java index e0f49567..b570ee2b 100644 --- a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java @@ -24,4 +24,6 @@ public class TResourceUndercarriageApplyDTO extends AuditingBaseDTO implements S private List> resource; @ApiModelProperty(value = "下架原因") private String reason; + @ApiModelProperty(value = "下架附件") + private String enclosure; } diff --git a/renren-admin/src/main/resources/db/V4.1__resource_add_col.sql b/renren-admin/src/main/resources/db/V4.1__resource_add_col.sql new file mode 100644 index 00000000..f210fe46 --- /dev/null +++ b/renren-admin/src/main/resources/db/V4.1__resource_add_col.sql @@ -0,0 +1 @@ +alter table `tb_data_resource` ADD COLUMN `undercarriage_enclosure` longtext NULL comment '下架附件'; \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 79f9634e..bea045eb 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -33,6 +33,7 @@ + @@ -68,6 +69,7 @@ + @@ -289,7 +291,7 @@ IFNULL( trc.collectCount, 0 ) AS "collectCount", sd.NAME AS "deptName", IFNULL( trc2.isCollect, 'false' ) AS "isCollect", - IF( IFNULL(taa2.approve_status, 0) < 1, '未申请', '已申请' ) AS "applyState" + IF( IFNULL(taa2.approve_status, 0) < 1, '未申请', '已申请' ) AS "applyState" FROM tb_data_resource tdr LEFT JOIN ( SELECT resource_id, AVG( score ) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 @@ -1436,7 +1438,8 @@ From 55ac3b8a609b2bdb5d46d5e15a2a17c8fdf03ea5 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Thu, 21 Jul 2022 09:51:32 +0800 Subject: [PATCH 06/80] =?UTF-8?q?1.=E7=BC=96=E7=9B=AE=E6=9B=B4=E6=96=B0=20?= =?UTF-8?q?2.bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TDemandCommentController.java | 9 +++++++-- .../processForm/service/ApiGatewayService.java | 6 ++++-- .../main/resources/db/R__init_tb_data_catagory.sql | 11 +++++------ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/demandComment/controller/TDemandCommentController.java b/renren-admin/src/main/java/io/renren/modules/demandComment/controller/TDemandCommentController.java index cc292b59..1cf50309 100644 --- a/renren-admin/src/main/java/io/renren/modules/demandComment/controller/TDemandCommentController.java +++ b/renren-admin/src/main/java/io/renren/modules/demandComment/controller/TDemandCommentController.java @@ -27,6 +27,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; @@ -97,10 +98,14 @@ public class TDemandCommentController { // @RequiresPermissions("demandComment:tdemandcomment:info") public Result get(@PathVariable("id") Long id) { TDemandCommentDTO data = tDemandCommentService.get(id); + if (null != data) { + data.setDemandDataDTO(tDemandDataService.get(data.getTargetId())); + return new Result().ok(data); + } else { + return new Result().ok(new TDemandCommentDTO()); + } - data.setDemandDataDTO(tDemandDataService.get(data.getTargetId())); - return new Result().ok(data); } @PostMapping diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/service/ApiGatewayService.java b/renren-admin/src/main/java/io/renren/modules/processForm/service/ApiGatewayService.java index 9da17e01..a62e962c 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/service/ApiGatewayService.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/service/ApiGatewayService.java @@ -61,8 +61,10 @@ public class ApiGatewayService { throw new IllegalArgumentException(String.format("未找到对应的资源id:%s", resourceId)); } String apiUrl = resourceEntity.getApiUrl(); - String methods = resourceEntity.getApiMethodType().toUpperCase(); - + String methods = ""; + if (resourceEntity.getApiMethodType() != null) { + methods = resourceEntity.getApiMethodType().toUpperCase(); + } if (StringUtils.isBlank(apiUrl) || StringUtils.isBlank(methods)){ String msg = String.format("注册api参数为空，跳过 apiUrl:%s, methods:%s, resourceId:%s", apiUrl, methods, resourceId); //重要参数没有当成不需要注册 diff --git a/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql b/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql index b6416211..e5b80814 100644 --- a/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql +++ b/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql @@ -3,7 +3,7 @@ -- 替换前建议备份 -- 注意更新时间 /* - Date: 19/07/2022 10:55:51 + Date: 21/07/2022 09:49:36 */ SET NAMES utf8mb4; @@ -526,20 +526,20 @@ INSERT INTO `tb_data_category` VALUES (1541958011009875969, '数据范围', '组 INSERT INTO `tb_data_category` VALUES (1541958848058736642, '样式服务地址', '组件服务一', '1539529687759314945', 'true', 'input', 'false', 'false', '', 4, 0, 1524924140178481154, '2022-06-29 09:36:52', 1524924140178481154, '2022-06-29 09:36:52', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542755260526624769, '能力类型', '组件服务一', '1534718048405012481', 'true', 'AbilityType', 'false', 'false', '', 1, 0, 1524924140178481154, '2022-07-01 14:21:32', 1524924140178481154, '2022-07-01 14:21:32', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542755491007823873, '组件类型', '组件服务一', '1534718048405012481', 'true', 'ComponentType', 'false', 'false', '', 2, 0, 1524924140178481154, '2022-07-01 14:22:27', 1524924140178481154, '2022-07-01 14:22:27', NULL, NULL, NULL, NULL, NULL); -INSERT INTO `tb_data_category` VALUES (1542759999255478274, '来源应用', '组件服务一', '1534718048405012481', 'true', 'AssociatedApplication', 'false', 'false', '', 19, 0, 1524924140178481154, '2022-07-01 14:40:22', 1524924140178481154, '2022-07-01 14:40:22', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `tb_data_category` VALUES (1542759999255478274, '来源应用', '组件服务一', '1534718048405012481', 'true', 'select', 'false', 'false', '', 19, 0, 1524924140178481154, '2022-07-01 14:40:22', 1524924140178481154, '2022-07-01 14:40:22', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542768397682466818, '服务商', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 13, 0, 1524924140178481154, '2022-07-01 15:13:44', 1524924140178481154, '2022-07-01 15:13:44', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542768571779637250, '服务商联系人', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 14, 0, 1524924140178481154, '2022-07-01 15:14:25', 1524924140178481154, '2022-07-01 15:14:25', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542768616788713473, '服务商联系电话', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 15, 0, 1524924140178481154, '2022-07-01 15:14:36', 1524924140178481154, '2022-07-01 15:14:36', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542769943472234498, '能力类型', '组件服务一', '1538797032767987714', 'true', 'AbilityType', 'false', 'false', '', 1, 0, 1524924140178481154, '2022-07-01 15:19:52', 1524924140178481154, '2022-07-01 15:19:52', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542770087471079426, '组件类型', '组件服务一', '1538797032767987714', 'true', 'ComponentType', 'false', 'false', '', 2, 0, 1524924140178481154, '2022-07-01 15:20:27', 1524924140178481154, '2022-07-01 15:20:27', NULL, NULL, NULL, NULL, NULL); -INSERT INTO `tb_data_category` VALUES (1542773599965798402, '来源应用', '组件服务一', '1538797032767987714', 'true', 'AssociatedApplication', 'false', 'false', '', 14, 0, 1524924140178481154, '2022-07-01 15:34:24', 1524924140178481154, '2022-07-01 15:34:24', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `tb_data_category` VALUES (1542773599965798402, '来源应用', '组件服务一', '1538797032767987714', 'true', 'select', 'false', 'false', '', 14, 0, 1524924140178481154, '2022-07-01 15:34:24', 1524924140178481154, '2022-07-01 15:34:24', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542775012120846337, '能力类型', '基础设施', '1538705458625228801', 'true', 'AbilityType', 'false', 'false', '', 1, 0, 1524924140178481154, '2022-07-01 15:40:01', 1524924140178481154, '2022-07-01 15:40:01', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542775091430940674, '组件类型', '基础设施', '1538705458625228801', 'true', 'ComponentType', 'false', 'false', '', 2, 0, 1524924140178481154, '2022-07-01 15:40:20', 1524924140178481154, '2022-07-01 15:40:20', NULL, NULL, NULL, NULL, NULL); -INSERT INTO `tb_data_category` VALUES (1542775245986848770, '来源应用', '基础设施', '1538705458625228801', 'true', 'AssociatedApplication', 'false', 'false', '', 14, 0, 1524924140178481154, '2022-07-01 15:40:57', 1524924140178481154, '2022-07-01 15:40:57', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `tb_data_category` VALUES (1542775245986848770, '来源应用', '基础设施', '1538705458625228801', 'true', 'select', 'false', 'false', '', 14, 0, 1524924140178481154, '2022-07-01 15:40:57', 1524924140178481154, '2022-07-01 15:40:57', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542777726523400194, '试用地址', '组件服务一', '1539529687759314945', 'true', 'input', 'false', 'false', '', 8, 1, 1524924140178481154, '2022-07-01 15:50:48', 1524924140178481154, '2022-07-16 12:22:57', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542778864555515905, '能力类型', '基础设施', '1539536463208636417', 'true', 'AbilityType', 'false', 'false', '', 1, 0, 1524924140178481154, '2022-07-01 15:55:19', 1524924140178481154, '2022-07-01 15:55:19', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542779816926765057, '组件类型', '组件服务一', '1539536463208636417', 'true', 'ComponentType', 'false', 'false', '', 2, 0, 1524924140178481154, '2022-07-01 15:59:06', 1524924140178481154, '2022-07-01 15:59:06', NULL, NULL, NULL, NULL, NULL); -INSERT INTO `tb_data_category` VALUES (1542780090865147905, '来源应用', '组件服务一', '1539536463208636417', 'true', 'AssociatedApplication', 'false', 'false', '', 14, 0, 1524924140178481154, '2022-07-01 16:00:12', 1524924140178481154, '2022-07-01 16:00:12', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `tb_data_category` VALUES (1542780090865147905, '来源应用', '组件服务一', '1539536463208636417', 'true', 'select', 'false', 'false', '', 14, 0, 1524924140178481154, '2022-07-01 16:00:12', 1524924140178481154, '2022-07-01 16:00:12', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1542785872524468225, '能力类型', '应用资源一', '1534472573403713538', 'true', 'AbilityType', 'false', 'false', '', 1, 0, 1524924140178481154, '2022-07-01 16:23:10', 1524924140178481154, '2022-07-01 16:23:10', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1543894205352337409, '关联组件信息', '应用资源一', '1534472573403713538', 'true', 'AssociatedComponents', 'false', 'false', '', 13, 0, 1524924140178481154, '2022-07-04 17:47:17', 1524924140178481154, '2022-07-04 17:47:17', NULL, NULL, NULL, NULL, NULL); INSERT INTO `tb_data_category` VALUES (1544995280897658882, '1', '组件服务一', '1534472573403713538', 'true', 'input', 'false', 'false', '', 14, 1, 1513433709613187073, '2022-07-07 18:42:34', 1513433709613187073, '2022-07-07 18:42:51', NULL, NULL, NULL, NULL, NULL); @@ -578,4 +578,3 @@ INSERT INTO `tb_data_category` VALUES (1548962613546627073, '部门联系人电 INSERT INTO `tb_data_category` VALUES (1548980404643405825, '使用方式', '组件服务', '1531208527270404097', 'true', 'input', 'true', 'true', '1513714027213660162', 8, 1, 1524924140178481154, '2022-07-18 18:38:02', 1524924140178481154, '2022-07-18 18:43:36', NULL, NULL, NULL, NULL, NULL); SET FOREIGN_KEY_CHECKS = 1; - From 76255c5ff377de81fe795bd2f87c4a4ad1e3144f Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Jul 2022 10:02:03 +0800 Subject: [PATCH 07/80] ... --- .../common/controller/AbilityCenterControllerV2.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java index 9cc4b2ac..c9a88f6a 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java @@ -53,7 +53,7 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/ability/center/v2") public class AbilityCenterControllerV2 { - private static final ExecutorService executor = Executors.newCachedThreadPool(); + private static final ExecutorService executor = Executors.newWorkStealingPool(); private static final Logger logger = LoggerFactory.getLogger(AbilityCenterController.class); private static final ObjectMapper oMapper = new ObjectMapper(); @Autowired @@ -108,10 +108,9 @@ public class AbilityCenterControllerV2 { abilityBatchApplicationDTO.setApplyFlag(applyFlag); // 同一次的申请标识 final Optional deptDTO = Optional.ofNullable(sysDeptService.getByName(bigDateDeptName)); final UserDetail user = SecurityUser.getUser(); - CompletableFuture.runAsync(() -> { - logger.info("处理能力申请！"); + executor.execute(() -> { deal(abilityBatchApplicationDTO, deptDTO, applyFlag, user); - }, executor); + }); return new Result().ok(LocalDateTime.now().toString()); } @@ -132,7 +131,6 @@ public class AbilityCenterControllerV2 { logger.info("申请入参{}", JSON.toJSONString(abilityBatchApplicationDTO)); final Optional deptDTO = Optional.ofNullable(sysDeptService.getByName(bigDateDeptName)); final UserDetail user = SecurityUser.getUser(); - deal(abilityBatchApplicationDTO, deptDTO, applyFlag, user); return new Result().ok(LocalDateTime.now().toString()); } From aad70245d8756a98ea26cb64afaece33b8ac0459 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Jul 2022 10:41:46 +0800 Subject: [PATCH 08/80] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/renren/common/controller/ResourceMountController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java index fab949b5..268a1b3f 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java @@ -153,7 +153,7 @@ public class ResourceMountController { @PostMapping(value = "/undercarriage") @ApiOperation("批量进行能力下架申请") @LogOperation("批量进行能力下架申请") - public Result> undercarriage(@RequestBody TResourceUndercarriageApplyDTO tResourceUndercarriageApplyDTO) { + public Result undercarriage(@RequestBody TResourceUndercarriageApplyDTO tResourceUndercarriageApplyDTO) { // 仿照请求接口 /act/process/lastestPage PageData> page = actProcessService.page(undercarriage_params); if (page.getTotal() <= 0) { // @@ -175,7 +175,7 @@ public class ResourceMountController { } }).filter(index -> index).findAny(); if (undercarriage.isPresent()) { - return new Result>().error("该资源已发起下架"); + return new Result<>().ok("该资源已发起下架"); } return new Result().ok(tResourceUndercarriageApplyDTO.getResource().stream().map(index -> { List dtoList = new ArrayList<>(); From 20b7a2dccd97b7d921a855327ae3d7ea9dbc7548 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Jul 2022 10:54:25 +0800 Subject: [PATCH 09/80] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysNoticeServiceImpl.java | 69 ++++++++++++------- .../src/main/resources/application.yml | 3 + 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/notice/service/impl/SysNoticeServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/notice/service/impl/SysNoticeServiceImpl.java index 9dd35d46..4ff8780e 100644 --- a/renren-admin/src/main/java/io/renren/modules/notice/service/impl/SysNoticeServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/notice/service/impl/SysNoticeServiceImpl.java @@ -21,6 +21,8 @@ import io.renren.modules.sys.service.SysUserService; import io.renren.websocket.WebSocketServer; import io.renren.websocket.data.MessageData; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,12 +31,16 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** * 通知管理 */ @Service public class SysNoticeServiceImpl extends CrudServiceImpl implements SysNoticeService { + private static final ExecutorService executor = Executors.newWorkStealingPool(); + private static final Logger logger = LoggerFactory.getLogger(SysNoticeServiceImpl.class); @Autowired private SysNoticeUserService sysNoticeUserService; @Autowired @@ -85,22 +91,26 @@ public class SysNoticeServiceImpl extends CrudServiceImpl { + //发送给全部用户 + sendAllUser(notice); + }); - //通过WebSocket，提示全部用户，有新通知 - MessageData message = new MessageData().msg(notice.getTitle()); - webSocketServer.sendMessageAll(message); + executor.execute(() -> { + //通过WebSocket，提示全部用户，有新通知 + MessageData message = new MessageData().msg(notice.getTitle()); + webSocketServer.sendMessageAll(message); + }); } else { //选中用户 List userIdList = new ArrayList<>(); @@ -152,12 +166,17 @@ public class SysNoticeServiceImpl extends CrudServiceImpl finalUserIdList = userIdList; + executor.execute(() -> { + //发送给选中用户 + sendUser(notice, finalUserIdList); + }); - //通过WebSocket，提示选中用户，有新通知 - MessageData message = new MessageData().msg(notice.getTitle()); - webSocketServer.sendMessage(userIdList, message); + executor.execute(() -> { + //通过WebSocket，提示选中用户，有新通知 + MessageData message = new MessageData().msg(notice.getTitle()); + webSocketServer.sendMessage(finalUserIdList, message); + }); } } diff --git a/renren-admin/src/main/resources/application.yml b/renren-admin/src/main/resources/application.yml index a84bd4ef..7b8d609c 100644 --- a/renren-admin/src/main/resources/application.yml +++ b/renren-admin/src/main/resources/application.yml @@ -63,6 +63,9 @@ spring: baseline-on-migrate: true baseline-version: 0 validate-on-migrate: true + jackson: + parser: + allow-unquoted-control-chars: true fdfs: From 6a505535450110b5b98f10bf9433ce533ba4eb61 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Jul 2022 11:04:11 +0800 Subject: [PATCH 10/80] =?UTF-8?q?jackson=E5=85=81=E8=AE=B8=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E5=92=8C=E8=BD=AC?= =?UTF-8?q?=E4=B9=89=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renren-admin/src/main/resources/application.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/renren-admin/src/main/resources/application.yml b/renren-admin/src/main/resources/application.yml index 7b8d609c..c365e361 100644 --- a/renren-admin/src/main/resources/application.yml +++ b/renren-admin/src/main/resources/application.yml @@ -65,8 +65,10 @@ spring: validate-on-migrate: true jackson: parser: - allow-unquoted-control-chars: true - + # 允许出现特殊字符和转义符 + allow_unquoted_control_chars: true + #允许出现单引号 + allow_single_quotes: true fdfs: so-timeout: 600000 From abbabe2e9a30b61f6db0ce01f6546d019104bff8 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Jul 2022 11:44:27 +0800 Subject: [PATCH 11/80] npe --- .../listener/v2/CorrectionListenerV2.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java index 17957e42..9326d1a0 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java @@ -146,7 +146,12 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac jdbcTemplate.batchUpdate(sqls); if (auditingBaseDTO.getReject() == null || auditingBaseDTO.getReject() != Boolean.TRUE) { // 都是同意 - batchApplyCode(delegateExecution, dtoList); + try { + batchApplyCode(delegateExecution, dtoList); + } catch (Exception exception) { + logger.error("上架网关失败", exception); + } + } } @@ -296,9 +301,11 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac allMsg.append('\n'); for (TAbilityApplicationDTO abilityApplicationDTO : dtoList) { ResourceEntity resourceEntity = resourceService.selectById(abilityApplicationDTO.getResourceId()); - + if (resourceEntity == null) { + continue; + } //没有groupid当做没有接口，直接跳过 - if (resourceEntity.getGroupId() == null) + if (null == resourceEntity.getGroupId()) continue; String code = UUID.randomUUID().toString(); From 2b6165be0f0e62143a91ccecfafd7a2ba4fbd6c0 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Jul 2022 14:27:24 +0800 Subject: [PATCH 12/80] =?UTF-8?q?websocket=20=E5=8F=91=E9=80=81=E7=AB=99?= =?UTF-8?q?=E5=86=85=E4=BF=A1=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/renren/websocket/WebSocketServer.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java b/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java index 1a1542cb..f9954803 100644 --- a/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java +++ b/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java @@ -16,6 +16,8 @@ import java.io.IOException; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** * WebSocket服务 @@ -24,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap; @Component @ServerEndpoint(value = "/websocket", configurator = WebSocketConfig.class) public class WebSocketServer { + private static final ExecutorService executor = Executors.newWorkStealingPool(); private static final Logger logger = LoggerFactory.getLogger(WebSocketServer.class); public WebSocketServer() { @@ -38,7 +41,6 @@ public class WebSocketServer { @OnOpen public void open(Session session) { Long userId = (Long) session.getUserProperties().get(Constant.USER_KEY); - servers.put(session.getId(), new WebSocketData(userId, session)); } @@ -46,7 +48,7 @@ public class WebSocketServer { public void onClose(Session session) { //客户端断开连接 servers.remove(session.getId()); - log.debug("websocket close, session id：" + session.getId()); + log.info("websocket close, session id：" + session.getId()); } @OnError @@ -57,7 +59,7 @@ public class WebSocketServer { @OnMessage public void onMessage(Session session, String msg) { - log.info("session id: " + session.getId() + "userId：{}， message：" + msg, servers.get(session.getId()).getUserId()); + log.info("session id: " + session.getId() + " userId：{}， message：" + msg, servers.get(session.getId()).getUserId()); } /** @@ -79,7 +81,9 @@ public class WebSocketServer { public void sendMessage(Long userId, MessageData message) { servers.values().forEach(info -> { if (userId.equals(info.getUserId())) { - sendMessage(info.getSession(), message); + executor.execute(() -> { + sendMessage(info.getSession(), message); + }); } }); } @@ -90,7 +94,9 @@ public class WebSocketServer { * @param message 消息内容 */ public void sendMessageAll(MessageData message) { - servers.values().forEach(info -> sendMessage(info.getSession(), message)); + servers.values().forEach(info -> executor.execute(() -> { + sendMessage(info.getSession(), message); + })); } public void sendMessage(Session session, MessageData message) { From 6fae1071ff832b01261987884b8ad7c0147e0551 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Jul 2022 15:18:31 +0800 Subject: [PATCH 13/80] ... --- .../controller/TAbilityApplicationController.java | 2 +- .../java/io/renren/websocket/WebSocketServer.java | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index 54e34a72..656ac606 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -238,7 +238,7 @@ public class TAbilityApplicationController { put("instanceId", tAbilityApplicationDTOList.get(0).getInstanceId()); // 流程id put("resourceOwnerDept", tAbilityApplicationDTOList.get(0).getResourceOwnerDept()); // 资源所属部门信息 put("resources", resourceDTOS);//申请的该部门的能力资源 - if (tAbilityApplicationDTOList.get(0).getApplyFlag().equals("通过")) { + if (tAbilityApplicationDTOList.get(0).getApproveStatus().equals("通过")) { put("ended", true); } else { put("ended", false); diff --git a/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java b/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java index f9954803..09bd6b49 100644 --- a/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java +++ b/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java @@ -16,8 +16,6 @@ import java.io.IOException; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; /** * WebSocket服务 @@ -26,7 +24,6 @@ import java.util.concurrent.Executors; @Component @ServerEndpoint(value = "/websocket", configurator = WebSocketConfig.class) public class WebSocketServer { - private static final ExecutorService executor = Executors.newWorkStealingPool(); private static final Logger logger = LoggerFactory.getLogger(WebSocketServer.class); public WebSocketServer() { @@ -81,9 +78,7 @@ public class WebSocketServer { public void sendMessage(Long userId, MessageData message) { servers.values().forEach(info -> { if (userId.equals(info.getUserId())) { - executor.execute(() -> { - sendMessage(info.getSession(), message); - }); + sendMessage(info.getSession(), message); } }); } @@ -94,9 +89,9 @@ public class WebSocketServer { * @param message 消息内容 */ public void sendMessageAll(MessageData message) { - servers.values().forEach(info -> executor.execute(() -> { - sendMessage(info.getSession(), message); - })); + servers.values().forEach(info -> + sendMessage(info.getSession(), message) + ); } public void sendMessage(Session session, MessageData message) { From 4b99279d8727fc1cb4b35f4c57bc8524f3591ab6 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 21 Jul 2022 15:33:59 +0800 Subject: [PATCH 14/80] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5bug=E4=B8=8E=E8=83=BD?= =?UTF-8?q?=E5=8A=9B=E7=94=B3=E8=AF=B7=E8=8A=82=E7=82=B9=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/renren/common/aspect/ActivitiNoticeAspect.java | 2 +- .../renren/common/controller/AbilityCenterControllerV2.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java index 5adc0930..888da3b5 100644 --- a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java +++ b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java @@ -238,7 +238,7 @@ public class ActivitiNoticeAspect { Long resourceId = null; if (kv.containsKey("resourceId") && kv.get("resourceId") != null) { resourceId = Long.valueOf(kv.get("resourceId").toString()); - } else if (kv.containsKey("id") && kv.get("id") != null && kv.containsKey("-")) { + } else if (kv.containsKey("id") && kv.get("id") != null && !kv.get("id").toString().contains("-")) { resourceId = Long.valueOf(kv.get("id").toString()); } else { resourceId = 0L; diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java index c9a88f6a..8eb9a443 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java @@ -214,8 +214,8 @@ public class AbilityCenterControllerV2 { Boolean basic_facilities = dtoList.stream().map(index -> { Optional resourceDTOOptional = Optional.ofNullable(resourceService.get(Long.valueOf(index.getResourceId()))); // 从本库内查不到 视为其它平台的基础设施资源 - return !resourceDTOOptional.isPresent() || !"基础设施".equals(resourceDTOOptional.get().getType()); - }).filter(index -> !index).findAny().orElse(Boolean.TRUE); + return !resourceDTOOptional.isPresent() || !"基础设施".equals(resourceDTOOptional.isPresent() ? "" : resourceDTOOptional.get().getType()); + }).filter(index -> !index).findAny().orElse(Boolean.FALSE); logger.error("--------------------是否全是基础设施{}----------------------------------------------", basic_facilities); final List ids = dtoList.stream().map(TAbilityApplicationDTO::getId).collect(Collectors.toList()); // 发起申请的表单id // 仿照请求接口 /act/running/startOfBusinessKey From 67f8811b21e4586d953a63f631ea59c0fd853927 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Thu, 21 Jul 2022 15:40:52 +0800 Subject: [PATCH 15/80] ... --- .../java/io/renren/modules/activiti/service/ActTaskService.java | 2 -- renren-admin/src/main/resources/mapper/resource/ResourceDao.xml | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java index 1380766c..8e85a94e 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java @@ -209,8 +209,6 @@ public class ActTaskService extends BaseServiceImpl { for (Task task : list) { TaskDTO dto = new TaskDTO(); this.convertTaskInfo(task, dto); - //Optional sysUserEntity = Optional.ofNullable(sysUserService.selectById(dto.getUserId())); - //dto.setUserName(sysUserEntity.get().getRealName()); Map processVariable = new LinkedHashMap<>(); if (dto.getBusinessKey().startsWith("{") || dto.getBusinessKey().startsWith("[")) { // 为json内容 (特殊处理批量) diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index bea045eb..a345f083 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -791,6 +791,7 @@ WHERE 1 = 1 AND del_flag = 0 AND dept_id = #{deptId} + LIMIT 30 SELECT - COUNT( DISTINCT dept_id ) + COUNT(id) FROM - tb_data_resource - WHERE - del_flag = 0 + sys_dept - SELECT ROUND(COUNT(idt_camera_channel) /10000,1) AS channelCount,region_code,region_name FROM t_camera_channel WHERE region_name is not null GROUP BY region_code,region_name + SELECT ROUND(COUNT(a.idt_camera_channel) /10000,1) AS channelCount,b.region_code,b.region_name + FROM t_camera_channel a INNER JOIN t_region b + ON a.region_code = b.region_code + WHERE a.region_name is not null or a.region_name != '' + GROUP BY b.region_code,b.region_name diff --git a/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml b/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml index 0aeae4d0..8e52a2fc 100644 --- a/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml +++ b/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml @@ -29,4 +29,25 @@ ) + + + UPDATE t_region a + INNER JOIN + ( + SELECT COUNT(idt_camera_channel) AS channel_count,region_code FROM t_camera_channel GROUP BY region_code + ) b + ON a.region_code = b.region_code + SET a.channel_count = b.channel_count + + + + + + + + + + + + \ No newline at end of file From af7c18df12045517e04f0eb99601a654349ef4c8 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 22 Jul 2022 11:57:28 +0800 Subject: [PATCH 25/80] =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=86=85=E5=87=BA=E7=8E=B0=E5=BE=85=E5=8A=9E=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../renren/modules/activiti/controller/HistoryController.java | 1 + .../src/main/resources/mapper/activiti/ProcessActivityDao.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java index c1cfde9b..09d5765e 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java @@ -130,6 +130,7 @@ public class HistoryController { if (params.containsKey("processDefinitionKey") && StringUtils.isNotEmpty(params.get("processDefinitionKey").toString())) { params.replace("processDefinitionKey", params.get("processDefinitionKey").toString() + "%"); } + params.put("ended", "true"); PageData page = activitiService.getMyProcessInstancePage(params); setExtraProcessProperties(Optional.ofNullable(page.getList()).orElse(new ArrayList<>())); return new Result().ok(page); diff --git a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml index a43f1cd6..329e91d2 100644 --- a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml +++ b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml @@ -56,6 +56,9 @@ and aht.PROC_DEF_ID_ LIKE #{processDefinitionKey} + + and ahp.END_TIME_ IS NOT NULL + ORDER BY ahp.START_TIME_ DESC From 375d482ce2551514f5f725a3e9f0f81e7b71f43a Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 22 Jul 2022 12:03:23 +0800 Subject: [PATCH 26/80] =?UTF-8?q?1=E3=80=81flyway=20V4.1=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BAV4.2=EF=BC=8C=E8=AF=AD=E5=8F=A5=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=AD=98=E6=94=BE=E5=9C=B0=E5=9D=80=E6=94=B9=E4=B8=BA?= =?UTF-8?q?resources/db=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/V4.2__init_t_region.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config/db/V4.1__init_t_region.sql => renren-admin/src/main/resources/db/V4.2__init_t_region.sql (100%) diff --git a/config/db/V4.1__init_t_region.sql b/renren-admin/src/main/resources/db/V4.2__init_t_region.sql similarity index 100% rename from config/db/V4.1__init_t_region.sql rename to renren-admin/src/main/resources/db/V4.2__init_t_region.sql From c950efc96ed638975226684c735d16aa81a9bae7 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 22 Jul 2022 13:32:23 +0800 Subject: [PATCH 27/80] =?UTF-8?q?=E5=B7=B2=E5=8A=9E=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B5=81=E7=A8=8B=E5=86=85=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HistoryController.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java index 09d5765e..bc481704 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java @@ -22,6 +22,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.activiti.engine.HistoryService; +import org.activiti.engine.RepositoryService; +import org.activiti.engine.RuntimeService; +import org.activiti.engine.TaskService; +import org.activiti.engine.history.HistoricProcessInstance; +import org.activiti.engine.history.HistoricProcessInstanceQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -45,6 +51,9 @@ import java.util.Optional; @RequestMapping("/act/his") @Api(tags = "流程历史") public class HistoryController { + + @Autowired + protected HistoryService historyService_; @Autowired private ActHistoryService historyService; @Autowired @@ -59,6 +68,13 @@ public class HistoryController { @Autowired private TDemandDataService tDemandDataService; + @Autowired + protected TaskService taskService; + @Autowired + protected RepositoryService repositoryService; + @Autowired + protected RuntimeService runtimeService; + @GetMapping("getInstImage") @ApiOperation(value = "获取流程活动图", produces = "application/octet-stream") @LogOperation("获取流程活动图") @@ -136,6 +152,15 @@ public class HistoryController { return new Result().ok(page); } + @GetMapping("getVariablesByInstanceId") + @ApiOperation("获取已办任务流程参数") + @LogOperation("获取已办任务流程参数") + public Result getVariablesByInstanceId(String instanceId, String variableName) { + HistoricProcessInstanceQuery query = historyService_.createHistoricProcessInstanceQuery(); + Optional processInstance = Optional.ofNullable(query.processInstanceId(instanceId).includeProcessVariables().singleResult()); + return new Result().ok(processInstance.get().getProcessVariables().get(variableName)); + } + @GetMapping("getDeptHandledInstancePage") @ApiOperation("已办任务：根据登录账号查询其所在部门的已办任务") @LogOperation("已办任务：根据登录账号查询其所在部门的已办任务") From 81b5b28743a9b283c327f70271ed434f8d2e5a0b Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Fri, 22 Jul 2022 14:43:04 +0800 Subject: [PATCH 28/80] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=87=91=E5=AE=8F?= =?UTF-8?q?=E7=8E=AF=E5=A2=83-=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1-?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=9B=BE=E8=B0=B1-=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B-=E8=83=BD=E5=8A=9B=E9=9B=86-=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=95=B0=E6=8D=AE=E8=B5=84=E6=BA=90=E6=9F=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/renren/common/controller/CensusController.java | 2 +- .../modules/resource/service/impl/ResourceServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java index 1c78a1ca..9b8183a4 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java @@ -308,7 +308,7 @@ public class CensusController { } catch (JsonProcessingException e) { throw new RuntimeException(e); } - }).reversed().thenComparing(i -> i.toString()) + }).reversed().thenComparing(Object::toString) ); // 按应用领域数目逆序排序 return new Result>>().ok(result); } 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 bc2188c8..f168e1e8 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 @@ -1077,7 +1077,7 @@ public class ResourceServiceImpl extends CrudServiceImpl factory = DataResourceFactory.build(); if (factory.isPresent()) { From aa54a9a8fc8a37bfa784ad9397773b595e03a4cc Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 22 Jul 2022 15:45:11 +0800 Subject: [PATCH 29/80] =?UTF-8?q?pageWithAttr=E5=A2=9E=E5=8A=A0=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=8A=A0=E5=85=A5=E7=94=B3=E8=B4=AD=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/renren/modules/resource/dto/ResourceDTO.java | 2 ++ .../renren/modules/security/config/ShiroConfig.java | 2 +- .../main/resources/mapper/resource/ResourceDao.xml | 11 ++++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java index 83e0d4ac..34a3383f 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java @@ -92,6 +92,8 @@ public class ResourceDTO extends AuditingBaseDTO implements Serializable { private String applyCount; @ApiModelProperty(value = "部门ID集合") private List deptIds; + @ApiModelProperty(value = "是否在申购车内") + private Boolean isInShoppingCart; @ApiModelProperty(value = "属性信息") diff --git a/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java b/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java index 48e9db01..dcbe3650 100644 --- a/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java +++ b/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java @@ -31,7 +31,7 @@ public class ShiroConfig { DefaultWebSessionManager sessionManager = new DefaultWebSessionManager(); sessionManager.setSessionValidationSchedulerEnabled(false); sessionManager.setSessionIdUrlRewritingEnabled(false); - + sessionManager.setGlobalSessionTimeout(-1000l); return sessionManager; } diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 6b8964bc..a79a2a93 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -105,13 +105,15 @@ IFNULL(trc.collectCount, 0) AS "collectCount", IFNULL(sd.name, '暂无部门单位信息') AS "deptName", IFNULL(trc2.isCollect, 'false') AS "isCollect", - (IFNULL(tdr.visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(taa.applyCount, 0)+ IFNULL(trc.collectCount, 0)) AS - total + (IFNULL(tdr.visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(taa.applyCount, 0)+ IFNULL(trc.collectCount, 0)) AS total, + IF ( IFNULL( trcar.car, 0 ) > 0, TRUE, FALSE ) AS "isInShoppingCart" FROM tb_data_resource tdr LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id + LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trcar + ON tdr.id = trcar.resource_id LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag @@ -360,11 +362,14 @@ IFNULL(trc.collectCount, 0) AS "collectCount", sd.name AS "deptName", IFNULL(trc2.isCollect, 'false') AS "isCollect", - IFNULL(taa2.approve_status, '未申请') AS "applyState" + IFNULL(taa2.approve_status, '未申请') AS "applyState", + IF ( IFNULL( trcar.car, 0 ) > 0, TRUE, FALSE ) AS "isInShoppingCart" FROM tb_data_resource tdr LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id + LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trcar + ON tdr.id = trcar.resource_id LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag From 72cf26ec72a8cd7fcc430ce8344266a80e581607 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 22 Jul 2022 16:06:44 +0800 Subject: [PATCH 30/80] =?UTF-8?q?1=E3=80=81=E8=83=BD=E5=8A=9B=E9=9B=86?= =?UTF-8?q?=E5=B8=82-=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?sql=E8=AF=AD=E5=8F=A5=E5=A2=9E=E5=8A=A0=20check=5Fstatus=20?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/monitor/CameraChannelMapper.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml b/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml index beb03e0d..32fafddb 100644 --- a/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml +++ b/renren-admin/src/main/resources/mapper/monitor/CameraChannelMapper.xml @@ -145,7 +145,9 @@ AND tcc.node_name LIKE CONCAT(#{path},'%') - AND tcc.check_status IN (${map.checkStatus}) + + AND tcc.check_status IN (${map.checkStatus}) + AND tcc.gps_x != '' AND tcc.gps_y != '' AND tcc.gps_x IS NOT NULL @@ -193,8 +195,9 @@ AND tcc.node_name LIKE CONCAT(#{path},'%') - - AND tcc.check_status IN (${map.checkStatus}) + + AND tcc.check_status IN (${map.checkStatus}) + AND tcc.channel_name LIKE CONCAT('%',#{map.cameraName},'%') From 888e148fb4cb9bb5ff73a3c41d7f1aa298cc9796 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 22 Jul 2022 16:10:33 +0800 Subject: [PATCH 31/80] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/resource/ResourceDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index a79a2a93..11c0e757 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -112,7 +112,7 @@ LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id - LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trcar + LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} GROUP BY resource_id ) trcar ON tdr.id = trcar.resource_id LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id @@ -368,7 +368,7 @@ tb_data_resource tdr LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id - LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trcar + LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} GROUP BY resource_id ) trcar ON tdr.id = trcar.resource_id LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id From 676a1d2e17444d5fea11d8ad392f3bdcc8b2bdac Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 22 Jul 2022 16:47:32 +0800 Subject: [PATCH 32/80] =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/AbilityCenterControllerV2.java | 12 +++++++++--- .../listener/v2/CorrectionListenerV2.java | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java index 8eb9a443..263e9ad7 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java @@ -213,9 +213,15 @@ public class AbilityCenterControllerV2 { }, executor); Boolean basic_facilities = dtoList.stream().map(index -> { - Optional resourceDTOOptional = Optional.ofNullable(resourceService.get(Long.valueOf(index.getResourceId()))); // 从本库内查不到 视为其它平台的基础设施资源 - return !resourceDTOOptional.isPresent() || !"基础设施".equals(resourceDTOOptional.isPresent() ? "" : resourceDTOOptional.get().getType()); - }).filter(index -> !index).findAny().orElse(Boolean.FALSE); + Optional resourceDTOOptional = Optional.ofNullable(resourceService.get(Long.valueOf(index.getResourceId()))); + if (!resourceDTOOptional.isPresent()) { // 从本库内查不到 视为其它平台的基础设施资源 + return true; + } + if ("基础设施".equals(resourceDTOOptional.get().getType())) { // 基础设施 + return true; + } + return false; + }).filter(index -> index).findAny().orElse(Boolean.FALSE); logger.error("--------------------是否全是基础设施{}----------------------------------------------", basic_facilities); final List ids = dtoList.stream().map(TAbilityApplicationDTO::getId).collect(Collectors.toList()); // 发起申请的表单id // 仿照请求接口 /act/running/startOfBusinessKey diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java index 9326d1a0..47feab22 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java @@ -120,7 +120,7 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac /** * 结束审批 * - * @param kv + * @param delegateExecution */ private void endTake(DelegateExecution delegateExecution) { // 进入最后结束节点 Map kv = delegateExecution.getVariables(); @@ -151,7 +151,6 @@ public class CorrectionListenerV2 implements TaskListener, ExecutionListener, Ac } catch (Exception exception) { logger.error("上架网关失败", exception); } - } } From aad23ca5eecafe6105d3146f20b7bbed7c234f3e Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 22 Jul 2022 17:11:21 +0800 Subject: [PATCH 33/80] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20=E6=98=AF=E5=90=A6=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E7=94=B3=E8=B4=AD=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processForm/listener/v2/DataCenterListenerV2.java | 2 +- .../src/main/resources/mapper/resource/ResourceDao.xml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/DataCenterListenerV2.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/DataCenterListenerV2.java index b4fb420a..6a48eca3 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/DataCenterListenerV2.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/DataCenterListenerV2.java @@ -128,7 +128,7 @@ public class DataCenterListenerV2 implements TaskListener, ExecutionListener, Ac if (resourceDTOOptional.isPresent()) { return !StringUtils.contains(resourceDTOOptional.get().getShareCondition(), "免批"); // 存在非免批 } else { - return false; + return true; // 摄像头非免批 } }).findAny(); if (!tAbilityApplicationDTO.isPresent()) { // 全是免批 diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 11c0e757..2ac384ad 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -293,7 +293,8 @@ IFNULL( trc.collectCount, 0 ) AS "collectCount", sd.NAME AS "deptName", IFNULL( trc2.isCollect, 'false' ) AS "isCollect", - IF( IFNULL(taa2.approve_status, 0) < 1, '未申请', '已申请' ) AS "applyState" + IF( IFNULL(taa2.approve_status, 0) < 1, '未申请', '已申请' ) AS "applyState", + IF ( IFNULL( trcar.car, 0 ) > 0, TRUE, FALSE ) AS "isInShoppingCart" FROM tb_data_resource tdr LEFT JOIN ( SELECT resource_id, AVG( score ) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 @@ -302,6 +303,8 @@ = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id + LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} GROUP BY resource_id ) trcar + ON tdr.id = trcar.resource_id LEFT JOIN ( SELECT resource_id, From 573c55687cce13cb9a69848da0dc57f6a5be3e19 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 22 Jul 2022 17:21:45 +0800 Subject: [PATCH 34/80] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=87=BA=E6=98=AF=E5=90=A6=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/resource/dto/ResourceDTO.java | 2 ++ .../resources/mapper/resource/ResourceDao.xml | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java index 34a3383f..803a6d42 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java @@ -94,6 +94,8 @@ public class ResourceDTO extends AuditingBaseDTO implements Serializable { private List deptIds; @ApiModelProperty(value = "是否在申购车内") private Boolean isInShoppingCart; + @ApiModelProperty(value = "审核状态：通过，不通过") + private String approveStatus; @ApiModelProperty(value = "属性信息") diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 2ac384ad..9e7eaf63 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -105,14 +105,16 @@ IFNULL(trc.collectCount, 0) AS "collectCount", IFNULL(sd.name, '暂无部门单位信息') AS "deptName", IFNULL(trc2.isCollect, 'false') AS "isCollect", - (IFNULL(tdr.visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(taa.applyCount, 0)+ IFNULL(trc.collectCount, 0)) AS total, + (IFNULL(tdr.visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(taa.applyCount, 0)+ IFNULL(trc.collectCount, 0)) AS + total, IF ( IFNULL( trcar.car, 0 ) > 0, TRUE, FALSE ) AS "isInShoppingCart" FROM tb_data_resource tdr LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id - LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} GROUP BY resource_id ) trcar + LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND + user_id = #{dto.creator} GROUP BY resource_id ) trcar ON tdr.id = trcar.resource_id LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id @@ -294,7 +296,8 @@ sd.NAME AS "deptName", IFNULL( trc2.isCollect, 'false' ) AS "isCollect", IF( IFNULL(taa2.approve_status, 0) < 1, '未申请', '已申请' ) AS "applyState", - IF ( IFNULL( trcar.car, 0 ) > 0, TRUE, FALSE ) AS "isInShoppingCart" + IF ( IFNULL( trcar.car, 0 ) > 0, TRUE, FALSE ) AS "isInShoppingCart", + IF( IFNULL(taa3.approve_status, 0) < 1, '未通过', '通过' ) AS "approveStatus", FROM tb_data_resource tdr LEFT JOIN ( SELECT resource_id, AVG( score ) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 @@ -303,7 +306,8 @@ = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id - LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} GROUP BY resource_id ) trcar + LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND + user_id = #{dto.creator} GROUP BY resource_id ) trcar ON tdr.id = trcar.resource_id LEFT JOIN ( SELECT @@ -321,6 +325,9 @@ ) trc2 ON tdr.id = trc2.resource_id LEFT JOIN ( SELECT resource_id, COUNT( approve_status ) approve_status FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 AND user_id = #{userId} GROUP BY resource_id ) taa2 ON tdr.id = taa2.resource_id + LEFT JOIN ( SELECT resource_id, COUNT( approve_status ) approve_status FROM t_ability_application WHERE 1 = 1 + AND del_flag = 0 AND user_id = #{userId} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id = + taa3.resource_id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id WHERE 1 = 1 @@ -371,7 +378,8 @@ tb_data_resource tdr LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trs ON tdr.id = trs.resource_id - LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND user_id = #{dto.creator} GROUP BY resource_id ) trcar + LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND + user_id = #{dto.creator} GROUP BY resource_id ) trcar ON tdr.id = trcar.resource_id LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id From 47e873ecab013b0149b83a8ad23edf0e0d4ea0f6 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 22 Jul 2022 17:35:29 +0800 Subject: [PATCH 35/80] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renren-admin/src/main/resources/mapper/resource/ResourceDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 9e7eaf63..20cbbe3a 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -297,7 +297,7 @@ IFNULL( trc2.isCollect, 'false' ) AS "isCollect", IF( IFNULL(taa2.approve_status, 0) < 1, '未申请', '已申请' ) AS "applyState", IF ( IFNULL( trcar.car, 0 ) > 0, TRUE, FALSE ) AS "isInShoppingCart", - IF( IFNULL(taa3.approve_status, 0) < 1, '未通过', '通过' ) AS "approveStatus", + IF( IFNULL(taa3.approve_status, 0) < 1, '未通过', '通过' ) AS "approveStatus" FROM tb_data_resource tdr LEFT JOIN ( SELECT resource_id, AVG( score ) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 From 51ab0f7c78409c9b11eb8b5406f92c19c359816f Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 22 Jul 2022 17:54:17 +0800 Subject: [PATCH 36/80] =?UTF-8?q?=E5=B1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renren-admin/src/main/resources/mapper/resource/ResourceDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 20cbbe3a..618e9459 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -307,7 +307,7 @@ LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trc ON tdr.id = trc.resource_id LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 AND - user_id = #{dto.creator} GROUP BY resource_id ) trcar + user_id = #{userId} GROUP BY resource_id ) trcar ON tdr.id = trcar.resource_id LEFT JOIN ( SELECT From ca0bb90e1f011a2c4975344032a59f7a03b3b567 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Fri, 22 Jul 2022 18:43:45 +0800 Subject: [PATCH 37/80] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/resource/ResourceDao.xml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 618e9459..e9a0a061 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -133,10 +133,10 @@ AND tdr.type != '赋能案例' - AND MATCH (tdr.type) AGAINST ( #{dto.type} IN NATURAL LANGUAGE MODE) + AND MATCH (tdr.type) AGAINST ( #{dto.type} IN BOOLEAN MODE) - AND MATCH (tdr.name) AGAINST ( #{dto.name} IN NATURAL LANGUAGE MODE) + AND MATCH (tdr.name) AGAINST ( #{dto.name} IN BOOLEAN MODE) AND tdr.district_id = #{dto.districtId} @@ -170,7 +170,7 @@ SELECT data_resource_id FROM tb_data_attr WHERE attr_type = #{item.attrType} - AND MATCH ( attr_value) AGAINST ( #{item.attrValue} IN NATURAL LANGUAGE MODE) + AND MATCH ( attr_value) AGAINST ( #{item.attrValue} IN BOOLEAN MODE) AND del_flag = 0 ) tb GROUP BY tb.data_resource_id @@ -248,11 +248,11 @@ AND tdr.del_flag = 0 - AND MATCH (tdr.type) AGAINST ( #{type} IN NATURAL LANGUAGE MODE) + AND MATCH (tdr.type) AGAINST ( #{type} IN BOOLEAN MODE) - AND MATCH (tdr.name) AGAINST ( #{name} IN NATURAL LANGUAGE MODE) + AND MATCH (tdr.name) AGAINST ( #{name} IN BOOLEAN MODE) ORDER BY ${orderFiled} ${orderType} LIMIT ${pageNum}, ${pageSize} @@ -399,7 +399,7 @@ AND tdr.type != '赋能案例' - AND MATCH (tdr.name) AGAINST ( #{dto.name} IN NATURAL LANGUAGE MODE) + AND MATCH (tdr.name) AGAINST ( #{dto.name} IN BOOLEAN MODE) AND tdr.type = #{dto.type} @@ -449,7 +449,7 @@ 1 = 1 AND tdr.del_flag = 0 - AND MATCH (tdr.name) AGAINST ( #{dto.name} IN NATURAL LANGUAGE MODE) + AND MATCH (tdr.name) AGAINST ( #{dto.name} IN BOOLEAN MODE) AND tdr.type = #{dto.type} @@ -481,8 +481,7 @@ 1 = 1 AND tdr.del_flag = 0 - AND MATCH (tdr.name) AGAINST ( #{dto.name} IN NATURAL LANGUAGE MODE) - + AND MATCH (tdr.name) AGAINST ( #{dto.name} IN BOOLEAN MODE) AND tdr.type = #{dto.type} @@ -1051,7 +1050,7 @@ AND tdr.del_flag = 0 AND tda.del_flag = 0 AND tdr.id = tda.data_resource_id - AND MATCH (attr_value) AGAINST ( #{type} IN NATURAL LANGUAGE MODE) + AND MATCH (attr_value) AGAINST ( #{type} IN BOOLEAN MODE) + SELECT channel_id AS channelId,channel_name AS channelName FROM t_camera_channel + WHERE channel_id = #{channelId} LIMIT 1 + \ No newline at end of file From a68d24f687ca0cdda8ebf1dd4e58240b214f36b7 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Tue, 26 Jul 2022 10:29:22 +0800 Subject: [PATCH 46/80] npe --- doc/后端开发约定.md | 15 +++++++++++++++ .../resource/controller/ResourceController.java | 8 +++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 doc/后端开发约定.md diff --git a/doc/后端开发约定.md b/doc/后端开发约定.md new file mode 100644 index 00000000..7f9ac6f2 --- /dev/null +++ b/doc/后端开发约定.md @@ -0,0 +1,15 @@ +## 能力超市后端开发约定 + +### 关于数据库或orm + +- 数据库版本管理工具使用flyway，请将文件resource目录下对应位置；文件名称使用 R__XXX 或 Vn.n__XXX ，R开头文件表明该文件为可重复执行sql，当文件内容更改时，该sql文件会在启动时再次执行一次，即该文件无版本执行限制，常用于数据初始化或数据迁移；V开头的文件为版本约束文件，常用于数据库表DDL操作，使用场景一般为创表、加字段、加索引等ddl操作，文件一旦被执行过，不会再次重复执行； +- 使用flyway管理的ddl语句，对表的操作语句不要指定Schema（Database），防止在不同地区部署的数据库名称不一致导致执行异常； +- 使用flyway管理的ddl语句，增加表的字段时不要指定新增字段位于已有字段后;防止表内不存在指定表字段导致ddl失败； + +### 关于编码风格checkstyle + +- 使用idea的同事可以安装checkstyle插件，对更改的文件内容进行代码格式化； + +### 关于性能 + +- 减少使用递归的使用 \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java index 9ecb2558..d52cd427 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java @@ -132,8 +132,10 @@ public class ResourceController { PageData page = resourceService.page(params); page.getList().forEach(item -> { item.setInfoList(resourceService.selectAttrsByResourceId(item.getId())); - String deptName = sysDeptService.get(item.getDeptId()).getName(); - item.setDeptName(StringUtils.isNotBlank(deptName) ? deptName : "--"); + if (item.getDeptId() != null) { + String deptName = sysDeptService.get(item.getDeptId()).getName(); + item.setDeptName(StringUtils.isNotBlank(deptName) ? deptName : "--"); + } }); return new Result>().ok(page); } @@ -561,7 +563,7 @@ public class ResourceController { @GetMapping("/list") @ApiOperation("能力查询") @LogOperation("能力查询") - public Result list(@ApiIgnore @RequestParam Map params){ + public Result list(@ApiIgnore @RequestParam Map params) { return new Result<>().ok(resourceService.list(params)); } From efdda05ec2ca1c3cc94caf479b57f1edda72e3f3 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Tue, 26 Jul 2022 15:34:13 +0800 Subject: [PATCH 47/80] =?UTF-8?q?=E9=97=A8=E6=88=B7=E9=A6=96=E9=A1=B5-?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E8=83=BD=E5=8A=9B-=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=83=BD=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResourceServiceImpl.java | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 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 fc4bf543..584c4b71 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 @@ -701,13 +701,13 @@ public class ResourceServiceImpl extends CrudServiceImpl applyAreaList = resourceDao.selectApplyArea(userId); - //没有收藏和申请过，按最热能力选取,否则根据应用领域最多类型推荐 + JSONObject object = new JSONObject(); object.put("pageNum", 0); object.put("pageSize", 9); object.put("orderFiled", "total"); object.put("orderType", "DESC"); - Page resultPage = (Page) this.selectMostPopular(object); + //根据收藏和申请的资源所属应用领域最多类型推荐，若没有收藏和申请数据或者查询出来的数据不足9条，按最热能力选取不重复的补足 if (!applyAreaList.isEmpty()) { ResourceDTO resourceDTO = new ResourceDTO(); ArrayList list = new ArrayList<>(); @@ -724,18 +724,27 @@ public class ResourceServiceImpl extends CrudServiceImpl page = (Page) this.pageWithAttrs(jsonObject, selectDTOPageSpecilTotal); //若查出数据不足9条则在热门能力补充缺少的数量 if (page.getRecords().size() < 9) { - for (int i = 0; page.getRecords().size() < 9; i++) { - for (int j = 0; j < page.getRecords().size(); j++) { - if (!page.getRecords().get(j).getId().equals(resultPage.getRecords().get(i).getId())) { - page.getRecords().add(resultPage.getRecords().get(i)); - break; + Page resultPage = (Page) this.selectMostPopular(object); + do { + resultPage.getRecords().forEach(p->{ + //如果集合中不存在，则进行添加 + if (!page.getRecords().contains(p)){ + page.getRecords().add(p); } - } - } + }); + }while (page.getRecords().size() < 9); + //for (int i = 0; page.getRecords().size() < 9; i++) { + // for (int j = 0; j < page.getRecords().size(); j++) { + // if (!page.getRecords().get(j).getId().equals(resultPage.getRecords().get(i).getId())) { + // page.getRecords().add(resultPage.getRecords().get(i)); + // break; + // } + // } + //} } return page; } else { - return resultPage; + return this.selectMostPopular(object); } } @@ -1926,6 +1935,7 @@ public class ResourceServiceImpl extends CrudServiceImpl Date: Tue, 26 Jul 2022 16:13:02 +0800 Subject: [PATCH 48/80] ... --- .../modules/log/task/{clearLogTask.java => ClearLogTask.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename renren-admin/src/main/java/io/renren/modules/log/task/{clearLogTask.java => ClearLogTask.java} (95%) diff --git a/renren-admin/src/main/java/io/renren/modules/log/task/clearLogTask.java b/renren-admin/src/main/java/io/renren/modules/log/task/ClearLogTask.java similarity index 95% rename from renren-admin/src/main/java/io/renren/modules/log/task/clearLogTask.java rename to renren-admin/src/main/java/io/renren/modules/log/task/ClearLogTask.java index 45300d47..c1a3304d 100644 --- a/renren-admin/src/main/java/io/renren/modules/log/task/clearLogTask.java +++ b/renren-admin/src/main/java/io/renren/modules/log/task/ClearLogTask.java @@ -17,9 +17,9 @@ import java.util.Date; * 清理操作日志表任务 */ @Component("clearLogTask") -public class clearLogTask implements ITask { +public class ClearLogTask implements ITask { - private static final Logger logger = LoggerFactory.getLogger(clearLogTask.class); + private static final Logger logger = LoggerFactory.getLogger(ClearLogTask.class); @Autowired private SysLogOperationDao sysLogOperationDao; From 8968c1017d78b814cc294de510dcbb8e2254c6f8 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Tue, 26 Jul 2022 16:25:53 +0800 Subject: [PATCH 49/80] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=B8=85=E7=90=86?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renren-admin/src/main/resources/db/R__insert_schedule_job.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 renren-admin/src/main/resources/db/R__insert_schedule_job.sql diff --git a/renren-admin/src/main/resources/db/R__insert_schedule_job.sql b/renren-admin/src/main/resources/db/R__insert_schedule_job.sql new file mode 100644 index 00000000..ce7b673d --- /dev/null +++ b/renren-admin/src/main/resources/db/R__insert_schedule_job.sql @@ -0,0 +1,3 @@ +SET FOREIGN_KEY_CHECKS = 0; +REPLACE INTO `schedule_job` (`id`, `bean_name`, `params`, `cron_expression`, `status`, `remark`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1551845641938800641, 'clearLogTask', '7', '5 5 0 * * ? *', 1, '定期清理操作日志', 1067246875800000001, '2022-07-26 16:23:28', 1067246875800000001, '2022-07-26 16:23:28'); +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file From ec20e986fadbab46d5c0d477c0d512b0c25f7d72 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Tue, 26 Jul 2022 16:29:15 +0800 Subject: [PATCH 50/80] ... --- renren-admin/src/main/resources/db/R__insert_schedule_job.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renren-admin/src/main/resources/db/R__insert_schedule_job.sql b/renren-admin/src/main/resources/db/R__insert_schedule_job.sql index ce7b673d..148daee3 100644 --- a/renren-admin/src/main/resources/db/R__insert_schedule_job.sql +++ b/renren-admin/src/main/resources/db/R__insert_schedule_job.sql @@ -1,3 +1,3 @@ SET FOREIGN_KEY_CHECKS = 0; -REPLACE INTO `schedule_job` (`id`, `bean_name`, `params`, `cron_expression`, `status`, `remark`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1551845641938800641, 'clearLogTask', '7', '5 5 0 * * ? *', 1, '定期清理操作日志', 1067246875800000001, '2022-07-26 16:23:28', 1067246875800000001, '2022-07-26 16:23:28'); +REPLACE INTO `schedule_job` (`id`, `bean_name`, `params`, `cron_expression`, `status`, `remark`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1551845641938800641, 'clearLogTask', '7', '5 5 0 * * ? *', 1, '定期清理操作日志', 1067246875800000001, NOW(), 1067246875800000001, NOW()); SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file From df86ed661f5bc4322acb6f5fdb73443d874e1438 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Tue, 26 Jul 2022 17:03:38 +0800 Subject: [PATCH 51/80] =?UTF-8?q?websocket=E5=AE=9A=E6=97=B6=E5=BF=83?= =?UTF-8?q?=E8=B7=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../renren/websocket/task/HeartRateTask.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 renren-admin/src/main/java/io/renren/websocket/task/HeartRateTask.java diff --git a/renren-admin/src/main/java/io/renren/websocket/task/HeartRateTask.java b/renren-admin/src/main/java/io/renren/websocket/task/HeartRateTask.java new file mode 100644 index 00000000..58e95139 --- /dev/null +++ b/renren-admin/src/main/java/io/renren/websocket/task/HeartRateTask.java @@ -0,0 +1,35 @@ +package io.renren.websocket.task; + +import io.renren.modules.job.task.ITask; +import io.renren.websocket.WebSocketServer; +import io.renren.websocket.data.MessageData; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + + +/** + * 与websocket客户端定时心跳 + */ +@Component("heartRateTask") +public class HeartRateTask implements ITask { + private static final Logger logger = LoggerFactory.getLogger(HeartRateTask.class); + + @Autowired + private WebSocketServer webSocketServer; + + /** + * 执行定时任务接口 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String params) { + logger.info("websocket心跳"); + MessageData message = new MessageData().msg("heartRate:" + LocalDateTime.now()); + webSocketServer.sendMessageAll(message); + } +} From 4f03039109058eb7d98782d470f2425d3c14c62d Mon Sep 17 00:00:00 2001 From: wangliwen Date: Tue, 26 Jul 2022 17:08:06 +0800 Subject: [PATCH 52/80] ... --- renren-admin/src/main/resources/db/R__insert_schedule_job.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/renren-admin/src/main/resources/db/R__insert_schedule_job.sql b/renren-admin/src/main/resources/db/R__insert_schedule_job.sql index 148daee3..fb1c8bcb 100644 --- a/renren-admin/src/main/resources/db/R__insert_schedule_job.sql +++ b/renren-admin/src/main/resources/db/R__insert_schedule_job.sql @@ -1,3 +1,4 @@ SET FOREIGN_KEY_CHECKS = 0; REPLACE INTO `schedule_job` (`id`, `bean_name`, `params`, `cron_expression`, `status`, `remark`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1551845641938800641, 'clearLogTask', '7', '5 5 0 * * ? *', 1, '定期清理操作日志', 1067246875800000001, NOW(), 1067246875800000001, NOW()); +REPLACE INTO `schedule_job` (`id`, `bean_name`, `params`, `cron_expression`, `status`, `remark`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1551856342346502145, 'heartRateTask', '', '0 * * * * ? *', 1, 'websocket客户端定时心跳', 1067246875800000001, NOW(), 1067246875800000001, NOW()); SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file From 68cf80df1ffc9124e9b3221b27e96369c546aa87 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Tue, 26 Jul 2022 17:55:37 +0800 Subject: [PATCH 53/80] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=9C=B0=E5=8C=BA=E4=BF=A1=E6=81=AF=E5=90=8E?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=9C=B0=E5=8C=BA=E4=BF=A1=E6=81=AF=E5=89=8D?= =?UTF-8?q?=E5=85=88=E6=B8=85=E7=A9=BA=E8=A1=A8=E6=A0=BCt=5Fcamera=5Forgan?= =?UTF-8?q?ization?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/renren/modules/monitor/service/MonitorService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java index 14931321..6efd0b85 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java @@ -1138,6 +1138,9 @@ public class MonitorService { getOrgenizationByParent(list,a.getString("id")); } }); + if(list != null && list.size() > 0){ + cameraOrgenMapper.truncate("t_camera_organization"); + } return list; }catch (Exception e){ log.info(e.getMessage()); From 559a1a4f558a52349acd04e04a1ab9f65fa3221f Mon Sep 17 00:00:00 2001 From: wangliwen Date: Tue, 26 Jul 2022 19:45:27 +0800 Subject: [PATCH 54/80] ... --- .../java/io/renren/websocket/WebSocketServer.java | 4 ++++ .../java/io/renren/websocket/task/HeartRateTask.java | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java b/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java index 09bd6b49..39148c0d 100644 --- a/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java +++ b/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java @@ -101,4 +101,8 @@ public class WebSocketServer { log.error("send message error，" + e.getMessage(), e); } } + + public static Map getServers() { + return servers; + } } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/websocket/task/HeartRateTask.java b/renren-admin/src/main/java/io/renren/websocket/task/HeartRateTask.java index 58e95139..683bc84f 100644 --- a/renren-admin/src/main/java/io/renren/websocket/task/HeartRateTask.java +++ b/renren-admin/src/main/java/io/renren/websocket/task/HeartRateTask.java @@ -28,8 +28,14 @@ public class HeartRateTask implements ITask { */ @Override public void run(String params) { - logger.info("websocket心跳"); - MessageData message = new MessageData().msg("heartRate:" + LocalDateTime.now()); - webSocketServer.sendMessageAll(message); + try { + if (webSocketServer.getServers().isEmpty()) { + return; + } + MessageData message = new MessageData().msg("heartRate:" + LocalDateTime.now()); + webSocketServer.sendMessageAll(message); + } catch (Exception exception) { + logger.error("websocket客户端心跳失败", exception); + } } } From 26830e19e8fcb552e85d7f35b5ffdb22db81c528 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Wed, 27 Jul 2022 10:06:31 +0800 Subject: [PATCH 55/80] =?UTF-8?q?=E5=89=8D=E5=8F=B0=E9=80=80=E5=87=BA?= =?UTF-8?q?=E6=9C=AA=E6=B8=85=E9=99=A4=E5=90=8E=E5=8F=B0=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7bugfix-1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/security/controller/LoginController.java | 7 ++++++- .../security/service/impl/SysUserTokenServiceImpl.java | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/security/controller/LoginController.java b/renren-admin/src/main/java/io/renren/modules/security/controller/LoginController.java index aa3d1d42..d3ff9709 100644 --- a/renren-admin/src/main/java/io/renren/modules/security/controller/LoginController.java +++ b/renren-admin/src/main/java/io/renren/modules/security/controller/LoginController.java @@ -14,7 +14,6 @@ import io.renren.modules.log.service.SysLogLoginService; import io.renren.modules.security.dto.LoginDTO; import io.renren.modules.security.oauth2.Oauth2Filter; import io.renren.modules.security.oauth2.SSOValidator; -import io.renren.modules.security.oauth2.YaWeiCookieManage; import io.renren.modules.security.password.PasswordUtils; import io.renren.modules.security.service.CaptchaService; import io.renren.modules.security.service.SysUserTokenService; @@ -28,6 +27,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.subject.Subject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +45,8 @@ import java.io.IOException; import java.util.Date; import java.util.Map; +import static org.apache.shiro.SecurityUtils.getSubject; + /** * 登录 */ @@ -188,6 +190,9 @@ public class LoginController { response.addHeader("REDIRECT", ssoValidator.getLogoutUrl()); } + Subject subject = getSubject(); + subject.logout(); + return new Result(); } diff --git a/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java index 2571962c..306710ef 100644 --- a/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java @@ -38,7 +38,6 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl Date: Wed, 27 Jul 2022 10:21:45 +0800 Subject: [PATCH 56/80] .... --- renren-admin/src/main/resources/db/R__insert_schedule_job.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/renren-admin/src/main/resources/db/R__insert_schedule_job.sql b/renren-admin/src/main/resources/db/R__insert_schedule_job.sql index fb1c8bcb..9a04e813 100644 --- a/renren-admin/src/main/resources/db/R__insert_schedule_job.sql +++ b/renren-admin/src/main/resources/db/R__insert_schedule_job.sql @@ -1,3 +1,4 @@ +-- 公共定时任务 SET FOREIGN_KEY_CHECKS = 0; REPLACE INTO `schedule_job` (`id`, `bean_name`, `params`, `cron_expression`, `status`, `remark`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1551845641938800641, 'clearLogTask', '7', '5 5 0 * * ? *', 1, '定期清理操作日志', 1067246875800000001, NOW(), 1067246875800000001, NOW()); REPLACE INTO `schedule_job` (`id`, `bean_name`, `params`, `cron_expression`, `status`, `remark`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1551856342346502145, 'heartRateTask', '', '0 * * * * ? *', 1, 'websocket客户端定时心跳', 1067246875800000001, NOW(), 1067246875800000001, NOW()); From 3281c72fff7823f948b8d176ad5be745e69a3259 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Wed, 27 Jul 2022 14:20:50 +0800 Subject: [PATCH 57/80] ... --- .../videoPreview/domain/TsingtaoVideoPreviewService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoVideoPreviewService.java b/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoVideoPreviewService.java index 516b4aae..abdea884 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoVideoPreviewService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/videoPreview/domain/TsingtaoVideoPreviewService.java @@ -5,8 +5,6 @@ import io.renren.modules.resource.videoPreview.AbstractVideoPreviewService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - /** * 青岛市局预览 */ @@ -29,7 +27,7 @@ public class TsingtaoVideoPreviewService extends AbstractVideoPreviewService { public String getHls(String key) { try { return monitorService.fileCode(key); - } catch (IOException e) { + } catch (Exception e) { logger.error("青岛市局获取预览地址失败", e); return null; } From 5eb0184bd43aa54c62ac553c8d40f953a183c9e2 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Wed, 27 Jul 2022 17:07:58 +0800 Subject: [PATCH 58/80] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/AbilityCenterControllerV2.java | 3 ++- .../modules/activiti/service/ActHistoryService.java | 4 ++-- .../controller/TAbilityApplicationController.java | 10 ++++++---- .../processForm/listener/CorrectionListener.java | 10 ++++++---- .../renren/modules/security/oauth2/SSOValidator.java | 2 -- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java index 38233334..f8f2bb26 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java +++ b/renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java @@ -158,7 +158,7 @@ public class AbilityCenterControllerV2 { tAbilityApplicationDTO.setApproveStatus("审核中"); tAbilityApplicationDTO.setDelFlag(0); // v2 新增字段 - tAbilityApplicationDTO.setCameraList(index.get("cameraId") == null ? null : JSON.toJSONString(index.get("cameraId"))); + tAbilityApplicationDTO.setCameraList(index.get("channelId") == null ? null : JSON.toJSONString(index)); tAbilityApplicationDTO.setTitle(abilityBatchApplicationDTO.getTitle()); tAbilityApplicationDTO.setApplicationBackground(abilityBatchApplicationDTO.getApplicationBackground()); tAbilityApplicationDTO.setApplicationScene(abilityBatchApplicationDTO.getApplicationScene()); @@ -262,4 +262,5 @@ public class AbilityCenterControllerV2 { }); } } + } diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java index d805e486..0f65712c 100644 --- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java +++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java @@ -277,12 +277,12 @@ public class ActHistoryService { for (ProcessInstanceDTO dto : list) { List abilityApplicationDTO = tAbilityApplicationService.getByInstanceId(dto.getProcessInstanceId()); // 获取申请表单 if (abilityApplicationDTO != null && !abilityApplicationDTO.isEmpty()) { - if (abilityApplicationDTO.stream().filter(index -> StringUtils.isNotEmpty(index.getCameraList())).findAny().isPresent()) { // 存在摄像头 + if (abilityApplicationDTO.stream().anyMatch(index -> StringUtils.isNotEmpty(index.getCameraList()))) { // 存在摄像头 dto.setName("申请摄像头列表"); dto.setResourceId(null); } else { StringBuffer stringBuffer = new StringBuffer(); - abilityApplicationDTO.stream().map(TAbilityApplicationDTO::getSystem).filter(index -> StringUtils.isNotEmpty(index)).forEach(index -> { + abilityApplicationDTO.stream().map(TAbilityApplicationDTO::getSystem).filter(StringUtils::isNotEmpty).forEach(index -> { stringBuffer.append(index); stringBuffer.append(","); }); diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java index d758d2d6..4d0b84d8 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java @@ -225,10 +225,12 @@ public class TAbilityApplicationController { if (StringUtils.isEmpty(index_.getCameraList())) { return; } - List channelDto1s = cameraChannelMapper.selectByChannelCode(index_.getCameraList().replaceAll("\"", "")); - if (!channelDto1s.isEmpty()) { - cameraList.add(channelDto1s.get(0)); - } + cameraList.add(JSON.parseObject(index_.getCameraList())); + // + //List channelDto1s = cameraChannelMapper.selectByChannelCode(index_.getCameraList().replaceAll("\"", "")); + //if (!channelDto1s.isEmpty()) { + // cameraList.add(channelDto1s.get(0)); + //} }); camera = cameraList; diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java b/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java index d84faf6e..e4289d45 100644 --- a/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java +++ b/renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java @@ -24,6 +24,7 @@ import org.activiti.engine.TaskService; import org.activiti.engine.delegate.*; import org.activiti.engine.delegate.event.ActivitiEvent; import org.activiti.engine.delegate.event.ActivitiEventListener; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -266,10 +267,11 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti logger.info("-------能力申请code-------"); ResourceEntity resourceEntity = resourceService.selectById(abilityApplicationDTO.getResourceId()); - //没有groupid当做没有接口，直接跳过 - if (resourceEntity.getGroupId() == null) - return; - + if (ObjectUtils.allNotNull(resourceEntity)) { + //没有groupid当做没有接口，直接跳过 + if (resourceEntity.getGroupId() == null) + return; + } String code = UUID.randomUUID().toString(); apiGatewayService.subscribeCode(String.valueOf(abilityApplicationDTO.getId()), code); diff --git a/renren-admin/src/main/java/io/renren/modules/security/oauth2/SSOValidator.java b/renren-admin/src/main/java/io/renren/modules/security/oauth2/SSOValidator.java index ea620394..975290ee 100644 --- a/renren-admin/src/main/java/io/renren/modules/security/oauth2/SSOValidator.java +++ b/renren-admin/src/main/java/io/renren/modules/security/oauth2/SSOValidator.java @@ -1,7 +1,5 @@ package io.renren.modules.security.oauth2; -import javax.servlet.http.HttpServletRequest; - public interface SSOValidator { String validatePrincipal(String requestURL); From ee1d2550d374513bbaaf0c287c50abb442999335 Mon Sep 17 00:00:00 2001 From: wangliwen Date: Thu, 28 Jul 2022 10:44:11 +0800 Subject: [PATCH 59/80] ... --- .../main/java/io/renren/websocket/WebSocketServer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java b/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java index 39148c0d..dbb52de2 100644 --- a/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java +++ b/renren-admin/src/main/java/io/renren/websocket/WebSocketServer.java @@ -76,11 +76,11 @@ public class WebSocketServer { * @param message 消息内容 */ public void sendMessage(Long userId, MessageData message) { - servers.values().forEach(info -> { - if (userId.equals(info.getUserId())) { - sendMessage(info.getSession(), message); - } - }); + servers.values().stream() + .filter(index -> userId.equals(index.getUserId())) + .forEach(index -> { + sendMessage(index.getSession(), message); + }); } /** From 1f606f0c18f7f89a5476335a4213b0ef377185a6 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Thu, 28 Jul 2022 16:28:34 +0800 Subject: [PATCH 60/80] =?UTF-8?q?1.=E8=A5=BF=E6=B5=B7=E5=B2=B8=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=202.shiro=E7=9A=84jsessionid=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DV1.0=203.=E6=96=B0=E5=A2=9E=E5=9F=BA=E7=A1=80=E8=AE=BE?= =?UTF-8?q?=E6=96=BDsql=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResourceServiceImpl.java | 8 +- .../modules/security/config/ShiroConfig.java | 23 ++++-- .../security/oauth2/CasSSOValidator.java | 1 - .../security/oauth2/ShiroSessionManager.java | 81 +++++++++++++++++++ .../resources/db/R__init_tb_data_resource.sql | 1 + 5 files changed, 105 insertions(+), 9 deletions(-) create mode 100644 renren-admin/src/main/java/io/renren/modules/security/oauth2/ShiroSessionManager.java create mode 100644 renren-admin/src/main/resources/db/R__init_tb_data_resource.sql 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 584c4b71..c0712750 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 @@ -50,6 +50,7 @@ import okhttp3.*; import org.activiti.engine.HistoryService; import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.history.HistoricProcessInstanceQuery; +import org.apache.commons.lang3.ObjectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -1063,9 +1064,10 @@ public class ResourceServiceImpl extends CrudServiceImpl applicationEntities = tAbilityApplicationDao.selectList(queryWrapper); ArrayList cameraList = new ArrayList(); applicationEntities.forEach(index -> { - List channelDto1s = cameraChannelMapper.selectByChannelCode(index.getCameraList().replaceAll("\"", "")); - if (!channelDto1s.isEmpty()) { - cameraList.add(channelDto1s.get(0)); + //List channelDto1s = cameraChannelMapper.selectByChannelCode(index.getCameraList().replaceAll("\"", "")); + CameraChannelDto1 channelDto1s = JSON.toJavaObject(JSON.parseObject(index.getCameraList()), CameraChannelDto1.class); + if (ObjectUtils.allNotNull(channelDto1s)) { + cameraList.add(channelDto1s); } }); return cameraList; diff --git a/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java b/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java index dcbe3650..2ef8f6ad 100644 --- a/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java +++ b/renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java @@ -2,6 +2,7 @@ package io.renren.modules.security.config; import io.renren.modules.security.oauth2.Oauth2Filter; import io.renren.modules.security.oauth2.Oauth2Realm; +import io.renren.modules.security.oauth2.ShiroSessionManager; import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.session.mgt.SessionManager; import org.apache.shiro.spring.LifecycleBeanPostProcessor; @@ -9,6 +10,7 @@ import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSource import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.apache.shiro.web.mgt.DefaultWebSecurityManager; import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -26,13 +28,21 @@ public class ShiroConfig { // @Autowired // private Oauth2Filter oauth2Filter; + //@Autowired + //private ShiroSessionManager shiroSessionManager; + + //@Bean + //public DefaultWebSessionManager sessionManager() { + // DefaultWebSessionManager sessionManager = new DefaultWebSessionManager(); + // sessionManager.setSessionValidationSchedulerEnabled(false); + // sessionManager.setSessionIdUrlRewritingEnabled(false); + // sessionManager.setGlobalSessionTimeout(-1000l); + // return sessionManager; + //} + @Bean public DefaultWebSessionManager sessionManager() { - DefaultWebSessionManager sessionManager = new DefaultWebSessionManager(); - sessionManager.setSessionValidationSchedulerEnabled(false); - sessionManager.setSessionIdUrlRewritingEnabled(false); - sessionManager.setGlobalSessionTimeout(-1000l); - return sessionManager; + return new ShiroSessionManager(); } @Bean("securityManager") @@ -77,6 +87,9 @@ public class ShiroConfig { filterMap.put("/bsabilityrecord/**", "anon"); filterMap.put("/act/his/getInstImage", "anon"); + filterMap.put("/resource/getApplyCameraList/**", "anon"); + filterMap.put("/resource/hls/getHls", "anon"); + /** * 资源上传 */ diff --git a/renren-admin/src/main/java/io/renren/modules/security/oauth2/CasSSOValidator.java b/renren-admin/src/main/java/io/renren/modules/security/oauth2/CasSSOValidator.java index 9ba491ba..ad63a583 100644 --- a/renren-admin/src/main/java/io/renren/modules/security/oauth2/CasSSOValidator.java +++ b/renren-admin/src/main/java/io/renren/modules/security/oauth2/CasSSOValidator.java @@ -1,6 +1,5 @@ package io.renren.modules.security.oauth2; -import cn.hutool.core.util.URLUtil; import org.apache.commons.lang3.StringUtils; import org.jasig.cas.client.validation.Assertion; import org.jasig.cas.client.validation.TicketValidationException; diff --git a/renren-admin/src/main/java/io/renren/modules/security/oauth2/ShiroSessionManager.java b/renren-admin/src/main/java/io/renren/modules/security/oauth2/ShiroSessionManager.java new file mode 100644 index 00000000..014455cc --- /dev/null +++ b/renren-admin/src/main/java/io/renren/modules/security/oauth2/ShiroSessionManager.java @@ -0,0 +1,81 @@ +package io.renren.modules.security.oauth2; + +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.session.Session; +import org.apache.shiro.session.mgt.SessionContext; +import org.apache.shiro.web.servlet.ShiroHttpServletRequest; +import org.apache.shiro.web.session.mgt.DefaultWebSessionManager; +import org.apache.shiro.web.util.WebUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.Serializable; + +//@Component +public class ShiroSessionManager extends DefaultWebSessionManager { + /** + * 返回客户端的， + */ + public final String TOKEN_NAME = "token"; + /** + * 这个是客户端请求给服务端带的header + */ + public final static String HEADER_TOKEN_NAME = "token"; + public final static Logger log = LoggerFactory.getLogger(ShiroSessionManager.class); + private static final String REFERENCED_SESSION_ID_SOURCE = "Stateless request"; + + /** + * 重写getSessionId,分析请求头中的指定参数，做用户凭证sessionId + */ + @Override + protected Serializable getSessionId(ServletRequest request, ServletResponse response) { + String sessionId = WebUtils.toHttp(request).getHeader(HEADER_TOKEN_NAME); + log.info("获取的sessionId为" + sessionId); + if (StringUtils.isEmpty(sessionId)) { + return super.getSessionId(request, response); + } else { + //如果请求头中有 token 则其值为sessionId + request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_SOURCE, REFERENCED_SESSION_ID_SOURCE); + request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID, sessionId); + request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, Boolean.TRUE); + return sessionId; + } + } + + /*@Override + protected void onStart(Session session, SessionContext context) { + log.info("执行onStart"); + if (!WebUtils.isHttp(context)) { + log.debug("SessionContext argument is not HTTP compatible or does not have an HTTP request/response pair. No session ID cookie will be set."); + } else { + HttpServletRequest request = WebUtils.getHttpRequest(context); + HttpServletResponse response = WebUtils.getHttpResponse(context); + Serializable sessionId = session.getId(); + this.storeSessionId(sessionId, request, response); + request.removeAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_SOURCE); + request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_IS_NEW, Boolean.TRUE); + } + } + + *//** + * 把sessionId 放入 response header 中 + * onStart时调用 + * 没有sessionid时 会产生sessionid 并放入 response header中 + *//* + private void storeSessionId(Serializable currentId, HttpServletRequest ignored, HttpServletResponse response) { + if (currentId == null) { + String msg = "sessionId cannot be null when persisting for subsequent requests."; + throw new IllegalArgumentException(msg); + } else { + String idString = currentId.toString(); + response.setHeader(this.TOKEN_NAME, idString); + log.info("Set session ID header for session with id {}", idString); + log.trace("Set session ID header for session with id {}", idString); + } + }*/ +} \ No newline at end of file diff --git a/renren-admin/src/main/resources/db/R__init_tb_data_resource.sql b/renren-admin/src/main/resources/db/R__init_tb_data_resource.sql new file mode 100644 index 00000000..312fde5f --- /dev/null +++ b/renren-admin/src/main/resources/db/R__init_tb_data_resource.sql @@ -0,0 +1 @@ +REPLACE INTO `tb_data_resource`(`id`, `type`, `name`, `description`, `link`, `api_method_type`, `api_url`, `group_id`, `dept_id`, `dept_contacts`, `dept_phone`, `share_type`, `share_mode`, `share_condition`, `district_id`, `visits`, `del_flag`, `creator`, `create_date`, `updater`, `update_date`, `note1`, `note2`, `note3`, `note4`, `note5`, `enclosure`, `undercarriage_reason`, `undercarriage_user_name`, `info_list`, `total`, `visitor`, `apply_number`, `undercarriage_enclosure`) VALUES (8888888880000000001, '基础设施', '申请摄像头', NULL, '', NULL, NULL, NULL, 1067246875800000066, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 9, NULL, NULL, NULL, '2022-07-04 18:23:47', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '[]', 13, 5, NULL, NULL); From 645368398d8a4bfafa9b22a06a5de439ea275b16 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Thu, 28 Jul 2022 16:55:04 +0800 Subject: [PATCH 61/80] bugfix --- .../resource/service/impl/ResourceServiceImpl.java | 2 +- .../src/main/resources/db/R__init_tb_data_resource.sql | 1 + .../src/main/resources/mapper/resource/ResourceDao.xml | 10 +++++----- 3 files changed, 7 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 c0712750..857d3226 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 @@ -1743,7 +1743,7 @@ public class ResourceServiceImpl extends CrudServiceImpl sysUserList = sysUserService.list(new HashMap()); - List result = resourceDao.selectUsersApplyAndCount(sysUserList.stream().map(dto -> dto.getId()).collect(Collectors.toList())); + List result = resourceDao.selectUsersApplyAndCount(sysUserList.stream().map(SysUserDTO::getId).collect(Collectors.toList())); int j = Math.min(curPage * limit, result.size()); ArrayList recordLists = new ArrayList<>(); for (int i = (curPage - 1) * limit; i < j; i++) { diff --git a/renren-admin/src/main/resources/db/R__init_tb_data_resource.sql b/renren-admin/src/main/resources/db/R__init_tb_data_resource.sql index 312fde5f..f0c9ca33 100644 --- a/renren-admin/src/main/resources/db/R__init_tb_data_resource.sql +++ b/renren-admin/src/main/resources/db/R__init_tb_data_resource.sql @@ -1 +1,2 @@ +-- 用于摄像头加申购车和申请使用，所属部门字段根据各个地方自己修改dept_id字段即可 REPLACE INTO `tb_data_resource`(`id`, `type`, `name`, `description`, `link`, `api_method_type`, `api_url`, `group_id`, `dept_id`, `dept_contacts`, `dept_phone`, `share_type`, `share_mode`, `share_condition`, `district_id`, `visits`, `del_flag`, `creator`, `create_date`, `updater`, `update_date`, `note1`, `note2`, `note3`, `note4`, `note5`, `enclosure`, `undercarriage_reason`, `undercarriage_user_name`, `info_list`, `total`, `visitor`, `apply_number`, `undercarriage_enclosure`) VALUES (8888888880000000001, '基础设施', '申请摄像头', NULL, '', NULL, NULL, NULL, 1067246875800000066, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 9, NULL, NULL, NULL, '2022-07-04 18:23:47', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '[]', 13, 5, NULL, NULL); diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index e9a0a061..1f8f979d 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -1319,9 +1319,9 @@ a.del_flag = 0 AND d.del_flag = 0 - group by + GROUP BY c.name,c.id - order by + ORDER BY c.name,c.id LIMIT ${pageNum}, ${pageSize} @@ -1388,7 +1388,7 @@ #{deptId} - group by tdr.id order by count desc + GROUP BY tdr.id ORDER BY count desc @@ -242,4 +242,48 @@ SELECT channel_id AS channelId,channel_name AS channelName FROM t_camera_channel WHERE channel_id = #{channelId} LIMIT 1 + + + + + INSERT INTO t_camera_channel_cache + ( + channel_code,channel_id,channel_name,gps_x,gps_y,status, + parent_id,region_code,region_name,node_name + ) + VALUES + + ( + #{item.channelCode},#{item.channelId},#{item.channelName},#{item.gpsX},#{item.gpsY},#{item.status}, + #{item.parentId},#{item.regionCode},#{item.regionName},#{item.nodeName} + ) + + + + + INSERT INTO t_camera_channel + ( + channel_code,channel_id,channel_name,gps_x,gps_y,status, + parent_id,region_code,region_name,node_name,check_status + ) + SELECT channel_code,channel_id,channel_name,gps_x,gps_y,status, + parent_id,region_code,region_name,node_name,check_status + FROM t_camera_channel_cache + + + + INSERT INTO t_label ( + label_code,label_name,capture_patternn,city + ) + VALUES + + (#{item.label_code},#{item.label_name},#{item.capture_patternn},#{item.city}) + + \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml b/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml index 8e52a2fc..c2635911 100644 --- a/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml +++ b/renren-admin/src/main/resources/mapper/monitor/CameraOrganizationMapper.xml @@ -3,7 +3,7 @@ - INSERT INTO t_camera_organization ( + INSERT INTO t_camera_organization_cache ( id,name,parent_id,sort,subCount,path,is_parent,is_root ) VALUES @@ -15,7 +15,7 @@ - INSERT INTO t_camera_channel + INSERT INTO t_camera_channel_cache ( channel_code,channel_id,channel_name,gps_x,gps_y,status, parent_id,region_code,region_name,node_name @@ -50,4 +50,19 @@ + + + + UPDATE t_camera_organization_cache SET path = TRIM( TRAILING '->' FROM #{path}) where id = #{id} + + + + INSERT INTO t_camera_organization + ( + id,name,parent_id,sort,subCount,is_parent,path,is_root,channelCount,count + ) + SELECT id,name,parent_id,sort,subCount,is_parent,path,is_root,channelCount,count FROM t_camera_organization_cache + \ No newline at end of file From 52c4715b8fa1e4276eef809c1a55de10c69828cb Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Fri, 29 Jul 2022 10:43:29 +0800 Subject: [PATCH 67/80] .. --- .../controller/SysNoticeController.java | 11 +- .../controller/ResourceController.java | 39 ++- .../resource/service/ResourceService.java | 3 +- .../service/impl/ResourceServiceImpl.java | 254 ++++++++---------- .../security/oauth2/ShiroSessionManager.java | 1 + .../resources/domain/tsingtao-xha.properties | 2 +- 6 files changed, 134 insertions(+), 176 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java b/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java index 80bc16e8..ba3a3980 100644 --- a/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java +++ b/renren-admin/src/main/java/io/renren/modules/notice/controller/SysNoticeController.java @@ -29,7 +29,6 @@ import java.util.Arrays; import java.util.Date; import java.util.Map; - /** * 通知管理 * @@ -50,10 +49,10 @@ public class SysNoticeController { @GetMapping("page") @ApiOperation("分页") @ApiImplicitParams({ - @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), - @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), - @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String") + @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), + @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), + @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String") }) // @RequiresPermissions("sys:notice:all") public Result> page(@ApiIgnore @RequestParam Map params) { @@ -165,7 +164,7 @@ public class SysNoticeController { @DeleteMapping @ApiOperation("删除") @LogOperation("删除") -// @RequiresPermissions("sys:notice:all") + //@RequiresPermissions("sys:notice:all") public Result delete(@RequestBody Long[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java index d52cd427..787ce2ad 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java @@ -237,7 +237,7 @@ public class ResourceController { //@RequiresPermissions("resource:resource:save") public Result save(@RequestBody ResourceDTO dto, @RequestParam String source) { // 效验数据 - logger.info("source:" + source); + logger.info("source:{}", source); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); if ("f".equals(source)) { dto.setDelFlag(2); // 来自前端页面 走审批流程 @@ -257,7 +257,7 @@ public class ResourceController { public Result importResource(@RequestParam("file") MultipartFile uploadFile, HttpServletRequest request) { List> dept = jdbcTemplate.queryForList("SELECT id,`name` FROM sys_dept"); - logger.info("上传文件：" + uploadFile.getOriginalFilename()); + logger.info("上传文件：{}" , uploadFile.getOriginalFilename()); String format = sdf.format(new Date()); File folder = new File(uploadPath + "upload" + File.separator + format); logger.info(folder.getPath()); @@ -266,29 +266,20 @@ public class ResourceController { } // 对上传的文件重命名，避免文件重名 String oldName = uploadFile.getOriginalFilename(); - String newName = UUID.randomUUID().toString() - + oldName.substring(oldName.lastIndexOf(".")); + String newName = UUID.randomUUID() + oldName.substring(oldName.lastIndexOf(".")); try { // 文件保存 File file = new File(folder, newName); uploadFile.transferTo(file); Optional deptDTO = Optional.ofNullable(sysDeptService.getByName(bigDateDeptName)); - CompletableFuture.runAsync(() -> { - EasyExcel.read(file, new ResourceExcelImportListener(0, dept, resourceService, deptDTO.get().getId())).sheet(0).headRowNumber(1).doReadSync(); - }, executor); - CompletableFuture.runAsync(() -> { - EasyExcel.read(file, new ResourceExcelImportListener(1, dept, resourceService, deptDTO.get().getId())).sheet(1).headRowNumber(1).doReadSync(); - }, executor); - CompletableFuture.runAsync(() -> { - EasyExcel.read(file, new ResourceExcelImportListener(2, dept, resourceService, deptDTO.get().getId())).sheet(2).headRowNumber(1).doReadSync(); - }, executor); - CompletableFuture.runAsync(() -> { - EasyExcel.read(file, new ResourceExcelImportListener(3, dept, resourceService, deptDTO.get().getId())).sheet(3).headRowNumber(1).doReadSync(); - }, executor); + CompletableFuture.runAsync(() -> EasyExcel.read(file, new ResourceExcelImportListener(0, dept, resourceService, deptDTO.get().getId())).sheet(0).headRowNumber(1).doReadSync(), executor); + CompletableFuture.runAsync(() -> EasyExcel.read(file, new ResourceExcelImportListener(1, dept, resourceService, deptDTO.get().getId())).sheet(1).headRowNumber(1).doReadSync(), executor); + CompletableFuture.runAsync(() -> EasyExcel.read(file, new ResourceExcelImportListener(2, dept, resourceService, deptDTO.get().getId())).sheet(2).headRowNumber(1).doReadSync(), executor); + CompletableFuture.runAsync(() -> EasyExcel.read(file, new ResourceExcelImportListener(3, dept, resourceService, deptDTO.get().getId())).sheet(3).headRowNumber(1).doReadSync(), executor); } catch (IOException e) { return new Result().error(e.getMessage()); } - return new Result().ok(LocalDateTime.now().toString()); + return new Result().ok(LocalDateTime.now().toString()); } @PutMapping("/update") @@ -318,7 +309,7 @@ public class ResourceController { @LogOperation("资源转发") public Result ZywMessage() { String url = "http://15.72.158.81/zyjk/ZywMessage.asmx"; - String parame = "\n" + + String param = "\n" + "\n" + " \n" + " \n" + @@ -326,11 +317,11 @@ public class ResourceController { HttpHeaders requestHeaders = new HttpHeaders(); requestHeaders.set("SOAPAction", "http://tempuri.org/ZywMessagePort"); requestHeaders.setContentType(MediaType.TEXT_XML); - HttpEntity requestEntity = new HttpEntity(parame, requestHeaders); + HttpEntity requestEntity = new HttpEntity<>(param, requestHeaders); try { String body = restTemplate.postForEntity(url, requestEntity, String.class).getBody(); String json = body.substring(body.indexOf("{"), body.indexOf("}") + 1); - HashMap map = JSONObject.parseObject(json, HashMap.class); + HashMap map = JSON.parseObject(json, HashMap.class); return new Result().ok(map); } catch (Exception e) { return new Result().ok(new HashMap() {{ @@ -372,13 +363,13 @@ public class ResourceController { HttpHeaders requestHeaders = new HttpHeaders(); requestHeaders.set("SOAPAction", "http://tempuri.org/ZWCJ_mainPort"); requestHeaders.setContentType(new MediaType("text", "xml", Charset.forName("utf-8"))); - HttpEntity requestEntity = new HttpEntity(parame, requestHeaders); + HttpEntity requestEntity = new HttpEntity<>(parame, requestHeaders); try { String body = restTemplate.postForEntity(url, requestEntity, String.class).getBody(); String startTag = ""; String endTag = ""; String json = body.substring(body.indexOf(startTag) + startTag.length(), body.indexOf(endTag)); - HashMap result = JSONObject.parseObject(json, HashMap.class); + HashMap result = JSON.parseObject(json, HashMap.class); List rows = (List) result.get("data"); List objects = rows.stream() @@ -520,8 +511,8 @@ public class ResourceController { @GetMapping("/selectTotalByDept") @ApiOperation("按照资源类型统计本部门发布的资源") @LogOperation("按照资源类型统计本部门发布的资源") - public Result selectTotalByDept() { - return new Result().ok(resourceService.selectTotalByDept()); + public Result> selectTotalByDept() { + return new Result>().ok(resourceService.selectTotalByDept()); } @GetMapping("/getApplyByDept") diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java index d615af06..ec771dc8 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java @@ -7,6 +7,7 @@ import io.renren.modules.resource.dto.ResourceDTO; import io.renren.modules.resource.entity.AttrEntity; import io.renren.modules.resource.entity.ResourceEntity; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -111,7 +112,7 @@ public interface ResourceService extends CrudService params); - Object selectTotalByDept(); + HashMap selectTotalByDept(); Object getApplyByDept(Map params); 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 54e09203..49f2d5e6 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 @@ -81,8 +81,8 @@ import java.util.stream.Collectors; */ @Service public class ResourceServiceImpl extends CrudServiceImpl implements ResourceService { - private static final Integer cpuNUm = Runtime.getRuntime().availableProcessors(); - private static final ExecutorService executor = Executors.newWorkStealingPool(cpuNUm * 3); + private static final Integer CPU_NUM = Runtime.getRuntime().availableProcessors(); + private static final ExecutorService executor = Executors.newWorkStealingPool(CPU_NUM * 3); /** * 公共http客户端 @@ -90,14 +90,14 @@ public class ResourceServiceImpl extends CrudServiceImpl idList = jsonArray.toJavaList(Long.class); @@ -340,7 +342,7 @@ public class ResourceServiceImpl extends CrudServiceImpl common(Page resultPage, List selectDTOPageSpecilTotal, ResourceDTO resourceDTO, String orderField, String orderType, Integer pageNum, Integer pageSize) { if (resourceDTO.getInfoList().isEmpty()) { @@ -533,15 +532,10 @@ public class ResourceServiceImpl extends CrudServiceImpl resultMap = new HashMap<>(); List re = resourceDao.selectTypeCount(null); - /*//2022-07-05,ytl修改 start - re.removeIf(r -> { - return org.apache.commons.lang3.StringUtils.equals(r.get("type").toString(), "基础设施"); - }); - //2022-07-05,ytl修改 end*/ switch (Constant.ProjectPlace.getByFlag(projectPlace)) { case TSINGTAO_XHA: { // 青岛西海岸 CompletableFuture allAmount = CompletableFuture.supplyAsync(() -> { // 获取平台总基础设施数目 - List result_ = new CopyOnWriteArrayList<>(); + List result = new CopyOnWriteArrayList<>(); CompletableFuture cloud = CompletableFuture.runAsync(() -> { // 云脑专网 String url = tsingtao_xhaProperties.getCloudcam(); @@ -551,7 +545,7 @@ public class ResourceServiceImpl extends CrudServiceImpl { - re.add(new HashMap() { - { - put("count", sum + ""); - put("type", "基础设施"); - } - }); - }); - Long total = 0L; + return result.stream().filter(Objects::nonNull).findAny().orElse(0L); + }).thenAccept(sum -> re.add(new HashMap() { + { + put("count", sum + ""); + put("type", "基础设施"); + } + })); + Long total; Request request = new Request.Builder().url(tsingtao_xhaProperties.getResourcecount()).build(); try (Response response = client.newCall(request).execute()) { if (response.isSuccessful()) { @@ -642,6 +631,8 @@ public class ResourceServiceImpl extends CrudServiceImpl temp = new ArrayList<>(); re.forEach(map -> temp.add(map.get("type").toString())); @@ -730,13 +721,13 @@ public class ResourceServiceImpl extends CrudServiceImpl resultPage = (Page) this.selectMostPopular(object); do { - resultPage.getRecords().forEach(p->{ + resultPage.getRecords().forEach(p -> { //如果集合中不存在，则进行添加 - if (!page.getRecords().contains(p)){ + if (!page.getRecords().contains(p)) { page.getRecords().add(p); } }); - }while (page.getRecords().size() < 9); + } while (page.getRecords().size() < 9); //for (int i = 0; page.getRecords().size() < 9; i++) { // for (int j = 0; j < page.getRecords().size(); j++) { // if (!page.getRecords().get(j).getId().equals(resultPage.getRecords().get(i).getId())) { @@ -763,7 +754,7 @@ public class ResourceServiceImpl extends CrudServiceImpl resultList = new CopyOnWriteArrayList<>(); HashMap resourceMap = new HashMap<>(); @@ -1054,7 +1045,7 @@ public class ResourceServiceImpl extends CrudServiceImpl selectDTOPageSpecilTotal(ResourceDTO resourceDTO) { return resourceDao.selectDTOPageSpecilTotal(resourceDTO); } @@ -1126,12 +1117,12 @@ public class ResourceServiceImpl extends CrudServiceImpl knowledgeUUID = jdbcTemplate.queryForList("SELECT note1 FROM tb_data_resource WHERE type ='知识库' AND note1 IS NOT NULL FOR UPDATE;", String.class).stream().distinct().collect(Collectors.toList()); - final int pageSize = cpuNUm * 10; + final int pageSize = CPU_NUM * 10; Arrays.stream(catalogIds).map(index -> { - logger.info("处理：" + index); + logger.info("处理：{}", index); CopyOnWriteArrayList task = new CopyOnWriteArrayList<>(); AtomicBoolean end = new AtomicBoolean(true); AtomicInteger pageIndex = new AtomicInteger(1); @@ -1139,33 +1130,39 @@ public class ResourceServiceImpl extends CrudServiceImpl { try { - logger.info("分页任务处理：" + index + " 分页{} 时间 -->" + timestamp, page); + logger.info("分页任务处理：{}分页{} 时间--> {}", index, page, timestamp); JSONObject bizContentParam = new JSONObject(); bizContentParam.put("appkey", appKey); bizContentParam.put("catalogId", index); bizContentParam.put("pageIndex", page); bizContentParam.put("pageSize", pageSize); - String bizContent_ = bizContentParam.toJSONString(); - logger.info("biz_content参数：{}", bizContent_); + String bizContent = bizContentParam.toJSONString(); + logger.info("biz_content参数：{}", bizContent); // 通过FormBody对象构建Builder来添加表单参数 - FormBody.Builder signFormBody = new FormBody.Builder().add("app_id", appId).add("interface_id", methodId).add("version", version).add("timestamp", String.valueOf(timestamp)).add("origin", origin).add("charset", charset).add("biz_content", bizContent_); - logger.info(index + "分页{}对接知识库数据请求参数：" + signFormBody.build().contentType().toString(), page); + FormBody.Builder signFormBody = new FormBody.Builder().add("app_id", appId) + .add("interface_id", methodId). + add("version", version). + add("timestamp", String.valueOf(timestamp)). + add("origin", origin). + add("charset", charset). + add("biz_content", bizContent); + logger.info("{}分页{}对接知识库数据请求参数：{}", index, page, signFormBody.build().contentType().toString()); Request signRequest = new Request.Builder().url(sign).post(signFormBody.build()).build(); Response signResponse = client.newCall(signRequest).execute(); String signResult = signResponse.body().string(); - logger.info("{}分页signResult数据：" + signResult, page); + logger.info("{}分页signResult数据：{}", page, signResult); JSONObject signJsonObject = JSON.parseObject(signResult); if (!signJsonObject.containsKey("data")) { - logger.info("获取sign异常：" + signResult); + logger.info("获取sign异常：{}", signResult); end.set(false); throw new RuntimeException("获取sign异常"); } if (signJsonObject.get("data") == null) { - logger.info("获取sign异常：" + signResult); + logger.info("获取sign异常：{}", signResult); end.set(false); throw new RuntimeException("获取sign异常"); } @@ -1247,7 +1244,7 @@ public class ResourceServiceImpl extends CrudServiceImpl> resourceInfrastructureDetails(Map params) { - List> result = new CopyOnWriteArrayList<>(); + List> result; Integer page = Integer.parseInt(params.get("page").toString()) - 1; Integer pageSize = Integer.parseInt(params.get("limit").toString()); Object[] pas = {params.get("id"), params.get("id")}; - List> result2 = new ArrayList<>(); + List> result2; if (Long.parseLong(params.get("id").toString()) == 0) { result2 = jdbcTemplate.queryForList("SELECT COUNT(a.id) AS resourceNum,a.dept_id AS deptId,b.name AS deptName\n" + "FROM tb_data_resource a INNER JOIN sys_dept b ON a.dept_id = b.id\n" + @@ -1452,11 +1449,11 @@ public class ResourceServiceImpl extends CrudServiceImpl 0) { + if (!result2.isEmpty()) { List>> partition = Lists.partition(result2, pageSize); - result.addAll(partition.get(page)); + result = new CopyOnWriteArrayList<>(partition.get(page)); } else { - return new PageData<>(result2, result2.size()); + return new PageData<>(result2, 0); } CompletableFuture resourceCollectionNum01 = CompletableFuture.runAsync(() -> {//被申请数量 resourceCarNum @@ -1483,8 +1480,7 @@ public class ResourceServiceImpl extends CrudServiceImpl all = CompletableFuture.allOf(resourceCollectionNum01, resourceCollectionNum02, resourceCollectionNum03); all.join(); - PageData> pageData = new PageData<>(result, result2.size()); - return pageData; + return new PageData<>(result, result2.size()); } @Override @@ -1494,7 +1490,7 @@ public class ResourceServiceImpl extends CrudServiceImpl> result2 = new ArrayList<>(); + List> result2; if (Long.parseLong(params.get("id").toString()) == 0) { result2 = jdbcTemplate.queryForList("SELECT COUNT(a.id) AS resourceNum,a.dept_id AS deptId,b.name AS deptName\n" + "FROM tb_data_resource a INNER JOIN sys_dept b ON a.dept_id = b.id\n" + @@ -1511,7 +1507,7 @@ public class ResourceServiceImpl extends CrudServiceImpl 0) { + if (!result2.isEmpty()) { List>> partition = Lists.partition(result2, pageSize); result.addAll(partition.get(page)); } else { @@ -1542,13 +1538,12 @@ public class ResourceServiceImpl extends CrudServiceImpl all = CompletableFuture.allOf(resourceCarNum, resourceBrowseNum, resourceCollectionNum); all.join(); - PageData> pageData = new PageData<>(result, result2.size()); - return pageData; + return new PageData<>(result, result2.size()); } @Override public PageData> resourceKnowledgeDetails(Map params) { - List> result = new ArrayList<>(); + List> result; Integer page = Integer.parseInt(params.get("page").toString()) - 1; Integer pageSize = Integer.parseInt(params.get("limit").toString()); Object[] pas = {params.get("id"), params.get("id")}; @@ -1571,100 +1566,77 @@ public class ResourceServiceImpl extends CrudServiceImpl>> partition = Lists.partition(result, pageSize); - if (result.size() > 0) { - PageData> pageData = new PageData<>(partition.get(page), result.size()); - return pageData; + if (!result.isEmpty()) { + return new PageData<>(partition.get(page), result.size()); } else { - return new PageData<>(result, result.size()); + return new PageData<>(result, 0); } } @Override public PageData> resourceBusinessUseDetails(Map params) { - List> maps = new CopyOnWriteArrayList<>(); + List> maps; Integer page = Integer.parseInt(params.get("page").toString()) - 1; Integer pageSize = Integer.parseInt(params.get("limit").toString()); Object[] ps = {params.get("id"), params.get("id")}; //获取部门列表 - List> list = new ArrayList<>(); + List> list; if (Long.parseLong(params.get("id").toString()) == 0) { - list = jdbcTemplate.queryForList("SELECT id as deptId,name AS deptName FROM sys_dept"); + list = jdbcTemplate.queryForList("SELECT id AS deptId,name AS deptName FROM sys_dept"); } else { - list = jdbcTemplate.queryForList("SELECT id as deptId,name AS deptName FROM sys_dept WHERE id = ? OR INSTR(pids,?)", ps); + list = jdbcTemplate.queryForList("SELECT id AS deptId,name AS deptName FROM sys_dept WHERE id = ? OR INSTR(pids,?)", ps); } - if (list.size() > 0) { + if (!list.isEmpty()) { List>> partition = Lists.partition(list, pageSize); - maps.addAll(partition.get(page)); + maps = new CopyOnWriteArrayList<>(partition.get(page)); } else { - return new PageData<>(list, list.size()); + return new PageData<>(list, 0); } Map paraMap = new ConcurrentHashMap<>(); paraMap.put("resourceType", params.get("resourceType")); - //分别根据部门获取组件使用总数和调用数 - //申请数 -// CompletableFuture voidCompletableFuture01 = CompletableFuture.runAsync(() -> { -// maps.forEach(m -> { -// paraMap.put("id", m.get("deptId")); -// Map maps1 = new HashMap<>(); -// maps1 = baseDao.assemblyCarByDept(paraMap); -// if (maps1 == null) { -// m.put("resourceCarNum", 0); -// } else { -// m.put("resourceCarNum", maps1.get("carNum") == null ? 0 : maps1.get("carNum")); -// } -// }); -// }); - //本部门的应用关联的组件数量 - CompletableFuture voidCompletableFuture02 = CompletableFuture.runAsync(() -> { - maps.forEach(m -> { - paraMap.put("id", m.get("deptId")); - Map maps2 = new HashMap<>(); - maps2 = baseDao.assemblyUseByDept(paraMap); - if (maps2 == null) { - m.put("resourceUseNum", 0); - } else { - m.put("resourceUseNum", maps2.get("useNum") == null ? 0 : maps2.get("useNum")); - } - }); - }, executor); + CompletableFuture voidCompletableFuture02 = CompletableFuture.runAsync(() -> maps.forEach(m -> { + paraMap.put("id", m.get("deptId")); + Map maps2 = new HashMap<>(); + maps2 = baseDao.assemblyUseByDept(paraMap); + if (maps2 == null) { + m.put("resourceUseNum", 0); + } else { + m.put("resourceUseNum", maps2.get("useNum") == null ? 0 : maps2.get("useNum")); + } + }), executor); //还缺少组件调用数,这先用假数据代替 - CompletableFuture voidCompletableFuture01 = CompletableFuture.runAsync(() -> { - maps.forEach(m -> { - m.put("resourceCallNum", 0); - }); - }, executor); + CompletableFuture voidCompletableFuture01 = CompletableFuture.runAsync(() -> maps.forEach(m -> m.put("resourceCallNum", 0)), executor); CompletableFuture all = CompletableFuture.allOf(voidCompletableFuture01, voidCompletableFuture02); all.join(); - PageData> pageData = new PageData<>(maps, list.size()); - return pageData; + return new PageData<>(maps, list.size()); } @Override public PageData> resourceDatasUseDetails(Map params) { - List> result = new ArrayList<>(); + List> result; Integer page = Integer.parseInt(params.get("page").toString()) - 1; Integer pageSize = Integer.parseInt(params.get("limit").toString()); //查询部门列表 Object[] ps = {params.get("id"), params.get("id")}; - List> list = new ArrayList<>(); + List> list; if (Long.parseLong(params.get("id").toString()) == 0) { list = jdbcTemplate.queryForList("SELECT id AS deptId,name AS deptName FROM sys_dept "); } else { list = jdbcTemplate.queryForList("SELECT id AS deptId,name AS deptName FROM sys_dept WHERE id = ? OR INSTR(pids,?) ", ps); } - if (list.size() > 0) { + if (!list.isEmpty()) { List>> partition = Lists.partition(list, pageSize); - result.addAll(partition.get(page)); + result = new ArrayList<>(partition.get(page)); } else { - return new PageData<>(list, list.size()); + return new PageData<>(list, 0); } ConcurrentHashMap map = new ConcurrentHashMap(); map.put("resourceType", params.get("resourceType")); @@ -1679,13 +1651,12 @@ public class ResourceServiceImpl extends CrudServiceImpl> pageData = new PageData<>(result, list.size()); - return pageData; + return new PageData<>(result, list.size()); } @Override public List> assemblerCarDetail(Map params) { - List> result = new ArrayList<>(); + List> result; Object[] ps = {params.get("resourceType"), params.get("id"), (Integer.parseInt(params.get("page").toString()) - 1) * Integer.parseInt(params.get("limit").toString()), Integer.parseInt(params.get("limit").toString())}; result = jdbcTemplate.queryForList("SELECT a.* FROM tb_resource_car a INNER JOIN sys_user b ON a.creator = b.id " + "INNER JOIN tb_data_resource d ON a.resource_id = d.id WHERE a.del_flag = 0 AND d.type = ? AND " + @@ -1724,7 +1695,7 @@ public class ResourceServiceImpl extends CrudServiceImpl selectTotalByDept() { HashMap resultMap = new HashMap<>(); Long deptId = SecurityUser.getUser().getDeptId(); List deptList = null; @@ -1855,17 +1826,17 @@ public class ResourceServiceImpl extends CrudServiceImpl() {{ - Map map = (Map) selectTotal(); - List> list = (List>) map.get("total"); - list.forEach(index -> { - if ("基础设施".equals(index.get("type").toString())) { - put("视频资源", Integer.parseInt(index.get("count").toString())); - } - }); - put("感知资源", 0); - put("云资源", 0); - }}; + HashMap resultMap = new HashMap<>(); + Map map = (Map) selectTotal(); + List> list = (List>) map.get("total"); + list.forEach(index -> { + if ("基础设施".equals(index.get("type").toString())) { + resultMap.put("视频资源", Integer.parseInt(index.get("count").toString())); + } + }); + resultMap.put("感知资源", 0); + resultMap.put("云资源", 0); + return resultMap; } private List getSourceIdsByProcess(List list) { @@ -1906,34 +1877,29 @@ public class ResourceServiceImpl extends CrudServiceImpl result = new ArrayList<>(); List> dtoMaps = baseDao.selectDevelopDocResource(); Map>> resourceTypeMap = dtoMaps.stream().collect(Collectors.groupingBy(m -> m.get("type").toString())); - resourceTypeMap.entrySet().stream().forEach(temp -> { - if (!"组件服务".equals(temp.getKey())) { - Map map = new HashMap(); - map.put("title", temp.getKey()); - map.put("children", temp.getValue()); + resourceTypeMap.forEach((key, value) -> { + if (!"组件服务".equals(key)) { + Map map = new HashMap<>(); + map.put("title", key); + map.put("children", value); result.add(map); } }); if (resourceTypeMap.get("组件服务") != null) { - Map componentMap = new HashMap(); + Map componentMap = new HashMap<>(); componentMap.put("title", "组件服务"); Map map = new ConcurrentHashMap<>(); - List tasks = resourceTypeMap.get("组件服务").stream().map(it -> { - CompletableFuture task = CompletableFuture.runAsync(() -> { - selectAttrsByResourceId(Long.parseLong(it.get("id").toString())).stream().filter(temp -> "组件类型".equals(temp.getAttrType())).forEach(attr -> { + CompletableFuture.allOf(resourceTypeMap.get("组件服务").stream().map(it -> CompletableFuture.runAsync(() -> selectAttrsByResourceId(Long.parseLong(it.get("id").toString())).stream() + .filter(temp -> "组件类型".equals(temp.getAttrType())).forEach(attr -> { if (map.get(attr.getAttrValue()) != null) { map.get(attr.getAttrValue()).add(it); } else { - map.put(attr.getAttrValue(), (List) Collections.synchronizedList(new ArrayList() {{ + map.put(attr.getAttrValue(), Collections.synchronizedList(new ArrayList() {{ add(it); }})); } - }); - }, executor); - return task; - }).collect(Collectors.toList()); - CompletableFuture.allOf(tasks.toArray(new CompletableFuture[tasks.size()])).join(); - componentMap.put("children", map.entrySet().stream().map(it -> new HashMap() {{ + }), executor)).toArray(CompletableFuture[]::new)).join(); + componentMap.put("children", map.entrySet().stream().map(it -> new HashMap() {{ put("title", it.getKey()); put("children", it.getValue()); }}).collect(Collectors.toList())); diff --git a/renren-admin/src/main/java/io/renren/modules/security/oauth2/ShiroSessionManager.java b/renren-admin/src/main/java/io/renren/modules/security/oauth2/ShiroSessionManager.java index 014455cc..705e0264 100644 --- a/renren-admin/src/main/java/io/renren/modules/security/oauth2/ShiroSessionManager.java +++ b/renren-admin/src/main/java/io/renren/modules/security/oauth2/ShiroSessionManager.java @@ -47,6 +47,7 @@ public class ShiroSessionManager extends DefaultWebSessionManager { } } + /*@Override protected void onStart(Session session, SessionContext context) { log.info("执行onStart"); diff --git a/renren-admin/src/main/resources/domain/tsingtao-xha.properties b/renren-admin/src/main/resources/domain/tsingtao-xha.properties index 5ddad40a..f6b7177e 100644 --- a/renren-admin/src/main/resources/domain/tsingtao-xha.properties +++ b/renren-admin/src/main/resources/domain/tsingtao-xha.properties @@ -1,7 +1,7 @@ tsingtao-xha.cloudhls=http://10.10.30.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=%s&protocol=hls tsingtao-xha.localhls=http://10.134.135.9:8001/hx-weather-warning/camera/getCameraLiveStreamByCode?cameraCode=%s&protocol=hls tsingtao-xha.cloudcam=http://10.10.30.9:8001/data_service/getCamera/getCameraCount -tsingtao-xha.localcam=http://10.134.135.9:8001/data_service/getCamera/getCameraCount +tsingtao-xha.localcam=http://10.10.30.57:9537/data_service/getCamera/getCameraCount tsingtao-xha.resourcecount=http://10.10.30.24:30090/api/share-portal/platform/catalogue/query?catalogueId=&departmentId=&serviceName=&type=&orderField=requestNum&orderType=desc&pageNum=1&pageSize=10&serviceType=data&rq=1655106309671.43 tsingtao-xha.resourceapplyinfo=http://10.10.30.24:30058/share-portal/platform/index/abilityMarket/count tsingtao-xha.sjzy=http://10.10.30.24:30090/api/share-portal/platform/catalogue/query?catalogueId=&departmentId=&serviceName=%s&type=&orderField=%s&orderType=%s&pageNum=%s&pageSize=%s&serviceType=data&rq=1655106309671.43 \ No newline at end of file From 63125fa2c5d67b44f726a808fc07fd28bd9ca626 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 29 Jul 2022 11:29:18 +0800 Subject: [PATCH 68/80] =?UTF-8?q?1=E3=80=81=E8=87=AA=E5=8A=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=A7=86=E9=A2=91=E8=B5=84=E6=BA=90=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=92=8C=E9=80=9A=E9=81=93=E4=BF=A1=E6=81=AF=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E6=89=80=E4=BD=BF=E7=94=A8=E7=9A=84RestTemplate?= =?UTF-8?q?=E4=B8=8D=E4=BD=BF=E7=94=A8=E6=A1=86=E6=9E=B6=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=9A=84=E8=80=8C=E4=BD=BF=E7=94=A8=E6=96=B0=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=9A=84=EF=BC=88=E4=B8=BB=E8=A6=81=E6=98=AF=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/service/MonitorService.java | 127 +++++++++--------- .../task/GetAndSaveOrgenizationTask.java | 24 ++++ 2 files changed, 86 insertions(+), 65 deletions(-) create mode 100644 renren-admin/src/main/java/io/renren/modules/monitor/task/GetAndSaveOrgenizationTask.java diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java index cb590328..cd487065 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java @@ -20,6 +20,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Lazy; import org.springframework.http.*; +import org.springframework.http.client.SimpleClientHttpRequestFactory; +import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; @@ -39,6 +41,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; +import java.nio.charset.Charset; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneOffset; @@ -1137,7 +1140,7 @@ public class MonitorService { return Result.success(maps); } - //以此作为获取视频资源 + //以此作为获取视频资源的开始，获取地区和部门信息 public void getAndSaveOrgenization(){ List orgenizationByPage = this.getOrgenization(new ArrayList(10000)); if(orgenizationByPage != null && orgenizationByPage.size() > 0){ @@ -1163,9 +1166,11 @@ public class MonitorService { publisher.publishEvent(new SaveOrgenizationEndEvent(this,true)); } } + publisher.publishEvent(new SaveOrgenizationEndEvent(this,true)); } public List getOrgenization(List list) { + RestTemplate template = this.getRestTemplate(); int count = 0; boolean flag = true; while(flag){ @@ -1174,11 +1179,11 @@ public class MonitorService { } count ++; try { - List list1 = this.getOrgenizationRoot(); + List list1 = this.getOrgenizationRoot(template); list.addAll(list1); list1.forEach(a->{ if(a.getBooleanValue("isParent")){ - getOrgenizationByParent(list,a.getString("id")); + getOrgenizationByParent(list,a.getString("id"),template); } }); // if(list != null && list.size() > 0){ @@ -1206,7 +1211,7 @@ public class MonitorService { } //获取根组织 - public List getOrgenizationRoot(){ + public List getOrgenizationRoot(RestTemplate restTemplate){ List list = new ArrayList<>(); String url = monitorDomain + "/videoService/devicesManager/deviceTree?id=&nodeType=1&typeCode=01&page=1&pageSize=3000"; HttpHeaders headers = new HttpHeaders(); @@ -1221,7 +1226,7 @@ public class MonitorService { } //组织递归根据父ID查,简化了分页 - public List getOrgenizationByParent(List list,String id){ + public List getOrgenizationByParent(List list,String id,RestTemplate restTemplate){ HttpHeaders headers = new HttpHeaders(); headers.add("X-Subject-Token",token); String url; @@ -1241,7 +1246,7 @@ public class MonitorService { list.addAll(jsonObjects); jsonObjects.forEach(js->{ if(js.getBooleanValue("isParent")){ - getOrgenizationByParent(list,js.getString("id")); + getOrgenizationByParent(list,js.getString("id"),restTemplate); } }); } @@ -1260,48 +1265,48 @@ public class MonitorService { } //保存通道信息 - public Result saveChannelInfo() throws Exception { - List orgenList = cameraOrgenMapper.listOrgenization(); - for(Map m:orgenList){ - List cameChannels = getChannelInfo(m.get("id").toString()); - List needSave = new ArrayList<>(); - if(cameChannels.size() > 0){ - boolean flag = false; - for(Map j:cameChannels){ - if(Integer.parseInt(j.get("nodeType").toString()) ==3){ - flag = true; - String channelSn = j.get("channelSn").toString(); - String channelOrngin = channelSn.substring(0,6); - String deptName = cameraOrgenMapper.getNameByidPart(channelOrngin); - j.put("regionName",deptName); - j.put("regionCode",channelOrngin); - j.put("parentId",m.get("id").toString()); - j.put("nodeName",""); - needSave.add(j); - } - } - if(!flag){//更新count字段 - cameraOrgenMapper.updateOrganizationCount(m.get("id").toString()); - } - }else{//更新count字段 - cameraOrgenMapper.updateOrganizationCount(m.get("id").toString()); - } - - needSave.forEach(map->setNodeName(map,map.get("parentId").toString())); - //保存并更新count字段 - if(needSave.size() > 0){ - List> partition = Lists.partition(needSave, 100); - partition.forEach(list->{ - cameraOrgenMapper.batchSaveCameraChannel(list); - }); - cameraOrgenMapper.updateOrganizationCount(m.get("id").toString()); - } - } - return Result.success(); - } +// public Result saveChannelInfo() throws Exception { +// List orgenList = cameraOrgenMapper.listOrgenization(); +// for(Map m:orgenList){ +// List cameChannels = getChannelInfo(m.get("id").toString()); +// List needSave = new ArrayList<>(); +// if(cameChannels.size() > 0){ +// boolean flag = false; +// for(Map j:cameChannels){ +// if(Integer.parseInt(j.get("nodeType").toString()) ==3){ +// flag = true; +// String channelSn = j.get("channelSn").toString(); +// String channelOrngin = channelSn.substring(0,6); +// String deptName = cameraOrgenMapper.getNameByidPart(channelOrngin); +// j.put("regionName",deptName); +// j.put("regionCode",channelOrngin); +// j.put("parentId",m.get("id").toString()); +// j.put("nodeName",""); +// needSave.add(j); +// } +// } +// if(!flag){//更新count字段 +// cameraOrgenMapper.updateOrganizationCount(m.get("id").toString()); +// } +// }else{//更新count字段 +// cameraOrgenMapper.updateOrganizationCount(m.get("id").toString()); +// } +// +// needSave.forEach(map->setNodeName(map,map.get("parentId").toString())); +// //保存并更新count字段 +// if(needSave.size() > 0){ +// List> partition = Lists.partition(needSave, 100); +// partition.forEach(list->{ +// cameraOrgenMapper.batchSaveCameraChannel(list); +// }); +// cameraOrgenMapper.updateOrganizationCount(m.get("id").toString()); +// } +// } +// return Result.success(); +// } //根据组织id获取通道信息 - public List getChannelInfo(String orgenId) throws Exception{ + public List getChannelInfo(String orgenId,RestTemplate restTemplate) throws Exception{ String url = monitorDomain +"/videoService/devicesManager/deviceTree?nodeType=1&typeCode=01;0;ALL;ALL&page=1&pageSize=3000&id="+orgenId; HttpHeaders headers = new HttpHeaders(); headers.add("X-Subject-Token",token); @@ -1331,8 +1336,8 @@ public class MonitorService { } //2、获取视频通道信息并保存,多线程版 - //@Async public void saveChannelInfoAsync() throws Exception { + RestTemplate restTemplate = this.getRestTemplate(); AtomicInteger faulseCount = new AtomicInteger();//失败的次数 //1-清空t_camera_channel cameraOrgenMapper.truncate("t_camera_channel_cache"); @@ -1360,7 +1365,7 @@ public class MonitorService { //4-根据地区id去查询视频通道信息 List cameraChannels = new ArrayList<>(); try { - cameraChannels = getChannelInfo(m.get("id").toString()); + cameraChannels = getChannelInfo(m.get("id").toString(),restTemplate); }catch (Exception e){ log.info("根据地区id:{}查询视频通道失败,这是第{}次重试",m.get("id").toString(),tryCount); @@ -1380,8 +1385,6 @@ public class MonitorService { } //5-保存视频通道信息 batchSaveChannelInfos(cameraChannels,m.get("id").toString()); - //6-更新地区表的count - //cameraOrgenMapper.updateOrganizationCount(m.get("id").toString()); flag = false; } }); @@ -1399,12 +1402,6 @@ public class MonitorService { //发布事件 publisher.publishEvent(new SaveCameraChannelEndEvent(this,true)); - //以下方法将在事件后处理 - //将cache表数据保存到相应的主表中 - //insertChannelCacheToCameraChannel); - //8-同步武伟达的t_channel_mtm_label数据 - //synchronizeMtmLabel(); - } //同步武伟达的t_channel_mtm_label数据 @@ -1511,17 +1508,17 @@ public class MonitorService { return childs; } - public void test(){ - //保存cache表信息到正式表 - insertChannelCacheToCameraChannel(); - - cameraOrgenMapper.updateRegionChannelCount(); - - //更新武伟达的标签表 - //synchronizeMtmLabel(); - + public RestTemplate getRestTemplate(){ + SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); + factory.setReadTimeout(20000);//单位为ms + factory.setConnectTimeout(3000);//单位为ms + factory.setOutputStreaming(false); + RestTemplate restTemplate = new RestTemplate(factory); + restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(Charset.forName("UTF-8"))); + return restTemplate; } + } diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/task/GetAndSaveOrgenizationTask.java b/renren-admin/src/main/java/io/renren/modules/monitor/task/GetAndSaveOrgenizationTask.java new file mode 100644 index 00000000..29e00bce --- /dev/null +++ b/renren-admin/src/main/java/io/renren/modules/monitor/task/GetAndSaveOrgenizationTask.java @@ -0,0 +1,24 @@ +package io.renren.modules.monitor.task; + +import io.renren.modules.job.task.ITask; +import io.renren.modules.monitor.service.MonitorService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 定时获取视频资源的部门信息 + * @author ytl + * @Date 2022/7/29 9:45 + **/ + +@Component("getAndSaveOrgenizationTask") +public class GetAndSaveOrgenizationTask implements ITask { + @Autowired + private MonitorService monitorService; + + @Override + public void run(String params) { + monitorService.getAndSaveOrgenization(); + } + +} From 353485ee04235b675de4dab780e55184f8af3e59 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 29 Jul 2022 11:30:09 +0800 Subject: [PATCH 69/80] no message --- .../monitor/controller/Controller.java | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java b/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java index 26acea28..7c1fde10 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java @@ -671,7 +671,7 @@ public class Controller { */ @GetMapping("/saveOrgenization") public Result saveOrgenization() throws Exception{ - List orgenizationByPage = monitorService.getOrgenization(new ArrayList()); + List orgenizationByPage = monitorService.getOrgenization(new ArrayList(10000)); List maps = JSONObject.parseArray(JSONObject.toJSONString(orgenizationByPage), Map.class); if(maps.size() > 0){ List> lists = Lists.partition(maps,100); @@ -693,20 +693,48 @@ public class Controller { return Result.success(); } + /** + * 事件版的保存区域组织信息 + */ + @GetMapping("/saveOrgenizationEvent") + public Result saveOrgenizationEvent() throws Exception{ + monitorService.getAndSaveOrgenization(); + return Result.success(); + } + /** * 保存通道信息多线程版 * @return */ @GetMapping("saveChannelInfoAsync") public Result saveChannelInfoAsync() throws Exception{ - monitorService.saveChannelInfoAsync(); - return Result.success("成功收到指令,请耐心等待"); + monitorService.saveChannelInfoAsync(); + return Result.success(); } /******************************2022/07/13 ytl修改视频资源 end********************************************/ - + /** + * 07-25增加的判断视频资源是否在库中， + * 以后可以删除，直接调用cameraChannelServicecheckCameraIfExists即可 + * @param list + * @return + */ @GetMapping("/checkCameraIfExists") public Result checkCameraIfExists(@RequestParam List list){ Result result = cameraChannelService.checkCameraIfExists(list); return result; } + +// //以下是7月26号的测试用的 +// @GetMapping("/getCameraChannelByPID") +// public Result getCameraChannelByPID(@RequestParam String pid) throws Exception{ +// List channelInfo = monitorService.getChannelInfo(pid); +// return Result.success(channelInfo); +// } +// +// @GetMapping("/getOrganization") +// public Result getOrganization() throws Exception{ +// List orgenization = monitorService.getOrgenization(new ArrayList<>()); +// return Result.success(orgenization); +// } + } From 20c21aabf79e987ae769e1cc211acd58747e4e1f Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Fri, 29 Jul 2022 11:30:17 +0800 Subject: [PATCH 70/80] .. --- .../annotation/ActivitiNoticeOperation.java | 8 +- .../common/aspect/ActivitiNoticeAspect.java | 94 +++++++++---------- .../service/impl/ResourceServiceImpl.java | 7 +- 3 files changed, 52 insertions(+), 57 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/annotation/ActivitiNoticeOperation.java b/renren-admin/src/main/java/io/renren/common/annotation/ActivitiNoticeOperation.java index 1a60a025..bb6d102a 100644 --- a/renren-admin/src/main/java/io/renren/common/annotation/ActivitiNoticeOperation.java +++ b/renren-admin/src/main/java/io/renren/common/annotation/ActivitiNoticeOperation.java @@ -1,9 +1,7 @@ package io.renren.common.annotation; - import java.lang.annotation.*; - /** * 流程流转消息通知 */ @@ -14,20 +12,16 @@ public @interface ActivitiNoticeOperation { /** * 节点名称 - * - * @return */ String value() default ""; /** * 流程名称 - * - * @return */ String process() default ""; /** - * @return activiti 监听器类型 1:TaskListener 任务监听器; 2:ExecutionListener 执行监听器; + * activiti 监听器类型 1:TaskListener 任务监听器; 2:ExecutionListener 执行监听器; */ int type() default 1; } diff --git a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java index 591933c7..60b2cc70 100644 --- a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java +++ b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java @@ -1,6 +1,5 @@ package io.renren.common.aspect; - import com.alibaba.fastjson.JSON; import io.renren.common.annotation.ActivitiNoticeOperation; import io.renren.modules.notice.dto.SysNoticeDTO; @@ -44,9 +43,9 @@ import java.util.concurrent.Executors; @Component public class ActivitiNoticeAspect { - private static final Integer cpuNUm = Runtime.getRuntime().availableProcessors(); - private static final ExecutorService executor = Executors.newFixedThreadPool(cpuNUm * 3); - private static final Logger logger = LoggerFactory.getLogger(ActivitiNoticeAspect.class); + private static final Integer CPU_NUM = Runtime.getRuntime().availableProcessors(); + private static final ExecutorService EXECUTOR = Executors.newFixedThreadPool(CPU_NUM * 3); + private static final Logger LOGGER = LoggerFactory.getLogger(ActivitiNoticeAspect.class); @Autowired private SysNoticeService sysNoticeService; @@ -59,7 +58,7 @@ public class ActivitiNoticeAspect { @Autowired private SysRoleService sysRoleService; - private Set work_ = new CopyOnWriteArraySet<>(); + private Set work = new CopyOnWriteArraySet<>(); @Value("${big_date.name}") private String bigDateDeptName; // 大数据局名称 @@ -67,28 +66,28 @@ public class ActivitiNoticeAspect { private String roleName; // 具备审批的角色名称 public ActivitiNoticeAspect() { - logger.error("构造：ActivitiNoticeAspect"); + LOGGER.error("构造：ActivitiNoticeAspect"); } @Pointcut("@annotation(io.renren.common.annotation.ActivitiNoticeOperation)") public void activitiNoticePointCut() { - logger.error("切面:ActivitiNoticeAspect"); + LOGGER.error("切面:ActivitiNoticeAspect"); } @After(value = "activitiNoticePointCut()") public void notice(JoinPoint joinPoint) throws NoSuchMethodException { - logger.error("-------------------------------进入流程流转消息切面---------------------------------"); + LOGGER.error("-------------------------------进入流程流转消息切面---------------------------------"); long beginTime = System.currentTimeMillis(); MethodSignature signature = (MethodSignature) joinPoint.getSignature(); Method method = joinPoint.getTarget().getClass().getDeclaredMethod(signature.getName(), signature.getParameterTypes()); final ActivitiNoticeOperation activitiNoticeOperation = method.getAnnotation(ActivitiNoticeOperation.class); - logger.error("切面类型：" + activitiNoticeOperation.type()); + LOGGER.error("切面类型：{}", activitiNoticeOperation.type()); switch (activitiNoticeOperation.type()) { case 1: { - Arrays.asList(joinPoint.getArgs()).stream().findFirst().ifPresent(arg -> { + Arrays.stream(joinPoint.getArgs()).findFirst().ifPresent(arg -> { final DelegateTask delegateTask = (DelegateTask) arg; final String eventName = delegateTask.getEventName(); - logger.error("任务监听器事件：" + eventName); + LOGGER.error("任务监听器事件：{}", eventName); switch (eventName) { case TaskListener.EVENTNAME_ASSIGNMENT: // 节点被委派给某人 assignment_notice(delegateTask, activitiNoticeOperation); @@ -105,20 +104,19 @@ public class ActivitiNoticeAspect { Arrays.asList(joinPoint.getArgs()).stream().findFirst().ifPresent(arg -> { final DelegateExecution execution = (DelegateExecution) arg; final String eventName = execution.getEventName(); - logger.error("执行监听器事件：" + eventName); - switch (eventName) { - case ExecutionListener.EVENTNAME_END: // 流程完成 - end_notice(execution, activitiNoticeOperation); - break; - default: + LOGGER.error("执行监听器事件：{}", eventName); + if (ExecutionListener.EVENTNAME_END.equals(eventName)) { // 流程完成 + end_notice(execution, activitiNoticeOperation); } }); } // 执行监听器 break; + default: + break; } //执行时长(毫秒) long time = System.currentTimeMillis() - beginTime; - logger.error("执行时长{} ms", time); + LOGGER.error("执行时长{} ms", time); } /** @@ -129,12 +127,12 @@ public class ActivitiNoticeAspect { */ private void task_complete_notice(final DelegateTask delegateTask, final ActivitiNoticeOperation activitiNoticeOperation) { Map kv = delegateTask.getVariables(); - logger.error("表单：" + JSON.toJSONString(kv)); - if (work_.contains(TaskListener.EVENTNAME_COMPLETE + kv.get("id").toString())) { - logger.error("------------出现重放------------"); + LOGGER.error("表单：" + JSON.toJSONString(kv)); + if (work.contains(TaskListener.EVENTNAME_COMPLETE + kv.get("id").toString())) { + LOGGER.error("------------出现重放------------"); return; } - work_.add(TaskListener.EVENTNAME_COMPLETE + kv.get("id").toString()); + work.add(TaskListener.EVENTNAME_COMPLETE + kv.get("id").toString()); String creator = null; if (kv.containsKey("creator")) { // 表单存在创建者 creator = kv.get("creator").toString(); @@ -182,9 +180,9 @@ public class ActivitiNoticeAspect { dto.setCreateDate(new Date()); dto.setFrom("通知"); sysNoticeService.save(dto); - }, executor); + }, EXECUTOR); } catch (Exception e) { - logger.error("发送通知消息异常", e); + LOGGER.error("发送通知消息异常", e); } finally { // 防止重放 new Thread(() -> { @@ -193,7 +191,7 @@ public class ActivitiNoticeAspect { } catch (InterruptedException e) { throw new RuntimeException(e); } finally { - work_.remove(TaskListener.EVENTNAME_COMPLETE + kv.get("id").toString()); + work.remove(TaskListener.EVENTNAME_COMPLETE + kv.get("id").toString()); } }).start(); } @@ -207,12 +205,12 @@ public class ActivitiNoticeAspect { */ private void end_notice(final DelegateExecution execution, final ActivitiNoticeOperation activitiNoticeOperation) { Map kv = execution.getVariables(); - logger.error("表单：" + JSON.toJSONString(kv)); - if (work_.contains(ExecutionListener.EVENTNAME_END + kv.get("id").toString())) { - logger.error("------------出现重放------------"); + LOGGER.error("表单：" + JSON.toJSONString(kv)); + if (work.contains(ExecutionListener.EVENTNAME_END + kv.get("id").toString())) { + LOGGER.error("------------出现重放------------"); return; } - work_.add(ExecutionListener.EVENTNAME_END + kv.get("id").toString()); + work.add(ExecutionListener.EVENTNAME_END + kv.get("id").toString()); String creator = null; if (kv.containsKey("creator")) { // 表单存在创建者 creator = kv.get("creator").toString(); @@ -262,12 +260,12 @@ public class ActivitiNoticeAspect { dto.setCreateDate(new Date()); dto.setFrom("通知"); sysNoticeService.save(dto); - }, executor).thenRunAsync(() -> { - logger.error("大数据局名称：" + bigDateDeptName); + }, EXECUTOR).thenRunAsync(() -> { + LOGGER.error("大数据局名称：" + bigDateDeptName); SysDeptDTO deptDTO = sysDeptService.getByName(bigDateDeptName); - logger.error("deptDTOId:" + deptDTO.getId()); + LOGGER.error("deptDTOId:" + deptDTO.getId()); SysRoleDTO roleDTO = sysRoleService.getByName(roleName); - logger.error("roleDTOId:" + roleDTO.getId()); + LOGGER.error("roleDTOId:" + roleDTO.getId()); Optional userDTO = Optional.ofNullable(sysUserService.getByDeptIdAndRoleId(deptDTO.getId(), roleDTO.getId())); userDTO.ifPresent(user -> { SysUserDTO creatorDTO = sysUserService.get(Long.valueOf(finalCreator)); @@ -286,9 +284,9 @@ public class ActivitiNoticeAspect { dto.setFrom("通知"); sysNoticeService.save(dto); }); - }, executor); + }, EXECUTOR); } catch (Exception exception) { - logger.error("发送通知消息异常", exception); + LOGGER.error("发送通知消息异常", exception); } finally { // 防止重放 new Thread(() -> { @@ -297,7 +295,7 @@ public class ActivitiNoticeAspect { } catch (InterruptedException e) { throw new RuntimeException(e); } finally { - work_.remove(ExecutionListener.EVENTNAME_END + kv.get("id").toString()); + work.remove(ExecutionListener.EVENTNAME_END + kv.get("id").toString()); } }).start(); } @@ -312,12 +310,12 @@ public class ActivitiNoticeAspect { */ private void assignment_notice(final DelegateTask delegateTask, final ActivitiNoticeOperation activitiNoticeOperation) { Map kv = delegateTask.getVariables(); - logger.error("表单：" + JSON.toJSONString(kv)); - if (work_.contains(TaskListener.EVENTNAME_ASSIGNMENT + kv.get("id").toString())) { - logger.error("------------出现重放------------"); + LOGGER.error("表单：" + JSON.toJSONString(kv)); + if (work.contains(TaskListener.EVENTNAME_ASSIGNMENT + kv.get("id").toString())) { + LOGGER.error("------------出现重放------------"); return; } - work_.add(TaskListener.EVENTNAME_ASSIGNMENT + kv.get("id").toString()); + work.add(TaskListener.EVENTNAME_ASSIGNMENT + kv.get("id").toString()); String creator = null; if (kv.containsKey("creator")) { // 表单存在创建者 creator = kv.get("creator").toString(); @@ -332,9 +330,9 @@ public class ActivitiNoticeAspect { CompletableFuture.runAsync(() -> { // 发起人 try { SysUserDTO assignee = sysUserService.get(Long.valueOf(delegateTask.getAssignee())); - logger.error("审核人：" + assignee.getId()); + LOGGER.error("审核人：" + assignee.getId()); String content = "【通知】您发起的流程 " + activitiNoticeOperation.process() + " 当前审核节点为：" + activitiNoticeOperation.value() + "；当前审核人为：\"" + assignee.getDeptName() + "\"审核负责人\"" + assignee.getRealName() + "\""; - logger.info("通知内容：" + content); + LOGGER.info("通知内容：" + content); SysNoticeDTO dto = new SysNoticeDTO(); dto.setType(2); dto.setTitle("流程流转系统通知"); @@ -349,9 +347,9 @@ public class ActivitiNoticeAspect { dto.setFrom("通知"); sysNoticeService.save(dto); } catch (Exception exception) { - logger.error("通知发起人失败", exception); + LOGGER.error("通知发起人失败", exception); } - }, executor).thenRunAsync(() -> { // 审批者 + }, EXECUTOR).thenRunAsync(() -> { // 审批者 try { SysUserDTO owner = sysUserService.get(Long.valueOf(finalCreator)); String content = "【通知】" + owner.getRealName() + "发起的流程" + activitiNoticeOperation.process() + " 已进入审核节点：" + activitiNoticeOperation.value() + "；当前审核人指派为您"; @@ -369,16 +367,16 @@ public class ActivitiNoticeAspect { dto.setFrom("通知"); sysNoticeService.save(dto); } catch (Exception exception) { - logger.error("通知审批人失败", exception); + LOGGER.error("通知审批人失败", exception); } - }, executor); + }, EXECUTOR); } catch (Exception e) { - logger.error("发送通知消息异常", e); + LOGGER.error("发送通知消息异常", e); } finally { new Thread(() -> { try { Thread.sleep(200); - work_.remove(TaskListener.EVENTNAME_ASSIGNMENT + kv.get("id").toString()); + work.remove(TaskListener.EVENTNAME_ASSIGNMENT + kv.get("id").toString()); } catch (InterruptedException e) { throw new RuntimeException(e); } 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 49f2d5e6..3accaf62 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 @@ -1889,7 +1889,7 @@ public class ResourceServiceImpl extends CrudServiceImpl componentMap = new HashMap<>(); componentMap.put("title", "组件服务"); Map map = new ConcurrentHashMap<>(); - CompletableFuture.allOf(resourceTypeMap.get("组件服务").stream().map(it -> CompletableFuture.runAsync(() -> selectAttrsByResourceId(Long.parseLong(it.get("id").toString())).stream() + CompletableFuture[] completableFutures = resourceTypeMap.get("组件服务").stream().map(it -> CompletableFuture.runAsync(() -> selectAttrsByResourceId(Long.parseLong(it.get("id").toString())).stream() .filter(temp -> "组件类型".equals(temp.getAttrType())).forEach(attr -> { if (map.get(attr.getAttrValue()) != null) { map.get(attr.getAttrValue()).add(it); @@ -1898,7 +1898,10 @@ public class ResourceServiceImpl extends CrudServiceImpl new HashMap() {{ put("title", it.getKey()); put("children", it.getValue()); From c874e7f9cf4bd4ef9b66bdb31be68caae97e31e0 Mon Sep 17 00:00:00 2001 From: yitonglei Date: Fri, 29 Jul 2022 12:05:22 +0800 Subject: [PATCH 71/80] =?UTF-8?q?1=E3=80=81=E4=BB=A3=E7=A0=81=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GetAboutCameraChannelEventListener.java | 2 +- .../mapper/CameraOrgenizationMapper.java | 4 +-- .../monitor/service/MonitorService.java | 33 ++++++++----------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/eventListen/GetAboutCameraChannelEventListener.java b/renren-admin/src/main/java/io/renren/modules/monitor/eventListen/GetAboutCameraChannelEventListener.java index 780f8c72..4de37e12 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/eventListen/GetAboutCameraChannelEventListener.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/eventListen/GetAboutCameraChannelEventListener.java @@ -48,7 +48,7 @@ public class GetAboutCameraChannelEventListener { //保存cache表信息到正式表 monitorService.insertChannelCacheToCameraChannel(); - //跟新t_region的channelcount + //更新t_region的channelcount cameraOrgenMapper.updateRegionChannelCount(); //更新武伟达的标签表 diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java index b22ae395..32ecc0d6 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/mapper/CameraOrgenizationMapper.java @@ -39,8 +39,8 @@ public interface CameraOrgenizationMapper extends BaseDao { @Select(" SELECT name FROM t_camera_organization where substring(id,5) = #{idPart} and left(id,3) = '006'") String getNameByidPart(@Param("idPart")String idPart); - @Update("UPDATE t_camera_organization SET COUNT = COUNT + 1 WHERE id = #{id}") - void updateOrganizationCount(@Param("id") String id); +// @Update("UPDATE t_camera_organization SET COUNT = COUNT + 1 WHERE id = #{id}") +// void updateOrganizationCount(@Param("id") String id); void batchSaveCameraChannel(List list); diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java index cd487065..1505ed4a 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/service/MonitorService.java @@ -1140,7 +1140,7 @@ public class MonitorService { return Result.success(maps); } - //以此作为获取视频资源的开始，获取地区和部门信息 + //以此作为获取视频资源的开始，获取地区和组织信息 public void getAndSaveOrgenization(){ List orgenizationByPage = this.getOrgenization(new ArrayList(10000)); if(orgenizationByPage != null && orgenizationByPage.size() > 0){ @@ -1166,7 +1166,6 @@ public class MonitorService { publisher.publishEvent(new SaveOrgenizationEndEvent(this,true)); } } - publisher.publishEvent(new SaveOrgenizationEndEvent(this,true)); } public List getOrgenization(List list) { @@ -1186,14 +1185,10 @@ public class MonitorService { getOrgenizationByParent(list,a.getString("id"),template); } }); -// if(list != null && list.size() > 0){ -// cameraOrgenMapper.truncate("t_camera_organization"); -// } flag = false; return list; }catch (Exception e){ - System.out.println("第"+String.valueOf(count)+"次获取，错误是："); - System.out.println(e.getMessage()); + log.error("第{}次获取视频通道组织信息失败，错误是：{}",count,e.getMessage()); if(count >= 10){ log.error("获取视频通道组织信息失败，失败原因:{}",e.getMessage()); return new ArrayList(); @@ -1246,7 +1241,11 @@ public class MonitorService { list.addAll(jsonObjects); jsonObjects.forEach(js->{ if(js.getBooleanValue("isParent")){ - getOrgenizationByParent(list,js.getString("id"),restTemplate); + try { + getOrgenizationByParent(list, js.getString("id"), restTemplate); + }catch (Exception e){ + log.error("根据父id:{}获取下级组织信息失败",js.getString("id")); + } } }); } @@ -1319,7 +1318,7 @@ public class MonitorService { if(re.getJSONArray("results") != null){ results = re.getJSONArray("results").toJavaList(Map.class); }else{ - log.info("根据地区id:{}获取摄像头信息失败，失败原因:{}",orgenId,re.toJSONString()); + log.info("根据组织id:{}获取摄像头信息失败，失败原因:{}",orgenId,re.toJSONString()); } return results; } @@ -1368,10 +1367,10 @@ public class MonitorService { cameraChannels = getChannelInfo(m.get("id").toString(),restTemplate); }catch (Exception e){ - log.info("根据地区id:{}查询视频通道失败,这是第{}次重试",m.get("id").toString(),tryCount); + log.info("根据组织id:{}查询视频通道失败,这是第{}次重试",m.get("id").toString(),tryCount); if(tryCount >= 10){ faulseCount.incrementAndGet(); - log.error("根据地区id:{},查询视频通道失败,超出重试次数",m.get("id").toString()); + log.error("根据组织id:{},查询视频通道失败,超出重试次数,将去正式表中查询",m.get("id").toString()); //去t_camera_channel查询相关信息并保存 cameraChannels = cameraChannelMapper.selectCameraChannelByPid(m.get("id").toString()); if(cameraChannels.size() > 0){ @@ -1379,6 +1378,8 @@ public class MonitorService { for(List ll:channelList){ cameraChannelMapper.batchSaveCameraChannel(ll); } + } else { + log.error("根据组织id:{},从正式表中查询视频通道失败,不存在该部门数据",m.get("id").toString()); } } continue; @@ -1465,9 +1466,6 @@ public class MonitorService { } } } -// else{//更新count字段 -// cameraOrgenMapper.updateOrganizationCount(parentId); -// } //修改nodeName needSave.forEach(map->setNodeName(map,map.get("parentId").toString())); @@ -1477,13 +1475,12 @@ public class MonitorService { partition.forEach(l->{ cameraOrgenMapper.batchSaveCameraChannel(l); }); - //cameraOrgenMapper.updateOrganizationCount(parentId); } } - //更新完通道信息后，查询地区下通道的数量并更新到地区表中 + //更新完通道信息后，查询组织下通道的数量并更新到组织表中 public void editChannelCount() throws Exception{ - //1-更新地区表中的每个地区下channelCount + //更新地区表中的每个地区下channelCount List maps = cameraOrgenMapper.selectAllSubOrganizationMap(); if(maps.size() > 0){ for(int i=0;i< maps.size();i++){ @@ -1493,8 +1490,6 @@ public class MonitorService { cameraOrgenMapper.editChannelCount(count,orgaid); }; } - //2-更新市区表t_region表中的channelCount - //cameraOrgenMapper.updateRegionChannelCount(); } public List listChildOrgenIds(String id){ From b525a1d50a673006848c43bd6b151d214c8d8795 Mon Sep 17 00:00:00 2001 From: lizhicheng Date: Fri, 29 Jul 2022 16:48:23 +0800 Subject: [PATCH 72/80] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/db/V4.3__fuse_drop_col.sql | 10 ++ .../fuse/controller/FuseController.java | 7 +- .../io/renren/modules/fuse/dao/TbFuseDao.java | 2 - .../io/renren/modules/fuse/dto/TbFuseDTO.java | 10 -- .../modules/fuse/dto/TbFuseResourceDTO.java | 5 +- .../modules/fuse/entity/TbFuseEntity.java | 20 ---- .../fuse/entity/TbFuseResourceEntity.java | 4 + .../modules/fuse/service/TbFuseService.java | 2 - .../fuse/service/impl/TbFuseServiceImpl.java | 96 ++++++++++++------- .../controller/ResourceController.java | 7 -- .../main/resources/db/V4.3__fuse_drop_col.sql | 10 ++ .../main/resources/mapper/fuse/TbFuseDao.xml | 16 +--- 12 files changed, 94 insertions(+), 95 deletions(-) create mode 100644 config/db/V4.3__fuse_drop_col.sql create mode 100644 renren-admin/src/main/resources/db/V4.3__fuse_drop_col.sql diff --git a/config/db/V4.3__fuse_drop_col.sql b/config/db/V4.3__fuse_drop_col.sql new file mode 100644 index 00000000..093b48bf --- /dev/null +++ b/config/db/V4.3__fuse_drop_col.sql @@ -0,0 +1,10 @@ +ALTER TABLE `tb_fuse` +MODIFY COLUMN `description` varchar(1000) DEFAULT NULL COMMENT '融合服务描述', +DROP COLUMN `dept_user`, +DROP COLUMN `mobile`, +DROP COLUMN `provider`, +DROP COLUMN `provider_user`, +DROP COLUMN `provider_mobile`; + +ALTER TABLE `tb_fuse_resource` +ADD COLUMN `type` varchar(128) NULL COMMENT '资源类型'; \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/controller/FuseController.java b/renren-admin/src/main/java/io/renren/modules/fuse/controller/FuseController.java index da0a3fa6..be37b1e0 100644 --- a/renren-admin/src/main/java/io/renren/modules/fuse/controller/FuseController.java +++ b/renren-admin/src/main/java/io/renren/modules/fuse/controller/FuseController.java @@ -49,12 +49,7 @@ public class FuseController { @ApiImplicitParam(name = "description", value = "融合服务描述", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "type", value = "融合服务类型", paramType = "query", dataType = "String"), @ApiImplicitParam(name = "applicationArea", value = "应用领域", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "deptId", value = "所属部门", paramType = "query", dataType = "int"), - @ApiImplicitParam(name = "deptUser", value = "部门联系人", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "mobile", value = "部门联系人电话", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "provider", value = "服务商", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "providerUser", value = "服务商联系人", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "providerMobile", value = "服务商联系人电话", paramType = "query", dataType = "String") + @ApiImplicitParam(name = "deptId", value = "所属部门", paramType = "query", dataType = "int") }) public Result> page(@ApiIgnore @RequestParam Map params) { PageData page = tbFuseService.page(params); diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/dao/TbFuseDao.java b/renren-admin/src/main/java/io/renren/modules/fuse/dao/TbFuseDao.java index 6a3aa6f8..2336dca0 100644 --- a/renren-admin/src/main/java/io/renren/modules/fuse/dao/TbFuseDao.java +++ b/renren-admin/src/main/java/io/renren/modules/fuse/dao/TbFuseDao.java @@ -18,6 +18,4 @@ public interface TbFuseDao extends BaseDao { List getFuseDTOList(Map params); - List> selectGroupByDeptId(); - } diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java b/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java index d1d84a05..66f23296 100644 --- a/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java @@ -29,16 +29,6 @@ public class TbFuseDTO { private String applicationArea; @ApiModelProperty(value = "所属部门") private Long deptId; - @ApiModelProperty(value = "部门联系人") - private String deptUser; - @ApiModelProperty(value = "部门联系人电话") - private String mobile; - @ApiModelProperty(value = "服务商") - private String provider; - @ApiModelProperty(value = "服务商联系人") - private String providerUser; - @ApiModelProperty(value = "服务商联系人电话") - private String providerMobile; @ApiModelProperty(value = "创建人") private Long creator; @ApiModelProperty(value = "创建时间") diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseResourceDTO.java b/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseResourceDTO.java index 44f2e440..51e0be83 100644 --- a/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseResourceDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseResourceDTO.java @@ -1,6 +1,5 @@ package io.renren.modules.fuse.dto; -import io.renren.modules.resource.dto.ResourceDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,6 +23,8 @@ public class TbFuseResourceDTO { @ApiModelProperty(value = "资源挂载顺序") private String sequence; @ApiModelProperty(value = "资源") - private ResourceDTO resource; + private Object resource; + @ApiModelProperty(value = "资源类型") + private String type; } diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java b/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java index 102799eb..beea7fc0 100644 --- a/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java @@ -43,26 +43,6 @@ public class TbFuseEntity extends BaseEntity { */ @TableField(fill = FieldFill.INSERT) private Long deptId; - /** - * 部门联系人 - */ - private String deptUser; - /** - * 部门联系人电话 - */ - private String mobile; - /** - * 服务商 - */ - private String provider; - /** - * 服务商联系人 - */ - private String providerUser; - /** - * 服务商联系人电话 - */ - private String providerMobile; /** * 创建人 */ diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseResourceEntity.java b/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseResourceEntity.java index d32186d8..f0cf9734 100644 --- a/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseResourceEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseResourceEntity.java @@ -32,4 +32,8 @@ public class TbFuseResourceEntity { * 顺序 */ private String sequence; + /** + * 资源类型 + */ + private String type; } diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/service/TbFuseService.java b/renren-admin/src/main/java/io/renren/modules/fuse/service/TbFuseService.java index bc872ee0..d731cc86 100644 --- a/renren-admin/src/main/java/io/renren/modules/fuse/service/TbFuseService.java +++ b/renren-admin/src/main/java/io/renren/modules/fuse/service/TbFuseService.java @@ -21,6 +21,4 @@ public interface TbFuseService extends CrudService { Integer deleteFuse(Long id); - Integer count(Map params); - } diff --git a/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java index 79204729..99f1d749 100644 --- a/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/fuse/service/impl/TbFuseServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import io.renren.common.constant.Constant; import io.renren.common.page.PageData; import io.renren.common.service.impl.CrudServiceImpl; +import io.renren.common.utils.Result; import io.renren.modules.fuse.dao.TbFuseAttrDao; import io.renren.modules.fuse.dao.TbFuseDao; import io.renren.modules.fuse.dao.TbFuseResourceDao; @@ -16,10 +17,16 @@ import io.renren.modules.fuse.entity.TbFuseAttrEntity; import io.renren.modules.fuse.entity.TbFuseEntity; import io.renren.modules.fuse.entity.TbFuseResourceEntity; import io.renren.modules.fuse.service.TbFuseService; +import io.renren.modules.monitor.mapper.CameraChannelMapper; +import io.renren.modules.resource.dataResource.AbstractDataResourceService; +import io.renren.modules.resource.dataResource.DataResourceFactory; +import io.renren.modules.resource.dto.GetDataResourceListDto; +import io.renren.modules.resource.dto.ResourceDTO; import io.renren.modules.resource.service.ResourceService; import io.renren.modules.resource.service.impl.ResourceServiceImpl; import io.renren.modules.resourceCollection.dao.ResourceCollectionDao; import io.renren.modules.security.user.SecurityUser; +import io.renren.modules.sys.service.SysDeptService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -50,6 +57,10 @@ public class TbFuseServiceImpl extends CrudServiceImpl getWrapper(Map params) { @@ -71,21 +82,6 @@ public class TbFuseServiceImpl extends CrudServiceImpl dtoList = baseDao.getFuseDTOList(params); + Map> dataResourceList=getDataResource(); dtoList.forEach(dto -> { - dto.setFuseResourceList(getFuseResourceByFuseId(dto.getId())); + dto.setFuseResourceList(getFuseResourceByFuseId(dto.getId(), dataResourceList)); dto.setFuseAttrList(getAttrByFuseId(dto.getId())); }); List result = dtoList.stream().skip((curPage - 1) * limit).limit(limit).collect(Collectors.toList()); return new PageData(result, dtoList.size()); } - @Override - public Integer count(Map params) { - if (params != null) { - return baseDao.selectCount(getWrapper(params)); - } else { - return baseDao.selectCount(null); - } - } - @Override public TbFuseDTO getFuseById(Long id) { TbFuseEntity fuseEntity = fuseDao.selectById(id); @@ -141,7 +129,7 @@ public class TbFuseServiceImpl extends CrudServiceImpl getFuseResourceByFuseId(Long fuseId) { + private Map> getDataResource() { + Map> result = new HashMap<>(); + Optional factory = DataResourceFactory.build(); + if (factory.isPresent()) { + GetDataResourceListDto dto = new GetDataResourceListDto().setPageNum(0).setPageSize(30); + Map dataMap = (Map) factory.get().getDataResource(dto); + if (dataMap != null) { + List> list = (List>) dataMap.get("data"); + list.stream().forEach(map -> { + if (map.containsKey("zyname")) { + result.put(map.get("guid").toString(), map); + } else { + result.put(map.get("serviceId").toString(), map); + } + }); + } + } + return result; + } + + private List getFuseResourceByFuseId(Long fuseId, Map> dataResourceMap) { + List result = new ArrayList(); QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("fuse_id", fuseId); List list = fuseResourceDao.selectList(wrapper); - return list.stream().map(attr -> { - TbFuseResourceDTO dto = new TbFuseResourceDTO(); - BeanUtils.copyProperties(attr, dto); - dto.setResource(resourceService.get(dto.getResourceId())); - return dto; - }).collect(Collectors.toList()); + list.stream().collect(Collectors.groupingBy(TbFuseResourceEntity::getType)).forEach((type, value) -> { + if ("组件服务".equals(type)) { + result.addAll(value.stream().map(attr -> { + TbFuseResourceDTO dto = new TbFuseResourceDTO(); + BeanUtils.copyProperties(attr, dto); + ResourceDTO resourceDTO=resourceService.get(dto.getResourceId()); + resourceDTO.setDeptName(sysDeptService.get(resourceDTO.getDeptId()).getName()); + dto.setResource(resourceDTO); + return dto; + }).collect(Collectors.toList())); + } else if ("数据资源".equals(type)) { + result.addAll(value.stream().map(attr -> { + TbFuseResourceDTO dto = new TbFuseResourceDTO(); + BeanUtils.copyProperties(attr, dto); + dto.setResource(dataResourceMap.get(dto.getResourceId())); + return dto; + }).collect(Collectors.toList())); + } else if ("基础设施".equals(type)) { + result.addAll(value.stream().map(attr -> { + TbFuseResourceDTO dto = new TbFuseResourceDTO(); + BeanUtils.copyProperties(attr, dto); + dto.setResource(cameraChannelMapper.selectById(dto.getResourceId().toString())); + return dto; + }).collect(Collectors.toList())); + } + }); + return result; } @Override diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java index 787ce2ad..4cb3304e 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java @@ -551,13 +551,6 @@ public class ResourceController { return new Result().ok(resourceService.selectInfrastructureList()); } - @GetMapping("/list") - @ApiOperation("能力查询") - @LogOperation("能力查询") - public Result list(@ApiIgnore @RequestParam Map params) { - return new Result<>().ok(resourceService.list(params)); - } - @GetMapping("/selectDevelopDoc") @ApiOperation("查询能力开发文档目录") @LogOperation("查询能力开发文档目录") diff --git a/renren-admin/src/main/resources/db/V4.3__fuse_drop_col.sql b/renren-admin/src/main/resources/db/V4.3__fuse_drop_col.sql new file mode 100644 index 00000000..093b48bf --- /dev/null +++ b/renren-admin/src/main/resources/db/V4.3__fuse_drop_col.sql @@ -0,0 +1,10 @@ +ALTER TABLE `tb_fuse` +MODIFY COLUMN `description` varchar(1000) DEFAULT NULL COMMENT '融合服务描述', +DROP COLUMN `dept_user`, +DROP COLUMN `mobile`, +DROP COLUMN `provider`, +DROP COLUMN `provider_user`, +DROP COLUMN `provider_mobile`; + +ALTER TABLE `tb_fuse_resource` +ADD COLUMN `type` varchar(128) NULL COMMENT '资源类型'; \ No newline at end of file diff --git a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml index aa4328e1..44f246cf 100644 --- a/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml +++ b/renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml @@ -38,6 +38,9 @@ and deptId = #{deptId} + + and type = #{type} + and dept_user like concat('%', #{deptUser}, '%') @@ -69,17 +72,4 @@ ORDER BY ${orderField} ${orderType} - - \ No newline at end of file From 4760fa1898f0842609af31ad4bf069f60c03d5bb Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Fri, 29 Jul 2022 17:52:26 +0800 Subject: [PATCH 73/80] .. --- .../monitor/controller/Controller.java | 110 +++++------------- 1 file changed, 27 insertions(+), 83 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java b/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java index 7c1fde10..0ff053d5 100644 --- a/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java +++ b/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java @@ -1,5 +1,6 @@ package io.renren.modules.monitor.controller; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import io.renren.modules.monitor.dto.*; @@ -151,9 +152,7 @@ public class Controller { List list = cameraChannelMapper.selectByChannelCode(channelCode); - Result success = Result.success(list); - - return success; + return Result.success(list); } @@ -170,9 +169,7 @@ public class Controller { List labels = cameraChannelMapper.selectByChannelName(channelName); - Result success = Result.success(labels); - - return success; + return Result.success(labels); } /** @@ -254,8 +251,7 @@ public class Controller { public Result selectAllByGps(Double gpsX,Double gpsY,Integer radius){ double[] around = LongLatUtil.getAround(gpsX, gpsY, radius); List c = cameraChannelMapper.selectAllByGps(around[0], around[2], around[1], around[3]); - Result success = Result.success(c); - return success; + return Result.success(c); } /** @@ -268,9 +264,7 @@ public class Controller { List