From 6749856f57bc86fddadecdf8517f2870554e1ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E6=89=BF?= <guocheng@xinyingpower.com>
Date: Mon, 14 Oct 2024 13:30:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=91=8A=E8=AD=A6=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B7=B2=E8=AF=BB=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0=E5=A4=84=E7=90=86=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/controller/WarningController.java   | 8 ++++----
 src/main/java/com/xydl/cac/entity/Warning.java            | 5 -----
 src/main/java/com/xydl/cac/service/WarningService.java    | 2 +-
 .../com/xydl/cac/service/impl/WarningServiceImpl.java     | 4 ++--
 src/main/java/com/xydl/cac/task/RuleCheckTask.java        | 1 -
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/xydl/cac/controller/WarningController.java b/src/main/java/com/xydl/cac/controller/WarningController.java
index d6a67d5..be9086c 100644
--- a/src/main/java/com/xydl/cac/controller/WarningController.java
+++ b/src/main/java/com/xydl/cac/controller/WarningController.java
@@ -54,13 +54,13 @@ public class WarningController extends BasicController {
                 .doWrite(result);
     }
 
-    @PostMapping("updateRead")
-    @ApiOperation("修改是否已读状态")
-    public Response<String> updateRead(@Validated @RequestBody Warning warning) throws Exception {
+    @PostMapping("updateState")
+    @ApiOperation("修改处理状态")
+    public Response<String> updateState(@Validated @RequestBody Warning warning) throws Exception {
         if (warning.getId() == null) {
             throw new BusinessException("id不能为空!");
         }
-        service.updateRead(warning);
+        service.updateState(warning);
         return Response.success("OK");
 
     }
diff --git a/src/main/java/com/xydl/cac/entity/Warning.java b/src/main/java/com/xydl/cac/entity/Warning.java
index bc8627b..8255a4c 100644
--- a/src/main/java/com/xydl/cac/entity/Warning.java
+++ b/src/main/java/com/xydl/cac/entity/Warning.java
@@ -118,9 +118,4 @@ public class Warning {
     @ExcelIgnore
     private Date processTime;
 
-    @ApiModelProperty("是否已读 0:未读 1:已读")
-    @Column(name = "isread")
-    @ExcelIgnore
-    private Integer isread;
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/service/WarningService.java b/src/main/java/com/xydl/cac/service/WarningService.java
index c0f6a6d..8e9dcb5 100644
--- a/src/main/java/com/xydl/cac/service/WarningService.java
+++ b/src/main/java/com/xydl/cac/service/WarningService.java
@@ -13,5 +13,5 @@ public interface WarningService {
 
     List<Warning> listAll(ConditionModel condition) throws Exception;
 
-    void updateRead(Warning warning) throws Exception;
+    void updateState(Warning warning) throws Exception;
 }
diff --git a/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java
index 07abf02..7806c93 100644
--- a/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java
@@ -74,13 +74,13 @@ public class WarningServiceImpl implements WarningService {
     }
 
     @Override
-    public void updateRead(Warning warning) throws Exception {
+    public void updateState(Warning warning) throws Exception {
         Optional<Warning> byId = repository.findById(warning.getId());
         if (!byId.isPresent()) {
             throw new BusinessException("未找到该告警" + warning.getId());
         }
         Warning war = byId.get();
-        war.setIsread(warning.getIsread());
+        war.setState(warning.getState());
         repository.save(war);
     }
 }
diff --git a/src/main/java/com/xydl/cac/task/RuleCheckTask.java b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
index e482300..2afd2dd 100644
--- a/src/main/java/com/xydl/cac/task/RuleCheckTask.java
+++ b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
@@ -85,7 +85,6 @@ public class RuleCheckTask {
                 .triggerDesc(rule.getOperatorDesc() + " 阈值(" + rule.getThreshold() + ")")
                 .warnTime(new Date())
                 .processTime(new Date())
-                .isread(0)
                 .build();
         warningRepository.save(warning);
         String str = warning.getZsbName() + "--" + warning.getWarnDesc() + " "