From e2fecd6d8db25ee3a2156684199a8fa59fece663 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Wed, 27 Nov 2024 11:11:15 +0800
Subject: [PATCH] =?UTF-8?q?pert:=20=E4=BC=98=E5=8C=96=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE=E5=92=8C=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xydl/cac/controller/TestController.java   | 26 ++++++++++++++++---
 .../java/com/xydl/cac/task/CacheTask.java     | 11 +++++---
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xydl/cac/controller/TestController.java b/src/main/java/com/xydl/cac/controller/TestController.java
index 3cc51e8..d0c881d 100644
--- a/src/main/java/com/xydl/cac/controller/TestController.java
+++ b/src/main/java/com/xydl/cac/controller/TestController.java
@@ -1,6 +1,5 @@
 package com.xydl.cac.controller;
 
-import com.xydl.cac.iec.IecClient;
 import com.xydl.cac.model.Response;
 import com.xydl.cac.model.StaticVariable;
 import com.xydl.cac.service.IcdFileConfigService;
@@ -40,9 +39,28 @@ public class TestController extends BasicController {
         webSocketServer.sendMessage(msg, warningId);
     }
 
-    @GetMapping("realTimeMap")
-    @ApiOperation("实时订阅Map")
-    public Response<HashMap<Integer, IecClient>> realTimeMap() {
+    @GetMapping("realTimeClientMap")
+    @ApiOperation("realTimeClientMap")
+    public Response<HashMap> realTimeClientMap() {
         return Response.success(StaticVariable.realTimeClientMap);
     }
+
+    @GetMapping("paramRelationMap")
+    @ApiOperation("paramRelationMap")
+    public Response<HashMap> paramRelationMap() {
+        return Response.success(StaticVariable.paramRelationMap);
+    }
+
+    @GetMapping("sensorLastDataMap")
+    @ApiOperation("sensorLastDataMap")
+    public Response<HashMap> sensorLastDataMap() {
+        return Response.success(StaticVariable.sensorLastDataMap);
+    }
+
+    @GetMapping("clearMap")
+    @ApiOperation("clearMap")
+    public void clearMap() {
+        StaticVariable.sensorLastDataMap.clear();
+        StaticVariable.paramRelationMap.clear();
+    }
 }
diff --git a/src/main/java/com/xydl/cac/task/CacheTask.java b/src/main/java/com/xydl/cac/task/CacheTask.java
index 68b1784..cbca1ca 100644
--- a/src/main/java/com/xydl/cac/task/CacheTask.java
+++ b/src/main/java/com/xydl/cac/task/CacheTask.java
@@ -17,17 +17,20 @@ public class CacheTask {
     @Resource
     WarnRuleService ruleService;
 
-
-    @Scheduled(cron = "0 0 9 * * ?")
-    private void clearCache() {
+    @Scheduled(cron = "0 0 1 * * ?")
+    private void clearCache1() {
         StaticVariable.unit_Cache.clear();
         StaticVariable.modevType_Cache = null;
         StaticVariable.jg_Cache = null;
         StaticVariable.zsb_Cache = null;
         StaticVariable.rule_Cache.clear();
-        StaticVariable.doneWarnMap.clear();
+        StaticVariable.paramRelationMap.clear();
     }
 
+    @Scheduled(cron = "0 30 9 * * ?")
+    private void clearCache9() {
+        StaticVariable.doneWarnMap.clear();
+    }
 
     @Scheduled(initialDelay = 30 * 1000, fixedDelay = 60 * 1000)
     private void refreshRule() {