From ba77f258c619b296e51cadc0958bff23965dfc6d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 14 一月 2025 16:10:02 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/core/News.java b/src/main/java/com/zy/core/News.java
index e5e069e..0934f55 100644
--- a/src/main/java/com/zy/core/News.java
+++ b/src/main/java/com/zy/core/News.java
@@ -1,5 +1,8 @@
 package com.zy.core;
 
+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;
@@ -109,6 +112,21 @@
         offer(NewsLevel.ERROR, format, arguments);
     }
 
+    public static void taskInfo(Integer wrkNo, String format, Object... arguments) {
+        info(format, arguments);
+        offerTask(wrkNo, format, arguments);
+    }
+
+    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();
@@ -139,11 +157,30 @@
         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())));
     }
 
-    private static String replace(String str, Object[] objs){
+    public static String replace(String str, Object[] objs){
         if (null == objs || objs.length == 0 || null == str || "".equals(str.trim())) {
             return str;
         } else {

--
Gitblit v1.9.1