fix: incorrect worker list display #245

powerjob-common/src/main/java/tech/powerjob/common/utils/CommonUtils.java

@@ -147,6 +147,18 @@ public class CommonUtils {
         return OmsConstant.NONE;
     }
 
+    /**
+     * 格式化字符串，如果是 null 或空则显示 N/A
+     * @param str 字符串
+     * @return 结果
+     */
+    public static String formatString(String str) {
+        if (StringUtils.isEmpty(str)) {
+            return OmsConstant.NONE;
+        }
+        return str;
+    }
+
     /**
      * 生成 UUID
      * @return uuid

powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/response/WorkerStatusVO.java

@@ -1,6 +1,7 @@
 package tech.powerjob.server.web.response;
 
 import tech.powerjob.common.model.SystemMetrics;
+import tech.powerjob.common.utils.CommonUtils;
 import tech.powerjob.server.common.module.WorkerInfo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -24,6 +25,7 @@ public class WorkerStatusVO {
 
     private String protocol;
     private String tag;
+    private String lastActiveTime;
 
     // 1 -> 健康，绿色，2 -> 一般，橙色，3 -> 糟糕，红色，9999 -> 非在线机器
     private int status;
@@ -40,9 +42,6 @@ public class WorkerStatusVO {
 
         SystemMetrics systemMetrics = workerInfo.getSystemMetrics();
 
-        this.protocol = workerInfo.getProtocol();
-        this.tag = workerInfo.getTag();
-
         this.status = 1;
         this.address = workerInfo.getAddress();
         this.cpuLoad = String.format(CPU_FORMAT, df.format(systemMetrics.getCpuLoad()), systemMetrics.getCpuProcessors());
@@ -69,5 +68,9 @@ public class WorkerStatusVO {
         if (workerInfo.timeout()) {
             this.status = 9999;
         }
+
+        this.protocol = workerInfo.getProtocol();
+        this.tag = CommonUtils.formatString(workerInfo.getTag());
+        this.lastActiveTime = CommonUtils.formatTime(workerInfo.getLastActiveTime());
     }
 }