From ef132e99315e0e6573b18979129dd9d56bbec820 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 25 Oct 2024 09:56:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=91=8A=E8=AD=A6=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/entity/Warning.java     |  9 ++++++--
 .../cac/service/impl/WarningServiceImpl.java  | 22 +++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xydl/cac/entity/Warning.java b/src/main/java/com/xydl/cac/entity/Warning.java
index 8255a4c..99eca4b 100644
--- a/src/main/java/com/xydl/cac/entity/Warning.java
+++ b/src/main/java/com/xydl/cac/entity/Warning.java
@@ -78,7 +78,7 @@ public class Warning {
     @ApiModelProperty("阈值")
     @Column(name = "threshold")
     @ColumnWidth(10)
-    @ExcelProperty(value = "阈值", order = 8)
+    @ExcelProperty(value = "阈值", order = 9)
     private String threshold;
 
     @ApiModelProperty("告警信息")
@@ -90,7 +90,7 @@ public class Warning {
     @ApiModelProperty("触发信息")
     @Column(name = "trigger_desc")
     @ColumnWidth(20)
-    @ExcelProperty(value = "触发信息", order = 7)
+    @ExcelProperty(value = "触发信息", order = 8)
     private String triggerDesc;
 
     @ApiModelProperty("告警等级 0:低 1:中 2:高")
@@ -118,4 +118,9 @@ public class Warning {
     @ExcelIgnore
     private Date processTime;
 
+    @Transient
+    @ColumnWidth(10)
+    @ExcelProperty(value = "单位", order = 7)
+    private String unit;
+
 }
\ No newline at end of file
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 7806c93..df14452 100644
--- a/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java
@@ -1,9 +1,10 @@
 package com.xydl.cac.service.impl;
 
-import com.xydl.cac.entity.NSensor;
+import com.xydl.cac.entity.Unit;
 import com.xydl.cac.entity.Warning;
 import com.xydl.cac.exception.BusinessException;
 import com.xydl.cac.model.ConditionModel;
+import com.xydl.cac.repository.UnitRepository;
 import com.xydl.cac.repository.WarningRepository;
 import com.xydl.cac.service.WarningService;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +27,8 @@ public class WarningServiceImpl implements WarningService {
 
     @Resource
     WarningRepository repository;
+    @Resource
+    UnitRepository unitRepository;
 
     @Override
     public Page<Warning> list(ConditionModel condition) throws Exception {
@@ -48,9 +51,22 @@ public class WarningServiceImpl implements WarningService {
             return predicate;
         };
         Page<Warning> result = repository.findAll(specification, request);
+        this.fillOtherNames(result.getContent());
         return result;
     }
 
+    private void fillOtherNames(List<Warning> list) {
+        List<Unit> unitList = unitRepository.findAll();
+        for (Warning item : list) {
+            for (Unit unit : unitList) {
+                if (unit.getField().equals(item.getField())) {
+                    item.setUnit(unit.getUnit());
+                    break;
+                }
+            }
+        }
+    }
+
     @Override
     public List<Warning> listAll(ConditionModel condition) throws Exception {
         Specification<Warning> specification = (root, query, builder) -> {
@@ -70,7 +86,9 @@ public class WarningServiceImpl implements WarningService {
             query.orderBy(builder.desc(root.get("warnTime")));
             return predicate;
         };
-        return repository.findAll(specification);
+        List<Warning> list = repository.findAll(specification);
+        this.fillOtherNames(list);
+        return list;
     }
 
     @Override