From f6a293ffc62ca0568c3c10c608004c29acbd9ef0 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Fri, 21 Feb 2025 13:36:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9F=9C=E5=8A=A0=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfaces/OperationLogAspect.java        | 68 +++++++++++++++++--
 1 file changed, 64 insertions(+), 4 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java b/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java
index e277dfcc..78a6c0f3 100644
--- a/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java
+++ b/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java
@@ -211,8 +211,17 @@ public class OperationLogAspect {
 
                             String functionId = function.getString("functionId");
 
-                            if (deviceType.equals("17")||deviceType.equals("18")){  //动环数据操作日志暂不放进数据库
-                                return;
+
+                            if(Objects.equals(deviceType, UniversalEnum.SEVENTEEN.getValue())){ //机柜的读取不记录
+                               if (Objects.equals(functionId,"04")){
+                                   return;
+                                }
+                                if (Objects.equals(functionId,"03")){
+                                    return;
+                                }
+                            }
+                            if(Objects.equals(deviceType, UniversalEnum.EIGHTEEN.getValue())){ //机柜空调的读取不记录
+                                    return;
                             }
                             if (Objects.equals(functionId, UniversalEnum.A_ONE.getValue()) ||
                                     Objects.equals(functionId, UniversalEnum.A_TWO.getValue()) ||
@@ -456,6 +465,26 @@ public class OperationLogAspect {
                                     remark.append("雨刷开启");
                                 }
 
+                            }else if(Objects.equals(deviceType, UniversalEnum.SEVENTEEN.getValue())){ //动环机柜
+                                if(Objects.equals(functionId, "SL")){
+                                    String aSwitch = params.getString("switch");
+                                     if ("1".equals(aSwitch)){
+                                         remark.append("门禁打开");
+                                     }else if ("0".equals(aSwitch)){
+                                         remark.append("门禁关闭");
+                                     }else {
+                                         remark.append("操作门禁");
+                                     }
+                                }
+                                if (Objects.equals(functionId, "TL")){
+                                    remark.append("雷击清零");
+                                }
+                                if (Objects.equals(functionId, "SR")){
+                                    remark.append("系统复位");
+                                }
+                                if (Objects.equals(functionId, "RS")){
+                                    remark.append("令重合闸复位");
+                                }
                             }
 
 
@@ -581,8 +610,18 @@ public class OperationLogAspect {
                     String functionId = String.valueOf(pointArgs[UniversalEnum.ONE.getNumber()]);
 
                     JSONObject params = (JSONObject) JSON.toJSON(pointArgs[UniversalEnum.TWO.getNumber()]);
-                    if (deviceType.equals("17")||deviceType.equals("18")){  //动环数据操作日志暂不放进数据库
-                       return;
+
+                    if(Objects.equals(deviceType, UniversalEnum.SEVENTEEN.getValue())){ //机柜的读取不记录
+                        if (Objects.equals(functionId,"04")){
+                            return;
+                        }
+                        if (Objects.equals(functionId,"03")){
+                            return;
+                        }
+                    }
+                    if(Objects.equals(deviceType, UniversalEnum.EIGHTEEN.getValue())){ //机柜空调的不记录
+                            return;
+
                     }
                     if (Objects.equals(functionId, UniversalEnum.A_ONE.getValue()) ||
                             Objects.equals(functionId, UniversalEnum.A_TWO.getValue()) ||
@@ -631,6 +670,27 @@ public class OperationLogAspect {
 
                         }
 
+                    }else if(Objects.equals(deviceType, UniversalEnum.SEVENTEEN.getValue())){ //动环机柜
+                        if(Objects.equals(functionId, "SL")){
+                            String aSwitch = params.getString("switch");
+                            if ("1".equals(aSwitch)){
+                                remark.append("门禁打开");
+                            }else if ("0".equals(aSwitch)){
+                                remark.append("门禁关闭");
+                            }else {
+                                remark.append("操作门禁");
+                            }
+                        }
+                        if (Objects.equals(functionId, "TL")){
+                            remark.append("雷击清零");
+                        }
+                        if (Objects.equals(functionId, "SR")){
+                            remark.append("系统复位");
+                        }
+                        if (Objects.equals(functionId, "RS")){
+                            remark.append("令重合闸复位");
+                        }
+
                     }
 
                     if (loginUser != null) {