From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/News.java |   98 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 85 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/News.java b/src/main/java/com/zy/core/News.java
index 47b3c24..956d860 100644
--- a/src/main/java/com/zy/core/News.java
+++ b/src/main/java/com/zy/core/News.java
@@ -1,12 +1,13 @@
 package com.zy.core;
 
-import com.alibaba.fastjson.JSON;
+import com.core.common.SpringUtils;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkMastService;
 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 +20,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,22 +98,89 @@
     }
 
     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);
     }
 
-    private static boolean offer(NewsLevel level, String msg, Object[] args) {
-        return NEWS_QUEUE.offer(new NewsDomain(level, replace(msg, args), new Date()));
+    public static void taskInfo(Integer wrkNo, String format, Object... arguments) {
+        info(format, arguments);
+        offerTask(wrkNo, format, arguments);
     }
 
-    private static String replace(String str, Object[] objs){
+    public static void taskWarn(Integer wrkNo, String format, Object... arguments) {
+        warn(format, arguments);
+        offerTask(wrkNo, format, arguments);
+    }
+
+    public static void taskError(Integer wrkNo, String format, Object... arguments) {
+        error(format, arguments);
+        offerTask(wrkNo, 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 offerTask(Integer wrkNo, String msg, Object[] args) {
+        WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+        if (wrkMastService == null) {
+            return false;
+        }
+
+        WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
+        if (wrkMast == null) {
+            return false;
+        }
+        String systemMsg = replace(msg, args);
+        if (!systemMsg.equals(wrkMast.getSystemMsg())) {
+            wrkMast.setSystemMsg(systemMsg);
+            wrkMast.setModiTime(new Date());
+            wrkMastService.updateById(wrkMast);
+        }
+        return true;
+    }
+
+    private static boolean offer(NewsLevel level, String msg, Object[] args) {
+        return NEWS_QUEUE.offer(new NewsDomain(level, replace(msg, args), (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(new Date())));
+    }
+
+    public static String replace(String str, Object[] objs){
         if (null == objs || objs.length == 0 || null == str || "".equals(str.trim())) {
             return str;
         } else {
@@ -129,9 +197,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 +207,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