123

ruoyi-screen/.env.development

@@ -21,7 +21,7 @@ VITE_GIS_ACCESS_TOKEN=8XughK9JVapV1pqaE7HnxfHiKGrLy21L9LbsKskL
 VITE_GIS_WMTS_LAYER=baqing_wp
 # 瓦片边长：256 
 VITE_GIS_TILE_SIZE=256
-VITE_GIS_DEFAULT_CENTER=94.046223,31.920382
+VITE_GIS_DEFAULT_CENTER=94.054094,31.920244
 VITE_GIS_DEFAULT_ZOOM=14
 VITE_GIS_MIN_ZOOM=7
 # 地图最大缩放；建议与瓦片最高级别一致，避免放到顶过采样缺图

ruoyi-screen/.env.production

@@ -20,7 +20,7 @@ VITE_GIS_BASE_URL=https://bqxm.alafarms.com/agis-api
 VITE_GIS_ACCESS_TOKEN=8XughK9JVapV1pqaE7HnxfHiKGrLy21L9LbsKskL
 VITE_GIS_WMTS_LAYER=baqing_wp
 VITE_GIS_TILE_SIZE=256
-VITE_GIS_DEFAULT_CENTER=94.046223,31.920382
+VITE_GIS_DEFAULT_CENTER=94.052462,31.921188
 VITE_GIS_DEFAULT_ZOOM=14
 VITE_GIS_MIN_ZOOM=7
 VITE_GIS_MAX_ZOOM=20

ruoyi-screen/src/api/weather.js

@@ -1,6 +1,6 @@
 import axios from 'axios'
 
