From b23bc4d88ed6215fdda94dc94a15dd62e9f4a5cc Mon Sep 17 00:00:00 2001
From: guonan <guonan201020@163.com>
Date: 星期四, 12 六月 2025 11:59:10 +0800
Subject: [PATCH] 北京市隐患点和监测设备修改

---
 src/api/hpApi.js |  177 ++++++++++++++++++++++++----------------------------------
 1 files changed, 74 insertions(+), 103 deletions(-)

diff --git a/src/api/hpApi.js b/src/api/hpApi.js
index d397817..9d0e86f 100644
--- a/src/api/hpApi.js
+++ b/src/api/hpApi.js
@@ -39,6 +39,7 @@
   console.log("getSafeLocation:", response);
   return response.data;
 }
+
 // 鑾峰彇閬块櫓绾胯矾
 export async function getEscapeRoute(data) {
   const response = await axios.post("/hp/escapeRoute/getData", {
@@ -49,6 +50,7 @@
   console.log("getEscapeRoute:", response);
   return response.data;
 }
+
 // 鑾峰彇浼犳劅鍣ㄥ垪琛�
 export async function getSensor(data) {
   const response = await axios.post("/hp/sensor/getData", {
@@ -59,6 +61,7 @@
   console.log("getSensor:", response);
   return response.data;
 }
+
 // 鑾峰彇闆ㄩ噺鏁版嵁
 export async function getRainfallData() {
   const response = await axios.post("/hp/rainfallCountyCity/getData", {
@@ -69,62 +72,36 @@
   return response.data;
 }
 
-// 鑾峰彇鐞夌拑搴欓晣鐩戞祴璁惧淇℃伅
-export async function getDeviceInfoShg(data) {
-  const response = await axios.post("/hp/deviceInfo/getData", {
-    filterObject: {
-      "dictDeviceType": data,
-      "townCode": "110116110000"
-    },
-    "pageSize": 10000
+// 鎸夌収鍖椾含甯俢ode鏌ヨ琛屾斂鍖篶ode
+export async function getAeraCode() {
+  const response = await axios.post("/hp/sinoDzHiddenDangerPoint/getHiddenDangerCountByDistrict", {
+    "dictDisasterGrade": "",
+    "dictDisasterType": "",
+    "dictRiskLevel": "",
+    "districtCode": "110000000000",
+    "dictThreatObj": "",
+    "year": "2025"
   });
   return response.data;
 }
 
-// 鑾峰彇鍖椾含甯傜洃娴嬭澶囦俊鎭�
-export async function getDeviceInfo(data) {
-  const response = await axios.post("/hp/deviceInfo/getData", {
-
-    "currentPage": 1,
-    "pageSize": 10000,
-    "filterObject": {
-      "belongObjList": [
-        "1797461961110261762"
-      ],
-      "townCode": data
-      // "id": "",
-      // "deviceName": "",
-      // "deviceCode": "",
-      // "deviceClientId": "",
-      // "dictDeviceType": "",
-      // "hdName": "",
-      // "installUnit": "",
-      // "rtuUnit": "",
-      // "dictDisasterType": "",
-      // "dictCommunicationType": "",
-      // "dictDeviceStatus": "",
-      // "divisionDistrict": "",
-    },
-    "sortedList": [
-      {
-        "sorted": "createTime",
-        "type": "desc"
-      }
-    ]
-  })
-
+// 鎸夌収琛屾斂鍖篶ode鏌ヨ涔¢晣code
+export async function getAeraTownCode(data) {
+  const response = await axios.post("/hp/sinoDzHiddenDangerPoint/getHiddenDangerTownCount", {
+    "dictDisasterGrade": "",
+    "dictDisasterType": "",
+    "dictRiskLevel": "",
+    "districtCode": data,
+    "dictThreatObj": "",
+    "year": "2025"
+  });
   return response.data;
 }
 
-
-// 鑾峰彇闅愭偅鐐逛俊鎭�
+// 鏍规嵁涔¢晣Code鑾峰彇闅愭偅鐐�
 export async function getDangerPoint(data) {
-
   const response = await axios.post("/hp/sinoDzHiddenDangerPoint/getData", {
-
     filterObject: {
-      // divisionCounty鍏跺疄鍙互涓嶄紶
-      // "divisionCounty": divisionCounty,
       "divisionTown": data,
       "year": 2025
     },
@@ -133,44 +110,57 @@
   return response.data;
 }
 
-// export async function fetchAndLoadDangerPoints(loadCallback) {
-//   let currentPage = 1;
-//   const pageSize = 100; // 姣忔璇锋眰鐨勬暟鎹噺
 
-//   while (true) {
-//     try {
-//       const response = await axios.post("/hp/sinoDzHiddenDangerPoint/getData", {
-//         filterObject: {
-//           divisionCounty: "110111000000",
-//           divisionTown: null,
-//           year: 2025
-//         },
-//         pageSize: pageSize,
-//         currentPage: currentPage // 娣诲姞褰撳墠椤电爜鍙傛暟
-//       });
+// 鍒嗛〉鑾峰彇琛屾斂鍖哄垝闅愭偅鐐逛俊鎭�
+export async function getDangerPointByPage(data, pageNum) {
+  const response = await axios.post("/hp/sinoDzHiddenDangerPoint/getData", {
+    filterObject: {
+      "divisionCounty": data,
+      "year": 2025
+    },
+    "pageSize": 50,
+    "pageNum": pageNum,
+  });
+  return response.data;
+}
 
-//       const pageData = response.data?.data?.pageData;
 
-//       if (!Array.isArray(pageData)) {
-//         console.error("Expected an array in 'pageData', but got:", typeof pageData, pageData);
-//         break;
-//       }
+// 鐩戞祴璁惧鎺ュ彛
+/**
+ * 妫�鏌ユ椂闂村垪鏄惁鎸夊崌搴忔帓鍒�
+ * @param {string} data - 闆ㄩ噺璁¤澶囩被鍨媔d
+ * @param {string} townCode - 涔¢晣code,鍙互鏌ヨ涔¢晣鐩戞祴璁惧淇℃伅
+ */
+export async function getDeviceInfo(data, townCode) {
+  const response = await axios.post("/hp/deviceInfo/getData", {
+    filterObject: {
+      "dictDeviceType": data,
+      "townCode": townCode,
+      // 鎵�灞為」鐩�
+      // "belongObjList": [
+      //   "1797461961110261762"
+      // ],
+    },
+    "pageSize": 10000
+  });
+  return response.data;
+}
 
-//       if (pageData.length === 0) break; // 娌℃湁鏇村鏁版嵁浜�
-
-//       // 璋冪敤浼犲叆鐨勫洖璋冨嚱鏁帮紝鐢ㄤ簬鏇存柊椤甸潰鍐呭
-//       loadCallback(pageData);
-
-//       if (pageData.length < pageSize) break; // 濡傛灉鏈杩斿洖鐨勬暟鎹皯浜巔ageSize锛岃鏄庡凡鑾峰彇瀹屾墍鏈夋暟鎹�
-
-//       currentPage++; // 鏇存柊涓嬩竴椤电殑椤电爜
-//     } catch (error) {
-//       console.error("Error fetching danger points:", error);
-//       break;
-//     }
-//   }
-// }
-
+// 鍒嗛〉鏌ヨ琛屾斂鍖哄垝鐩戞祴璁惧淇℃伅
+export async function getDeviceInfoByPage(data, pageNum) {
+  const response = await axios.post("/hp/deviceInfo/getData", {
+    filterObject: {
+      "divisionDistrict": data,
+      // 鎵�灞為」鐩�
+      "belongObjList": [
+        "1797461961110261762"
+      ],
+    },
+    "pageSize": 50,
+    "pageNum": pageNum
+  });
+  return response.data;
+}
 
 
 // 鏍规嵁骞翠唤鑾峰彇闆ㄩ噺鏁版嵁
@@ -181,7 +171,6 @@
     },
     "pageSize": 1000
   });
-  console.log("getRainfallData:", response);
   return response.data;
 }
 
@@ -219,28 +208,10 @@
   return response.data;
 }
 
-// 鎸夌収鍖椾含甯俢ode鏌ヨ琛屾斂鍖篶ode
-export async function getAeraCode() {
-  const response = await axios.post("/hp/sinoDzHiddenDangerPoint/getHiddenDangerCountByDistrict", {
-    "dictDisasterGrade": "",
-    "dictDisasterType": "",
-    "dictRiskLevel": "",
-    "districtCode": "110000000000",
-    "dictThreatObj": "",
-    "year": "2025"
-  });
-  return response.data;
-}
 
-// 鎸夌収琛屾斂鍖篶ode鏌ヨ涔¢晣code
-export async function getAeraTownCode(data) {
-  const response = await axios.post("/hp/sinoDzHiddenDangerPoint/getHiddenDangerTownCount", {
-    "dictDisasterGrade": "",
-    "dictDisasterType": "",
-    "dictRiskLevel": "",
-    "districtCode": data,
-    "dictThreatObj": "",
-    "year": "2025"
-  });
+
+// 鏌ヨ鍖椾含甯傜洃娴嬭澶囩殑鏁伴噺
+export async function getDeviceCount() {
+  const response = await axios.get("/hp/device/statisticsCountyByDeviceType");
   return response.data;
 }
\ No newline at end of file

--
Gitblit v1.9.3