重构风险点隐患点显示逻辑

src/api/api.ts

@@ -1,8 +1,10 @@
 import type { DisasterType } from '@/types/common/DisasterType'
 import { getSm2PublicKey } from './crypto'
-import { getBasePoins, getPointDetailById } from './hidden-danger-spots'
+import { getBasePoins as getHiddenDangerBasePoints, getPointDetailById as getHiddenDangerPointDetailById} from './hidden-danger-spots'
+import { getBasePoins as getRiskBasePoints, getPointDetailById as getRiskPointDetailById} from './risk-spots'
 import type { ApiResponse } from '@/types/ApiResponse'
 import type { XianHiddenDangerSpots } from '@/types/base/XianHiddenDangerSpots'
+import type { XianRiskSpots } from '@/types/base/XianRiskSpots'
 
 export const $api = {
 
@@ -15,9 +17,18 @@ export const $api = {
   // 隐患点信息
   hiddenDangerSpots: {
     // 获取所有基础隐患点
-    getBasePoins: (disasterType: DisasterType): Promise<ApiResponse<XianHiddenDangerSpots[]>> => getBasePoins(disasterType),
+    getBasePoins: (disasterType: DisasterType): Promise<ApiResponse<XianHiddenDangerSpots[]>> => getHiddenDangerBasePoints(disasterType),
 
     // 根据id获取隐患点详情
-    getPointDetailById: (id: number): Promise<ApiResponse<XianHiddenDangerSpots>> => getPointDetailById(id),
+    getPointDetailById: (id: number): Promise<ApiResponse<XianHiddenDangerSpots>> => getHiddenDangerPointDetailById(id),
+  },
+
+  // 风险点信息
+  riskSpots: {
+    // 获取所有基础风险点
+    getBasePoins: (): Promise<ApiResponse<XianRiskSpots[]>> => getRiskBasePoints(),
+
+    // 根据id获取风险点详情
+    getPointDetailById: (id: number): Promise<ApiResponse<XianRiskSpots>> => getRiskPointDetailById(id),
   },
 }

src/api/hidden-danger-spots.ts

@@ -4,7 +4,7 @@ import type { DisasterType } from "@/types/common/DisasterType"
 import httpInstance from "@/utils/request/http"
 
 /**
- * 获取隐藏危险点数据
+ * 获取隐患点数据
  * @param disasterType 灾害类型
  * @returns 隐患点数据
  */
@@ -18,7 +18,7 @@ export const getBasePoins = (disasterType: DisasterType): Promise<ApiResponse<Xi
 
 /**
  * 根据id获取隐患点详情
- * @param id 隐藏危险点id
+ * @param id 隐患点id
  * @returns 隐患点详情
  */
 export const getPointDetailById = (id: number): Promise<ApiResponse<XianHiddenDangerSpots>> => {

src/api/risk-spots.ts

@@ -0,0 +1,20 @@
+import type { ApiResponse } from "@/types/ApiResponse"
+import type { XianRiskSpots } from "@/types/base/XianRiskSpots"
+import httpInstance from "@/utils/request/http"
+
+/**
+ * 获取风险点数据
+ * @returns 风险点数据
+ */
+export const getBasePoins = (): Promise<ApiResponse<XianRiskSpots[]>> => {
+    return httpInstance.get('/risk-spots/base-points')
+}
+
+/**
+ * 根据id获取风险点详情
+ * @param id 风险点id
+ * @returns 风险点详情
+ */
+export const getPointDetailById = (id: number): Promise<ApiResponse<XianRiskSpots>> => {
+    return httpInstance.get(`/risk-spots/point-detail/${id}`)
+}