koishi-plugin-jscn-aaaquery 1.0.18 → 1.0.20

package/lib/index.js

@@ -42,7 +42,7 @@ function evaluateOpticalPower(power) {
   if (isNaN(powerValue)) {
     return "";
   }
-  if (powerValue >= -24 && powerValue <= -8) {
+  if (powerValue >= -22 && powerValue <= -8) {
     return "🟢正常";
   } else if (powerValue > -8) {
     return "🔴过高";
@@ -646,11 +646,6 @@ function apply(ctx, config) {
   }
   __name(queryOrderLog, "queryOrderLog");
   async function queryRadiusUser(account) {
-    const cachedData = getFromCache("radiusUser", { account });
-    if (cachedData) {
-      console.log("使用缓存的RADIUS用户信息");
-      return cachedData;
-    }
     return addToQueue("radiusUser", { account }, async () => {
       try {
         console.log("开始查询RADIUS用户信息...");
@@ -673,7 +668,6 @@ function apply(ctx, config) {
           }
         );
         console.log("查询响应:", JSON.stringify(response, null, 2));
-        setCache("radiusUser", { account }, response);
         return response;
       } catch (error) {
         console.error("查询RADIUS用户错误详情:", error);
@@ -905,6 +899,34 @@ function apply(ctx, config) {
       console.log(`清理了 ${expiredCount} 个超时的消息任务`);
     }
   }, MESSAGE_CLEAN_INTERVAL2);
+  async function queryRefreshOnuPower(cid, gponIndex, onuIndex) {
+    return addToQueue("refreshPower", { cid, gponIndex, onuIndex }, async () => {
+      try {
+        console.log("开始刷新光功率信息...");
+        const token = await getToken();
+        const response = await ctx.http.get(`${config.baseUrl}/fttx/onu/refreshOnuPower`, {
+          params: { cid, gponIndex, onuIndex },
+          headers: {
+            "Authorization": token,
+            "Accept": "application/json",
+            "Content-Type": "application/json"
+          }
+        });
+        console.log("光功率刷新响应:", JSON.stringify(response, null, 2));
+        if (response.status === 200 && response.data) {
+          return response.data;
+        }
+        return null;
+      } catch (error) {
+        console.error("光功率刷新查询错误详情:", error);
+        if (error.response) {
+          console.error("错误响应:", error.response.data);
+        }
+        return null;
+      }
+    });
+  }
+  __name(queryRefreshOnuPower, "queryRefreshOnuPower");
   async function queryTerminalInfo(mac, needDetailedInfo = false) {
     const formattedMac = formatMacAddress(mac);
     try {
@@ -916,6 +938,12 @@ function apply(ctx, config) {
         queryOnuDetailInfo(onuList.id),
         queryOnuDetailVlanInfo(onuList.id)
       ]);
+      let powerInfo = null;
+      try {
+        powerInfo = await queryRefreshOnuPower(onuDetail.cid, onuDetail.gponIndex, onuDetail.onuIndex);
+      } catch (powerError) {
+        console.error("光功率刷新失败，将使用详情接口数据:", powerError);
+      }
       if (needDetailedInfo) {
         const [ccname, order] = await Promise.all([
           queryCCName(formattedMac),
@@ -926,13 +954,15 @@ function apply(ctx, config) {
           onuDetail,
           ccname,
           order,
-          vlanInfo
+          vlanInfo,
+          powerInfo
         };
       }
       return {
         onuList,
         onuDetail,
-        vlanInfo
+        vlanInfo,
+        powerInfo
       };
     } catch (error) {
       console.error("终端查询过程出错:", error);
@@ -942,20 +972,25 @@ function apply(ctx, config) {
   __name(queryTerminalInfo, "queryTerminalInfo");
   async function smartQueryMacAddress(cleanInput) {
     try {
-      const { onuDetail, ccname, order, vlanInfo } = await queryTerminalInfo(cleanInput, true);
+      const { onuDetail, ccname, order, vlanInfo, powerInfo } = await queryTerminalInfo(cleanInput, true);
+      const deviceStatus = powerInfo ? powerInfo.status : onuDetail.status;
+      const receivePower = powerInfo ? powerInfo.onuReceivePower : onuDetail.onuReceivePower;
+      const sendPower = powerInfo ? powerInfo.onuSendPower : onuDetail.onuSendPower;
+      const statusHealth = powerInfo ? powerInfo.statusHealth : onuDetail.statusHealth;
+      const isOnline = deviceStatus === 1;
       const messages = [
         "🖥️ 终端基本信息",
         getSeparator(),
         `MAC地址: ${cleanInput}`,
-        `状态：${onuDetail.status === 1 ? "在线 ✅" : "不在线 ❌"}`,
+        `状态：${isOnline ? "在线 ✅" : "不在线 ❌"}`,
         `机房: ${onuDetail.roomName}`,
         `设备名称: `,
         `${onuDetail.deviceName}`,
         `OLT IP: ${onuDetail.oltIp}`,
         `PON端口: ${onuDetail.portName}`,
         `端口逻辑号: ${onuDetail.logicId}`,
-        `发射光功率: ${onuDetail.onuSendPower === "设备不在线" ? "设备不在线" : onuDetail.onuSendPower + "dBm"}`,
-        `接收光功率: ${onuDetail.onuReceivePower === "设备不在线" ? "设备不在线" : onuDetail.onuReceivePower + "dBm"}${onuDetail.onuReceivePower !== "设备不在线" ? " " + evaluateOpticalPower(onuDetail.onuReceivePower) : ""}`,
+        `发射光功率: ${!isOnline || !sendPower ? "设备不在线" : sendPower + "dBm"}`,
+        `接收光功率: ${!isOnline || !receivePower ? "设备不在线" : receivePower + "dBm " + evaluateOpticalPower(receivePower)}`,
         `CCName: ${ccname}`,
         "",
         "📃 工单信息",
@@ -1066,8 +1101,8 @@ function apply(ctx, config) {
                   );
                 } else if (accountInfo.onlineStatus === "离线" && accountInfo.isPass === "原因未知") {
                   message.push(
-                    `未检索到账号信息⚠️`,
-                    `请检查ONU配置和账号是否正确或尝试重新拨号！`
+                    `未检索该账号的拨号记录⚠️`,
+                    `请尝试重新拨号或检查ONU配置和账号是否正确！`
                   );
                 } else if (accountInfo.onlineStatus === "离线" || accountInfo.onlineStatus === "不在线") {
                   message.push(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-jscn-aaaquery",
   "description": "江苏有线无锡分公司宽带信息查询插件",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [