From 07cec04b6cc6979df533b3d11d966c9884be9a97 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 11:44:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=91=8A=E8=AD=A6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B7=B2=E8=AF=BB=E7=8A=B6=E6=80=81=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xydl/cac/controller/WarningController.java | 12 ++++++++++++
 src/main/java/com/xydl/cac/entity/Warning.java     |  5 +++++
 .../java/com/xydl/cac/service/WarningService.java  |  2 ++
 .../xydl/cac/service/impl/WarningServiceImpl.java  | 14 ++++++++++++++
 src/main/java/com/xydl/cac/task/RuleCheckTask.java |  1 +
 5 files changed, 34 insertions(+)

diff --git a/src/main/java/com/xydl/cac/controller/WarningController.java b/src/main/java/com/xydl/cac/controller/WarningController.java
index eb99c48..d6a67d5 100644
--- a/src/main/java/com/xydl/cac/controller/WarningController.java
+++ b/src/main/java/com/xydl/cac/controller/WarningController.java
@@ -2,6 +2,7 @@ package com.xydl.cac.controller;
 
 import com.alibaba.excel.EasyExcel;
 import com.xydl.cac.entity.Warning;
+import com.xydl.cac.exception.BusinessException;
 import com.xydl.cac.model.ConditionModel;
 import com.xydl.cac.model.Response;
 import com.xydl.cac.service.ReportService;
@@ -52,4 +53,15 @@ public class WarningController extends BasicController {
                 .sheet("告警数据")
                 .doWrite(result);
     }
+
+    @PostMapping("updateRead")
+    @ApiOperation("修改是否已读状态")
+    public Response<String> updateRead(@Validated @RequestBody Warning warning) throws Exception {
+        if (warning.getId() == null) {
+            throw new BusinessException("id不能为空!");
+        }
+        service.updateRead(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 8255a4c..bc8627b 100644
--- a/src/main/java/com/xydl/cac/entity/Warning.java
+++ b/src/main/java/com/xydl/cac/entity/Warning.java
@@ -118,4 +118,9 @@ 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 a85fe0c..c0f6a6d 100644
--- a/src/main/java/com/xydl/cac/service/WarningService.java
+++ b/src/main/java/com/xydl/cac/service/WarningService.java
@@ -12,4 +12,6 @@ public interface WarningService {
     Page<Warning> list(ConditionModel condition) throws Exception;
 
     List<Warning> listAll(ConditionModel condition) throws Exception;
+
+    void updateRead(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 1d4a655..07abf02 100644
--- a/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java
@@ -1,6 +1,8 @@
 package com.xydl.cac.service.impl;
 
+import com.xydl.cac.entity.NSensor;
 import com.xydl.cac.entity.Warning;
+import com.xydl.cac.exception.BusinessException;
 import com.xydl.cac.model.ConditionModel;
 import com.xydl.cac.repository.WarningRepository;
 import com.xydl.cac.service.WarningService;
@@ -15,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.persistence.criteria.Predicate;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -69,4 +72,15 @@ public class WarningServiceImpl implements WarningService {
         };
         return repository.findAll(specification);
     }
+
+    @Override
+    public void updateRead(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());
+        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 2afd2dd..e482300 100644
--- a/src/main/java/com/xydl/cac/task/RuleCheckTask.java
+++ b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
@@ -85,6 +85,7 @@ 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() + " "