mlx

api-common/src/main/java/api/common/util/TimeUtil.java

@@ -8,14 +8,14 @@ import java.util.*;
 public class TimeUtil {
 
     /**
-     * @param date
+     * @param date 日期
      * @return 13 位时间戳
      */
     public static long dateToTimestamp(Date date) {
         return date.getTime();
     }
 
-    private static String[] dateFmtArr = new String[]{"yyyyMMdd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd", "HHmmssSS", "HH:mm:ss", "yyyyMMddHHmmss"};
+    private static final String[] dateFmtArr = new String[]{"yyyyMMdd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd", "HHmmssSS", "HH:mm:ss", "yyyyMMddHHmmss"};
 
     public static long getNow() {
         return System.currentTimeMillis();
@@ -91,9 +91,9 @@ public class TimeUtil {
                 message = diffDays + "天" + diffHours + "小时" + diffMinutes + "分钟" + diffSeconds + "秒";
             } else if (diffDays == 0 && diffHours != 0) {
                 message = diffHours + "小时" + diffMinutes + "分钟" + diffSeconds + "秒";
-            } else if (diffDays == 0 && diffHours == 0 && diffMinutes != 0) {
+            } else if (diffDays == 0 && diffMinutes != 0) {
                 message = diffMinutes + "分钟" + diffSeconds + "秒";
-            } else if (diffDays == 0 && diffHours == 0 && diffMinutes == 0 && diffSeconds != 0) {
+            } else if (diffDays == 0 && diffSeconds != 0) {
                 message = diffSeconds + "秒";
             }
         } catch (Exception e) {

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/web/scheduler/ClusterScheduler.java

@@ -29,7 +29,7 @@ public class ClusterScheduler {
     @Resource
     private ApiClient apiClient;
     @Resource
-    private  StringRedisTemplate stringRedisTemplate;
+    private StringRedisTemplate stringRedisTemplate;
     @Resource
     private ManualProjectMapper manualProjectMapper;
     @Resource
@@ -46,9 +46,10 @@ public class ClusterScheduler {
         if (CollectionUtil.isEmpty(podNameList)) {
             for (KubernetesNodeTO kubernetesNodeTO : initialNodeList) {
                 stringRedisTemplate.opsForValue().set("node:" + kubernetesNodeTO.getName() + ":parallelism", kubernetesNodeTO.getMaxParallelism() + "");
-                log.info("ClusterScheduler--initNodeParallelism 重置节点 " + kubernetesNodeTO.getName() + " 并行度为：" + kubernetesNodeTO.getMaxParallelism());
             }
+            log.info("initNodeParallelism() 重置节点并行度为：" + initialNodeList);
         }
+
     }
 
     /**
@@ -64,7 +65,7 @@ public class ClusterScheduler {
         //2 如果没有正在运行的项目，则删除redis
         if (CollectionUtil.isEmpty(manual) && CollectionUtil.isEmpty(autoSub)) {
             RedisUtil.deleteByPrefix(stringRedisTemplate, "cluster:");
-            log.info("ClusterScheduler--removeCluster 清除 redis 中因错误残留的 cluster 数据。");
+            log.info("removeCluster() 清除 redis 中因错误残留的 cluster 数据。");
         }
     }
 }