From 9f05696822f8feee385a34a92dd9aa16009e84a0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 18 六月 2023 12:38:00 +0800
Subject: [PATCH] 寻路算法,地图节点优化,剔除原入出库模式获取地图节点方案,改为根据库位状态实时获取节点信息或直接获取无过滤的完整节点信息

---
 src/main/java/com/zy/core/News.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/core/News.java b/src/main/java/com/zy/core/News.java
index 47b3c24..e5e069e 100644
--- a/src/main/java/com/zy/core/News.java
+++ b/src/main/java/com/zy/core/News.java
@@ -1,12 +1,10 @@
 package com.zy.core;
 
-import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * news stories for zoneyung
@@ -19,7 +17,7 @@
         News.info("info{}", 1);
         News.warn("warn{}", 2);
         News.error("error{}", 3);
-        System.out.println(JSON.toJSONString(NEWS_QUEUE.data()));
+        System.out.println(News.print());
     }
 
     interface NewsSupport<T> { boolean execute(T t); }
@@ -97,19 +95,52 @@
     }
 
     public static void info(String format, Object... arguments) {
+        log.info(format, arguments);
         offer(NewsLevel.INFO, format, arguments);
     }
 
     public static void warn(String format, Object... arguments) {
+        log.warn(format, arguments);
         offer(NewsLevel.WARN, format, arguments);
     }
 
     public static void error(String format, Object... arguments) {
+        log.error(format, arguments);
         offer(NewsLevel.ERROR, format, arguments);
     }
 
+    public static String printStr() {
+        StringBuilder sb = new StringBuilder("[");
+        List<NewsDomain> domains = NEWS_QUEUE.data();
+        for (int i = 0; i < domains.size(); i++) {
+            NewsDomain domain = domains.get(i);
+            sb.append("{");
+            sb.append("\"l\":").append(domain.level.idx).append(",");
+            sb.append("\"v\":\"").append(domain.content).append("\"").append(",");
+            sb.append("\"t\":\"").append(domain.date).append("\"");
+            sb.append("}");
+            if (i < domains.size() - 1) {
+                sb.append(",");
+            }
+        }
+        sb.append("]");
+        return sb.toString();
+    }
+
+    public static List<Map<String, Object>> print() {
+        List<Map<String, Object>> res = new ArrayList<>();
+        for (NewsDomain datum : NEWS_QUEUE.data()) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("l", datum.level.idx);
+            map.put("v", datum.content);
+            map.put("t", datum.date);
+            res.add(map);
+        }
+        return res;
+    }
+
     private static boolean offer(NewsLevel level, String msg, Object[] args) {
-        return NEWS_QUEUE.offer(new NewsDomain(level, replace(msg, args), new Date()));
+        return NEWS_QUEUE.offer(new NewsDomain(level, replace(msg, args), (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date())));
     }
 
     private static String replace(String str, Object[] objs){
@@ -129,9 +160,9 @@
     static class NewsDomain {
         public NewsLevel level;
         public String content;
-        public Date date;
+        public String date;
 
-        public NewsDomain(NewsLevel level, String content, Date date) {
+        public NewsDomain(NewsLevel level, String content, String date) {
             this.level = level;
             this.content = content;
             this.date = date;
@@ -139,10 +170,14 @@
     }
 
     enum NewsLevel {
-        INFO,
-        WARN,
-        ERROR,
+        INFO(1),
+        WARN(2),
+        ERROR(3),
         ;
+        public int idx;
+        NewsLevel(int idx) {
+            this.idx = idx;
+        }
     }
 
 }

--
Gitblit v1.9.1