diff options
| -rw-r--r-- | cn-admin/src/main/resources/db/R__AZ_sys_menu.sql | 22 | ||||
| -rw-r--r-- | cn-admin/src/main/resources/mapper/entity/EntitySourcesDao.xml | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/cn-admin/src/main/resources/db/R__AZ_sys_menu.sql b/cn-admin/src/main/resources/db/R__AZ_sys_menu.sql index 37d4377..f26187b 100644 --- a/cn-admin/src/main/resources/db/R__AZ_sys_menu.sql +++ b/cn-admin/src/main/resources/db/R__AZ_sys_menu.sql @@ -42,7 +42,7 @@ INSERT INTO `sys_menu` VALUES (15, 'Report', 'report', 'overall.report', 0, NULL INSERT INTO `sys_menu` VALUES (16, 'Create report', 'createReport', 'overall.create', 15, 'report:job:add,report:temp:add', 2, '', '', NULL, 1, 1); INSERT INTO `sys_menu` VALUES (17, 'Edit report', 'editReport', 'overall.edit', 15, 'report:job:update,report:temp:update', 2, '', '', NULL, 11, 1); INSERT INTO `sys_menu` VALUES (18, 'Delete report', 'deleteReport', 'overall.delete', 15, 'report:job:delete,report:temp:delete', 2, '', '', NULL, 21, 1); -INSERT INTO `sys_menu` VALUES (19, 'Knowledge base', 'knowledgeBase', 'overall.knowledgeBase', 39, NULL, 1, '/system/knowledgeBase', 'cn-icon cn-icon-knowledge-base', NULL, 11, 1); +INSERT INTO `sys_menu` VALUES (19, 'Knowledge base', 'knowledgeBase', 'overall.knowledgeBase', 46, NULL, 1, '/system/knowledgeBase', 'cn-icon cn-icon-knowledge-base', NULL, 21, 1); INSERT INTO `sys_menu` VALUES (20, 'Edit built-in knowledge base', 'editBuiltInKnowledgeBase', 'overall.edit', 19, 'knowledge:base:add', 2, '', '', NULL, 1, 1); INSERT INTO `sys_menu` VALUES (21, 'Tag', 'tag', 'overall.tag', 0, NULL, 1, '/tag', 'cn-icon cn-icon-tag-fill', NULL, 36, 1); INSERT INTO `sys_menu` VALUES (22, 'Create tag', 'createTag', 'overall.create', 21, 'knowledge:base:add', 1, '/tag/create', '', NULL, 1, 1); @@ -62,22 +62,22 @@ INSERT INTO `sys_menu` VALUES (35, 'Appearance', 'appearance', 'appearance.appea INSERT INTO `sys_menu` VALUES (36, 'Edit appearence', 'editAppearence', 'overall.edit', 35, 'sys:config:update', 2, '', '', NULL, 1, 1); INSERT INTO `sys_menu` VALUES (37, 'I18n', 'I18N', 'I18N', 0, NULL, 1, '/i18n', 'cn-icon cn-icon-i18n', NULL, 91, 1); INSERT INTO `sys_menu` VALUES (38, 'Link monitor', 'linkMonitor', 'overall.linkMonitor', 1, NULL, 1, '/panel/linkMonitor', '', NULL, 31, 1); -INSERT INTO `sys_menu` VALUES (39, 'System', 'system', 'overall.system', 0, NULL, 1, 'redirect:/system', 'cn-icon cn-icon-system', NULL, 61, 1); -INSERT INTO `sys_menu` VALUES (40, 'Plugin', 'plugin', 'plugin.pluginManagement', 39, NULL, 1, '/system/plugin', 'cn-icon cn-icon-plugin', NULL, 1, 1); +INSERT INTO `sys_menu` VALUES (39, 'System', 'system', 'overall.system', 0, NULL, 1, 'redirect:/system', 'cn-icon cn-icon-system', NULL, 61, 0); +INSERT INTO `sys_menu` VALUES (40, 'Plugin', 'plugin', 'plugin.pluginManagement', 46, NULL, 1, '/system/plugin', 'cn-icon cn-icon-plugin', NULL, 31, 1); INSERT INTO `sys_menu` VALUES (41, 'License', 'license', 'overall.license', 25, NULL, 1, '/administration/license', 'cn-icon cn-icon-license', NULL, 26, 1); INSERT INTO `sys_menu` VALUES (42, 'Edit license', 'editLicense', 'overall.edit', 41, NULL, 2, '', '', NULL, 1, 1); INSERT INTO `sys_menu` VALUES (43, 'Location Intelligence', 'locationIntelligence', 'overall.locationIntelligence', 0, '', 1, 'redirect:/location', '', NULL, 2, 1); INSERT INTO `sys_menu` VALUES (44, 'Location Map', 'locationMap', 'location.locationMap', 43, '', 1, '/location/map', '', NULL, 1, 1); INSERT INTO `sys_menu` VALUES (45, 'Trace Tracking', 'traceTracking', 'location.traceTracking', 43, '', 1, '/location/tracking', '', NULL, 11, 1); INSERT INTO `sys_menu` VALUES (46, 'Setting', 'setting', 'overall.setting', 0, '', 1, '/setting', 'cn-icon cn-icon-system', NULL, 71, 1); -INSERT INTO `sys_menu` VALUES (47, 'Source', 'source', 'setting.source', 46, '', 1, '/setting/source', '', NULL, 1, 1); -INSERT INTO `sys_menu` VALUES (48, 'Entity setting', 'entitySetting', 'overall.entitySetting', 46, '', 1, '/setting/entitySetting', '', NULL, 11, 1); -INSERT INTO `sys_menu` VALUES (49, 'Create source', 'createSource', 'overall.create', 47, '', 1, '/setting/source/create', '', NULL, 1, 1); -INSERT INTO `sys_menu` VALUES (50, 'Edit source', 'editSource', 'overall.edit', 47, '', 1, '/setting/source/edit', '', NULL, 2, 1); -INSERT INTO `sys_menu` VALUES (51, 'Delete source', 'deleteSource', 'overall.delete', 47, '', 2, '', '', NULL, 1, 1); -INSERT INTO `sys_menu` VALUES (52, 'Create entity settting', 'createEntitySetting', 'overall.create', 48, '', 1, '/setting/entitySetting/create', '', NULL, 1, 1); -INSERT INTO `sys_menu` VALUES (53, 'Edit entity setting', 'editEntitySetting', 'overall.edit', 48, '', 1, '/setting/entitySetting/edit', '', NULL, 1, 1); -INSERT INTO `sys_menu` VALUES (54, 'Delete entity setting', 'deleteEntitySetting', 'overall.delete', 48, '', 2, '', '', NULL, 1, 1); +INSERT INTO `sys_menu` VALUES (47, 'Data Source', 'dataSource', 'setting.source', 46, '', 1, '/setting/dataSource', '', NULL, 1, 1); +INSERT INTO `sys_menu` VALUES (48, 'Entity Integration', 'entityIntegration', 'overall.entitySetting', 46, '', 1, '/setting/entityIntegration', '', NULL, 11, 1); +INSERT INTO `sys_menu` VALUES (49, 'Create source', 'createDataSource', 'overall.create', 47, '', 1, '/setting/dataSource/create', '', NULL, 1, 1); +INSERT INTO `sys_menu` VALUES (50, 'Edit source', 'editDataSource', 'overall.edit', 47, '', 1, '/setting/dataSource/edit', '', NULL, 2, 1); +INSERT INTO `sys_menu` VALUES (51, 'Delete source', 'deleteDataSource', 'overall.delete', 47, '', 2, '', '', NULL, 1, 1); +INSERT INTO `sys_menu` VALUES (52, 'Create entity settting', 'createEntityIntegration', 'overall.create', 48, '', 1, '/setting/entityIntegration/create', '', NULL, 1, 1); +INSERT INTO `sys_menu` VALUES (53, 'Edit entity setting', 'editEntityIntegration', 'overall.edit', 48, '', 1, '/setting/entityIntegration/edit', '', NULL, 1, 1); +INSERT INTO `sys_menu` VALUES (54, 'Delete entity setting', 'deleteEntityIntegration', 'overall.delete', 48, '', 2, '', '', NULL, 1, 1); INSERT INTO `sys_menu` VALUES (55, 'View data source', 'viewDataSource', 'overall.detail', 47, '', 1, '/setting/source/view', '', NULL, 2, 1); INSERT INTO `sys_menu` VALUES (56, 'Edit entity', 'editEntity', 'overall.edit', 5, '', 2, '', '', NULL, 1, 1); INSERT INTO `sys_menu` VALUES (57, 'View entity setting', 'viewEntityIntegration', 'overall.view', 48, '', 1, '/setting/entityIntegration/view', '', NULL, 1, 1); diff --git a/cn-admin/src/main/resources/mapper/entity/EntitySourcesDao.xml b/cn-admin/src/main/resources/mapper/entity/EntitySourcesDao.xml index 6d86f18..d3538a4 100644 --- a/cn-admin/src/main/resources/mapper/entity/EntitySourcesDao.xml +++ b/cn-admin/src/main/resources/mapper/entity/EntitySourcesDao.xml @@ -17,9 +17,9 @@ </resultMap> <select id="queryPage" resultMap="entitySources"> select es.*, - count(ep.id) as `usage` + count(ei.id) as `usage` from entity_sources es - left join entity_profiles ep on es.id = ep.source_id + left join entity_integrations ei on es.id = ei.source_id <where> <if test="param.name !=null and param.name !=''"> and name like concat ( '%', #{param.name}, '%') |