From e01248731a3a634a9c50ed9d541a0a78d3c5ba48 Mon Sep 17 00:00:00 2001 From: ctw <1051735452@qq.com> Date: Fri, 16 Jan 2026 13:12:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=80=89=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 7 + .../web/controller/MissionScenarioController.java | 2 +- .../web/controller/PlatformLibController.java | 2 +- .../com/ruoyi/web/controller/RoomsController.java | 2 +- .../com/ruoyi/web/controller/RoutesController.java | 2 +- .../com/ruoyi/web/controller/UsersController.java | 2 +- ruoyi-admin/src/main/resources/application.yml | 8 + .../framework/web/service/SysLoginService.java | 4 +- .../web/service/UserDetailsServiceImpl.java | 2 + ruoyi-ui/src/permission.js | 3 +- ruoyi-ui/src/views/cesiumMap/index.vue | 36 +- ruoyi-ui/src/views/login.vue | 156 ++-- ruoyi-ui/src/views/selectRoom/index.vue | 989 ++++++++++++++++++++- 13 files changed, 1082 insertions(+), 133 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 4d4f3a5..a4ff47b 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -43,6 +43,13 @@ mysql-connector-java + + + org.xerial + sqlite-jdbc + 3.42.0.0 + + com.ruoyi diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/MissionScenarioController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/MissionScenarioController.java index 53ef6ce..c627339 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/MissionScenarioController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/MissionScenarioController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.ruoyi.web.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java index 13f25e7..f69aa6d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PlatformLibController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.ruoyi.web.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomsController.java index db80e07..81230b0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoomsController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.ruoyi.web.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java index f81fdb5..15ee0d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RoutesController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.ruoyi.web.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/UsersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/UsersController.java index 8633aa1..bc53412 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/UsersController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/UsersController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.ruoyi.web.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 9d12da3..3fc7bbf 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -134,3 +134,11 @@ xss: excludes: /system/notice # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/* + +# MBTiles配置 +mbtiles: + # MBTiles文件路径 + # 支持绝对路径,例如:D:/ruoyi/uploadPath/mbtiles/osm-2020-02-10-v3.11_asia_china.mbtiles + # 或者相对路径(相对于profile目录),例如:mbtiles/osm-2020-02-10-v3.11_asia_china.mbtiles + # 如果不配置,默认使用:{profile}/mbtiles/osm-2020-02-10-v3.11_asia_china.mbtiles + path: D:/ruoyi/uploadPath/mbtiles/osm-2020-02-10-v3.11_asia_china.mbtiles \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index aed7f86..d8d7a83 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -63,9 +63,9 @@ public class SysLoginService public String login(String username, String password, String code, String uuid) { // 验证码校验 - validateCaptcha(username, code, uuid); + //validateCaptcha(username, code, uuid); // 登录前置校验 - loginPreCheck(username, password); + //loginPreCheck(username, password); // 用户验证 Authentication authentication = null; try diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java index 5dcdf90..a93e2a1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java @@ -34,6 +34,8 @@ public class UserDetailsServiceImpl implements UserDetailsService @Autowired private SysPermissionService permissionService; + + @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js index b66190b..6eac895 100644 --- a/ruoyi-ui/src/permission.js +++ b/ruoyi-ui/src/permission.js @@ -9,8 +9,7 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/register'] - +const whiteList = ['/login', '/register', '/selectRoom', '/childRoom'] const isWhiteList = (path) => { return whiteList.some(pattern => isPathMatch(pattern, path)) } diff --git a/ruoyi-ui/src/views/cesiumMap/index.vue b/ruoyi-ui/src/views/cesiumMap/index.vue index 125fde5..31c43b9 100644 --- a/ruoyi-ui/src/views/cesiumMap/index.vue +++ b/ruoyi-ui/src/views/cesiumMap/index.vue @@ -341,21 +341,45 @@ export default { this.viewer.imageryLayers.removeAll() try { - const offlineProvider = new Cesium.UrlTemplateImageryProvider({ - url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', + // 使用本地MBTiles服务 + // 获取API基础路径,如果未配置则使用相对路径 + const baseApi = process.env.VUE_APP_BASE_API || '/dev-api' + const mbtilesUrl = baseApi.replace(/\/$/, '') + '/api/mbtiles/tile/{z}/{x}/{y}' + + console.log('加载MBTiles地图,服务地址:', mbtilesUrl) + + const mbtilesProvider = new Cesium.UrlTemplateImageryProvider({ + url: mbtilesUrl, minimumLevel: 0, maximumLevel: 18, tileWidth: 256, tileHeight: 256, tilingScheme: new Cesium.WebMercatorTilingScheme(), - credit: '离线地图' + credit: 'MBTiles离线地图' }) - this.viewer.imageryLayers.addImageryProvider(offlineProvider) + this.viewer.imageryLayers.addImageryProvider(mbtilesProvider) + console.log('MBTiles地图加载成功') } catch (error) { - console.error('加载离线地图失败:', error) - this.showGridLayer() + console.error('加载MBTiles地图失败:', error) + // 如果MBTiles加载失败,尝试使用原来的在线地图作为备用 + try { + const offlineProvider = new Cesium.UrlTemplateImageryProvider({ + url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', + minimumLevel: 0, + maximumLevel: 18, + tileWidth: 256, + tileHeight: 256, + tilingScheme: new Cesium.WebMercatorTilingScheme(), + credit: '备用在线地图' + }) + this.viewer.imageryLayers.addImageryProvider(offlineProvider) + console.warn('已切换到备用在线地图') + } catch (fallbackError) { + console.error('备用地图也加载失败:', fallbackError) + this.showGridLayer() + } } }, diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 1abc839..f51e315 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -1,7 +1,8 @@ - {{title}} + 联合任务筹划系统 + + - - - - - - - - + 记住密码 + 登 录 登 录 中... - - 立即注册 - - - - - + +// 删除了 .login-code 和 .el-login-footer 的样式 + \ No newline at end of file diff --git a/ruoyi-ui/src/views/selectRoom/index.vue b/ruoyi-ui/src/views/selectRoom/index.vue index 2ee640a..e4bd99f 100644 --- a/ruoyi-ui/src/views/selectRoom/index.vue +++ b/ruoyi-ui/src/views/selectRoom/index.vue @@ -1,28 +1,993 @@ - - 跳转 - 返回首页 + + + + + + + + + + + 房间选择 + 选择或创建您要加入的协作房间 + + + + + + + + + + + + + + {{ room.name }} + {{ getChildRooms(room.id).length }} 个子房间 + + + + + + + + + + + + + + + + + + + + + + + + {{ childRoom.name }} + + + + + + + + + + + + + + + 暂无房间 + 点击下方按钮创建您的第一个房间 + + + + + + + 新增大房间 + + + 进入房间 + + + + + + + + + + + + + 修改房间 + + + + 删除房间 + + + + + + + + {{ dialog.mode === 'add' ? '新增房间' : '修改房间' }} + + + + + + + 房间名称 + + + + + + + + +
选择或创建您要加入的协作房间
{{ getChildRooms(room.id).length }} 个子房间
点击下方按钮创建您的第一个房间