From 6d30ea6a7c139d883901ef50564b48568718ba82 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 22 九月 2026 18:14:41 +0800
Subject: [PATCH] bug:员工修改

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/audit/AuditDataFormatter.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/audit/AuditDataFormatter.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/audit/AuditDataFormatter.java
index 4d4a5b5..6ce98b2 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/audit/AuditDataFormatter.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/audit/AuditDataFormatter.java
@@ -8,6 +8,7 @@
 
 import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
+import java.util.Objects;
 import java.util.Map;
 
 /** 审计数据统一脱敏并将常用字段名转换为中文,供日志页面直接展示。 */
@@ -43,6 +44,45 @@
         return mask(JSON.toJSONString(localize(json, entityType)));
     }
 
+    /** 返回前后快照中实际发生改变的字段;未变化字段不会写入审计记录。 */
+    public static ChangeSet changes(String before, String after) {
+        JSONObject beforeObject = object(before);
+        JSONObject afterObject = object(after);
+        JSONObject changedBefore = new JSONObject(true);
+        JSONObject changedAfter = new JSONObject(true);
+        Map<String, Object> all = new LinkedHashMap<String, Object>();
+        all.putAll(beforeObject);
+        all.putAll(afterObject);
+        for (String field : all.keySet()) {
+            Object oldValue = beforeObject.get(field);
+            Object newValue = afterObject.get(field);
+            if (!Objects.equals(JSON.toJSONString(oldValue), JSON.toJSONString(newValue))) {
+                changedBefore.put(field, oldValue);
+                changedAfter.put(field, newValue);
+            }
+        }
+        return new ChangeSet(changedBefore.isEmpty() ? null : mask(changedBefore.toJSONString()),
+                changedAfter.isEmpty() ? null : mask(changedAfter.toJSONString()));
+    }
+
+    private static JSONObject object(String value) {
+        if (value == null || value.trim().isEmpty()) return new JSONObject(true);
+        try {
+            JSONObject object = JSON.parseObject(value);
+            return object == null ? new JSONObject(true) : object;
+        } catch (Exception ignored) {
+            return new JSONObject(true);
+        }
+    }
+
+    public static final class ChangeSet {
+        private final String before;
+        private final String after;
+        private ChangeSet(String before, String after) { this.before = before; this.after = after; }
+        public String getBefore() { return before; }
+        public String getAfter() { return after; }
+    }
+
     private static Object parse(String value) {
         try { return JSON.parse(value); } catch (Exception ignored) { return value; }
     }

--
Gitblit v1.7.1