-const WEATHER_API_URL = 'http://gfeljm.tianqiapi.com/api'
+const WEATHER_API_URL = 'https://gfeljm.tianqiapi.com/api'
 
 /** 将 win_meter（如 10km/h）转为 m/s 展示 */
 export function parseWinMeterToMs(winMeter) {

ruoyi-screen/src/components/GisMap.vue

@@ -47,8 +47,6 @@ const containerRef = ref(null)
 
 let map = null
 let cmmapglRef = null
-let zoomLogTimer = null
-let lastMouseZoomLogAt = 0
 let clampingZoom = false
 let unbindWheelZoom = null
 
@@ -61,62 +59,30 @@ let wheelDebounceTimer = null
 let lastWheelAround = null
 let poiMarkers = []
 
-function formatLngLat(lngLat) {
+function logClickCoordinate(lngLat) {
   if (!lngLat) {
-    return '—'
+    return
   }
   const lng = Number(lngLat.lng ?? lngLat[0])
   const lat = Number(lngLat.lat ?? lngLat[1])
   if (!Number.isFinite(lng) || !Number.isFinite(lat)) {
-    return '—'
-  }
-  return `[${lng.toFixed(6)}, ${lat.toFixed(6)}]`
-}
-
-function logMapState(source, cursorLngLat) {
-  if (!map || typeof map.getZoom !== 'function') {
     return
   }
-  const z = map.getZoom()
-  const zoomText = Number.isFinite(z) ? z.toFixed(2) : String(z)
-  const center = typeof map.getCenter === 'function' ? map.getCenter() : null
-  const parts = [
-    `[GIS] ${source}`,
-    `zoom: ${zoomText}`,
-    `center: ${formatLngLat(center)}`
-  ]
-  if (cursorLngLat) {
-    parts.push(`point: ${formatLngLat(cursorLngLat)}`)
-  }
-  console.log(parts.join(' | '))
+  console.log(
+    `[GIS] click | lng: ${lng.toFixed(6)}, lat: ${lat.toFixed(6)} | [${lng.toFixed(6)}, ${lat.toFixed(6)}]`
+  )
 }
 
-function bindZoomDebugListeners() {
+function bindMapListeners() {
   if (!map) {
     return
   }
-  map.on('load', () => logMapState('load'))
   map.on('zoomend', () => {
     snapZoomToLimits()
-    logMapState('zoomend')
-  })
-  map.on('moveend', () => logMapState('moveend'))
-  map.on('wheel', () => {
-    if (zoomLogTimer) {
-      clearTimeout(zoomLogTimer)
-    }
-    zoomLogTimer = setTimeout(() => logMapState('wheel'), 80)
-  })
-  map.on('mousemove', (e) => {
-    const now = Date.now()
-    if (now - lastMouseZoomLogAt < 300) {
-      return
-    }
-    lastMouseZoomLogAt = now
-    logMapState('mousemove', e.lngLat)
   })
   map.on('click', (e) => {
-    logMapState('click', e.lngLat)
+    logClickCoordinate(e.lngLat)
+    emit('click', e)
   })
 }
 
@@ -172,20 +138,16 @@ function createPoiMarkerElement(name) {
   return wrap
 }
 
-async function renderNearbyPoiMarkers() {
+async function renderPoiMarkers() {
   if (!props.showPoiMarkers || !map || !cmmapglRef) {
     return
   }
   clearPoiMarkers()
 
-  const center = resolveCenter()
   let pois = []
   try {
     pois = await searchNearbyPois({
-      center,
-      radius: 5000,
-      pageSize: 50,
-      pageNum: 1
+      center: resolveCenter()
     })
   } catch {
     return
@@ -220,17 +182,12 @@ async function renderNearbyPoiMarkers() {
 }
 
 function destroyMap() {
-  if (zoomLogTimer) {
-    clearTimeout(zoomLogTimer)
-    zoomLogTimer = null
-  }
   if (typeof unbindWheelZoom === 'function') {
     unbindWheelZoom()
     unbindWheelZoom = null
   }
   wheelDeltaAccum = 0
   lastWheelAround = null
-  lastMouseZoomLogAt = 0
   clampingZoom = false
   clearPoiMarkers()
   if (map) {
@@ -461,7 +418,7 @@ async function initMap() {
     if (props.showScale) {
       map.addControl(new cmmapgl.ScaleControl({ unit: 'metric' }), 'bottom-left')
     }
-    bindZoomDebugListeners()
+    bindMapListeners()
     bindZoomClampListener()
     unbindWheelZoom = bindDebouncedWheelZoom()
     configureScrollZoom()
@@ -470,10 +427,9 @@ async function initMap() {
       configureScrollZoom()
       snapZoomToLimits()
       resizeMap()
-      renderNearbyPoiMarkers()
+      renderPoiMarkers()
       emit('ready', map)
     })
-    map.on('click', (e) => emit('click', e))
     // 瓦片/遥测等非致命错误不向页面报错
     map.on('error', () => {})
   } catch {
@@ -490,7 +446,7 @@ watch(
       zoom: resolveZoom()
     })
     if (props.showPoiMarkers) {
-      renderNearbyPoiMarkers()
+      renderPoiMarkers()
     }
   },
   { deep: true }
@@ -501,7 +457,7 @@ watch(
   (show) => {
     if (!map || !cmmapglRef) return
     if (show) {
-      renderNearbyPoiMarkers()
+      renderPoiMarkers()
     } else {
       clearPoiMarkers()
     }

ruoyi-screen/src/utils/gisPoiSearch.js

@@ -18,6 +18,15 @@ export function parsePoiLngLat(location) {
   return [lng, lat]
 }
 
+function normalizePoiList(data) {
+  if (data?.status !== POI_STATUS_OK || !Array.isArray(data?.body?.pois)) {
+    return []
+  }
+  return data.body.pois
+    .map((row) => row?.poi || row)
+    .filter((poi) => poi && typeof poi === 'object')
+}
+
 /**
  * 周边搜索（GIS 接口文档 §2.2 /agis/search/v1/pois/region）
  * @param {{ center?: [number, number], radius?: number, pageNum?: number, pageSize?: number }} [options]
@@ -31,9 +40,9 @@ export async function searchNearbyPois(options = {}) {
 
   const center = options.center || getGisDefaultCenter()
   const [longitude, latitude] = center
-  const radius = options.radius ?? 3000
+  const radius = options.radius ?? 5000
   const pageNum = options.pageNum ?? 1
-  const pageSize = options.pageSize ?? 20
+  const pageSize = options.pageSize ?? 1000
 
   const params = new URLSearchParams({
     longitude: String(longitude),
@@ -50,12 +59,13 @@ export async function searchNearbyPois(options = {}) {
     return []
   }
 
-  const data = await res.json()
-  if (data?.status !== POI_STATUS_OK || !Array.isArray(data?.body?.pois)) {
-    return []
-  }
-
-  return data.body.pois
-    .map((row) => row?.poi || row)
-    .filter((poi) => poi && typeof poi === 'object')
+  return normalizePoiList(await res.json())
 }
+
+/*
+ * 多边形区域搜索（GIS 接口文档 §2.3）— 暂不使用
+ *
+ * export const BA_QING_POI_POLYGON = [...]
+ * export function formatPolygonParam(points) { ... }
+ * export async function searchPolygonPois(options = {}) { ... }
+ */

scripts/parse-gis-api-doc.mjs

@@ -18,7 +18,7 @@ function strip(chunk) {
 }
 
 const text = strip(x)
-const keys = ['周边', '2.2', 'longitude', 'latitude', 'radius', 'page_size', 'pageSize', 'POI', '搜索', 'nearby', 'agis']
+const keys = ['多边形', 'polygon', '周边', '2.2', '2.3', 'longitude', 'latitude', 'radius', 'page_size', 'pageSize', 'POI', '搜索', 'nearby', 'agis/pois']
 
 for (const k of keys) {
   const i = text.indexOf(k)