koishi-plugin-jscn-aaaquery 1.0.6 → 1.0.7

package/lib/index.js

@@ -797,6 +797,98 @@ function apply(ctx, config) {
       console.log(`清理了 ${expiredCount} 个超时的消息任务`);
     }
   }, MESSAGE_CLEAN_INTERVAL);
+  async function queryTerminalInfo(mac, needDetailedInfo = false) {
+    const formattedMac = formatMacAddress(mac);
+    try {
+      const onuList = await queryOnuList(formattedMac);
+      if (!onuList) {
+        throw new Error("未找到该MAC地址的设备信息");
+      }
+      const [onuDetail, vlanInfo] = await Promise.all([
+        queryOnuDetailInfo(onuList.id),
+        queryOnuDetailVlanInfo(onuList.id)
+      ]);
+      if (needDetailedInfo) {
+        const [ccname, order] = await Promise.all([
+          queryCCName(formattedMac),
+          queryOnuOrder(onuDetail)
+        ]);
+        return {
+          onuList,
+          onuDetail,
+          ccname,
+          order,
+          vlanInfo
+        };
+      }
+      return {
+        onuList,
+        onuDetail,
+        vlanInfo
+      };
+    } catch (error) {
+      console.error("终端查询过程出错:", error);
+      throw error;
+    }
+  }
+  __name(queryTerminalInfo, "queryTerminalInfo");
+  async function smartQueryMacAddress(cleanInput) {
+    try {
+      const { onuDetail, ccname, order, vlanInfo } = await queryTerminalInfo(cleanInput, true);
+      const messages = [
+        "🖥️ 终端基本信息",
+        "--------------------------------",
+        `MAC地址: ${cleanInput}`,
+        `状态：${onuDetail.status === 1 ? "在线 ✅" : "不在线 ❌"}`,
+        `机房: ${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) : ""}`,
+        `CCName: ${ccname}`,
+        "",
+        "📃 工单信息",
+        "--------------------------------",
+        order ? [
+          `工单编号: ${order.orderId}`,
+          `创建时间: ${order.createDate}`,
+          `更新时间: ${order.updateDate}`
+        ].join("\n") : "无工单信息",
+        "",
+        "⚙️ 业务配置信息",
+        "--------------------------------"
+      ];
+      const vlanGroups = {};
+      vlanInfo.forEach((info) => {
+        const key = `${info.VLAN !== void 0 && info.VLAN !== null && info.VLAN !== "-" ? info.VLAN : "未配置"}-${info.actualVlan !== void 0 && info.actualVlan !== null ? info.actualVlan : "未配置"}`;
+        if (!vlanGroups[key]) {
+          vlanGroups[key] = {
+            VLAN: info.VLAN !== void 0 && info.VLAN !== null && info.VLAN !== "-" ? info.VLAN : "未配置",
+            actualVlan: info.actualVlan !== void 0 && info.actualVlan !== null ? info.actualVlan : "未配置",
+            ports: []
+          };
+        }
+        vlanGroups[key].ports.push(info.LAN);
+      });
+      Object.values(vlanGroups).forEach((group) => {
+        const portsText = group.ports.join(",");
+        messages.push(
+          `端口 ${portsText}:`,
+          `  端口VLAN: ${group.VLAN}`,
+          `  工单VLAN: ${group.actualVlan}`
+        );
+      });
+      messages.push("--------------------------------");
+      return messages.join("\n");
+    } catch (error) {
+      console.error("查询MAC地址过程出错:", error);
+      return "查询失败，请稍后重试";
+    }
+  }
+  __name(smartQueryMacAddress, "smartQueryMacAddress");
   ctx.middleware(async (session, next) => {
     console.log("原始消息:", session.content);
     const originalInput = session.stripped.content.trim();
@@ -817,54 +909,7 @@ function apply(ctx, config) {
           console.log("处理后的内容:", cleanInput);
           if (isValidMacAddress(cleanInput)) {
             console.log("内容是合法的MAC地址，开始查询");
-            try {
-              const onuList = await queryOnuList(cleanInput);
-              if (!onuList) {
-                return "未找到该MAC地址的设备信息";
-              }
-              const onuDetail = await queryOnuDetailInfo(onuList.id);
-              const ccname = await queryCCName(cleanInput);
-              const order = await queryOnuOrder(onuDetail);
-              const vlanInfo = await queryOnuDetailVlanInfo(onuList.id);
-              const messages = [
-                "🖥️ 终端基本信息",
-                "--------------------------------",
-                `MAC地址: ${cleanInput}`,
-                `状态：${onuDetail.status === 1 ? "在线 ✅" : "不在线 ❌"}`,
-                `机房: ${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) : ""}`,
-                `CCName: ${ccname}`,
-                "",
-                "📃 工单信息",
-                "--------------------------------",
-                order ? [
-                  `工单编号: ${order.orderId}`,
-                  `创建时间: ${order.createDate}`,
-                  `更新时间: ${order.updateDate}`
-                ].join("\n") : "无工单信息",
-                "",
-                "⚙️ 业务配置信息",
-                "--------------------------------"
-              ];
-              vlanInfo.forEach((info) => {
-                messages.push(
-                  `端口 ${info.LAN}:`,
-                  `  端口VLAN: ${info.VLAN || "未配置"}`,
-                  `  工单VLAN: ${info.actualVlan || "未配置"}`
-                );
-              });
-              messages.push("--------------------------------");
-              return messages.join("\n");
-            } catch (error) {
-              console.error("查询MAC地址过程出错:", error);
-              return "查询失败，请稍后重试";
-            }
+            return await smartQueryMacAddress(cleanInput);
           } else {
             console.log("内容不是MAC地址，尝试作为账号查询");
             try {
@@ -1077,12 +1122,7 @@ function apply(ctx, config) {
       addToMessageQueue(session, async () => {
         try {
           const formattedMac = formatMacAddress(mac);
-          const onuList = await queryOnuList(formattedMac);
-          if (!onuList) {
-            return "未找到该MAC地址的设备信息";
-          }
-          const onuDetail = await queryOnuDetailInfo(onuList.id);
-          const vlanInfo = await queryOnuDetailVlanInfo(onuList.id);
+          const { onuDetail, vlanInfo } = await queryTerminalInfo(formattedMac, false);
           const messages = [
             "🖥️ 终端基本信息",
             "--------------------------------",
@@ -1096,11 +1136,24 @@ function apply(ctx, config) {
             "⚙️ 业务配置信息",
             "--------------------------------"
           ];
+          const vlanGroups = {};
           vlanInfo.forEach((info) => {
+            const key = `${info.VLAN !== void 0 && info.VLAN !== null && info.VLAN !== "-" ? info.VLAN : "未配置"}-${info.actualVlan !== void 0 && info.actualVlan !== null ? info.actualVlan : "未配置"}`;
+            if (!vlanGroups[key]) {
+              vlanGroups[key] = {
+                VLAN: info.VLAN !== void 0 && info.VLAN !== null && info.VLAN !== "-" ? info.VLAN : "未配置",
+                actualVlan: info.actualVlan !== void 0 && info.actualVlan !== null ? info.actualVlan : "未配置",
+                ports: []
+              };
+            }
+            vlanGroups[key].ports.push(info.LAN);
+          });
+          Object.values(vlanGroups).forEach((group) => {
+            const portsText = group.ports.join(",");
             messages.push(
-              `端口 ${info.LAN}:`,
-              `  端口VLAN: ${info.VLAN || "未配置"}`,
-              `  工单VLAN: ${info.actualVlan || "未配置"}`
+              `端口 ${portsText}:`,
+              `  端口VLAN: ${group.VLAN}`,
+              `  工单VLAN: ${group.actualVlan}`
             );
           });
           messages.push("--------------------------------");
@@ -1119,14 +1172,7 @@ function apply(ctx, config) {
       addToMessageQueue(session, async () => {
         try {
           const formattedMac = formatMacAddress(mac);
-          const onuList = await queryOnuList(formattedMac);
-          if (!onuList) {
-            return "未找到该MAC地址的设备信息";
-          }
-          const onuDetail = await queryOnuDetailInfo(onuList.id);
-          const ccname = await queryCCName(formattedMac);
-          const order = await queryOnuOrder(onuDetail);
-          const vlanInfo = await queryOnuDetailVlanInfo(onuList.id);
+          const { onuDetail, ccname, order, vlanInfo } = await queryTerminalInfo(formattedMac, true);
           const messages = [
             "🖥️ 终端基本信息",
             "--------------------------------",
@@ -1153,11 +1199,24 @@ function apply(ctx, config) {
             "⚙️ 业务配置信息",
             "--------------------------------"
           ];
+          const vlanGroups = {};
           vlanInfo.forEach((info) => {
+            const key = `${info.VLAN !== void 0 && info.VLAN !== null && info.VLAN !== "-" ? info.VLAN : "未配置"}-${info.actualVlan !== void 0 && info.actualVlan !== null ? info.actualVlan : "未配置"}`;
+            if (!vlanGroups[key]) {
+              vlanGroups[key] = {
+                VLAN: info.VLAN !== void 0 && info.VLAN !== null && info.VLAN !== "-" ? info.VLAN : "未配置",
+                actualVlan: info.actualVlan !== void 0 && info.actualVlan !== null ? info.actualVlan : "未配置",
+                ports: []
+              };
+            }
+            vlanGroups[key].ports.push(info.LAN);
+          });
+          Object.values(vlanGroups).forEach((group) => {
+            const portsText = group.ports.join(",");
             messages.push(
-              `端口 ${info.LAN}:`,
-              `  端口VLAN: ${info.VLAN || "未配置"}`,
-              `  工单VLAN: ${info.actualVlan || "未配置"}`
+              `端口 ${portsText}:`,
+              `  端口VLAN: ${group.VLAN}`,
+              `  工单VLAN: ${group.actualVlan}`
             );
           });
           messages.push("--------------------------------");

package/package.json

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

package/readme.md

@@ -104,6 +104,8 @@
 7. **超时处理**：设置请求超时，自动处理长时间未响应的请求
 8. **格式优化**：优化消息显示格式，使用直观的图标显示状态信息
 9. **错误处理**：完善的错误处理机制，确保查询失败时有清晰的提示
+10. **并行查询**：终端查询采用并行请求策略，在保持接口依赖关系的同时大幅提升查询速度
+11. **智能合并**：具有相同VLAN配置的多个LAN端口会自动合并显示，提高信息的可读性
 
 ## 显示优化
 
@@ -126,6 +128,11 @@
    - 内容丰富的查询结果使用新行显示
    - 简短提示直接显示在同一行
 
+5. **VLAN显示**：
+   - 端口VLAN值为"-"时显示为"未配置"
+   - 工单VLAN值为0时正确显示为"0"
+   - 相同VLAN配置的多个LAN端口合并显示，如"LAN2,LAN3,LAN4"
+
 ## 注意事项
 1. 所有查询都需要正确的权限和配置。
 2. MAC地址不区分大小写，支持多种分隔符格式，包括中文符号。
@@ -138,27 +145,12 @@
 9. 针对上线失败或离线状态的账号，系统也能提供有用的信息，不会简单报错。
 10. 所有命令支持带斜杠（如`/账号查询`）和不带斜杠（如`账号查询`）两种触发方式，提高命令输入的灵活性。
 
-## 开发相关
-
-为了支持开发过程中的热重载功能，需要确保：
-1. 在`koishi.yml`中正确配置hmr插件
-2. 安装并启用loader服务
-3. 在开发环境下运行Koishi时设置`NODE_ENV=development`
-
-```yaml
-# 开发相关配置示例
-group:develop:
-  $if: env.NODE_ENV === 'development'
-  hmr:
-    root:
-      - .
-  loader:
-    watch: true
-```
-
 ## 更新日志
 
 ### 最新更新
+- 优化终端查询性能，实现并行请求，大幅减少查询响应时间
+- 智能合并显示具有相同VLAN配置的LAN端口，使得信息展示更加清晰
+- 优化VLAN值显示：端口VLAN为"-"时显示为"未配置"，工单VLAN为0时正确显示为"0"
 - 增加了对双触发词的支持，同时兼容带斜杠（如`/账号查询`）和不带斜杠（如`账号查询`）的命令格式
 - 增加了离线状态和上线失败状态的特殊处理，提供更多有用信息
 - 修复了状态图标显示问题，确保"不在线"状态正确显示❌图标