From 0b318f4a159327e7b1a67ea9be8c3414f5bab040 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 11 Mar 2024 10:52:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=97=A7=E7=89=88?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cac/old/CableCirculationController.java   | 24 +++++++++----------
 .../java/com/xydl/cac/old/OldService.java     | 22 +++++++++++++++++
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/xydl/cac/old/CableCirculationController.java b/src/main/java/com/xydl/cac/old/CableCirculationController.java
index c83b708..709d8bc 100644
--- a/src/main/java/com/xydl/cac/old/CableCirculationController.java
+++ b/src/main/java/com/xydl/cac/old/CableCirculationController.java
@@ -73,18 +73,18 @@ public class CableCirculationController  {
         return AjaxResult.success(service.selectPages(dto));
     }
 
-//    /**
-//     * 获取二级告警信息
-//     *
-//     * @param dto
-//     * @return
-//     */
-//    @ApiOperation(value = "获取二级告警信息")
-//    @PostMapping(value = "/secondPage")
-//    public AjaxResult getSecondPage(@RequestBody CableWarningDto dto) {
-//        return AjaxResult.success(circulationService.getWarningPage(dto));
-//    }
-//
+    /**
+     * 获取二级告警信息
+     *
+     * @param dto
+     * @return
+     */
+    @ApiOperation(value = "获取二级告警信息")
+    @PostMapping(value = "/secondPage")
+    public AjaxResult getSecondPage(@RequestBody CableWarningDto dto) {
+        return AjaxResult.success(service.getWarningPage(dto));
+    }
+
 //    /**
 //     * 处理告警信息
 //     */
diff --git a/src/main/java/com/xydl/cac/old/OldService.java b/src/main/java/com/xydl/cac/old/OldService.java
index 28493ac..82047d1 100644
--- a/src/main/java/com/xydl/cac/old/OldService.java
+++ b/src/main/java/com/xydl/cac/old/OldService.java
@@ -7,6 +7,7 @@ import com.xydl.cac.repository.ZsbRepository;
 import com.xydl.cac.service.ZsbService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.domain.Page;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -481,4 +482,25 @@ public class OldService {
         List<CableWarningVo> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(CableWarningVo.class));
         return list;
     }
+
+    List<CableWarningVo> getWarningPage(CableWarningDto dto) {
+        String sql = "SELECT w.id,w.eqmid,w.warn_time,w.warning_value,w.threadval,w.warn_desc,w.warn_level," +
+                "     w.state,w.process,w.process_user,w.process_time,COUNT(w.id) AS warningCount,v.NAME" +
+                "        FROM warning w" +
+                "    LEFT JOIN vw_sb v ON v.id = w.eqmid" +
+                "    LEFT JOIN vw_jg j ON j.id = v.jgid" +
+                "    LEFT JOIN i2relation i ON v.id = i.eqmid WHERE 1=1 ";
+        if (StringUtils.isNotBlank(dto.getState())) {
+            sql = sql + " AND w.state=" + dto.getState();
+        }
+        if (StringUtils.isNotBlank(dto.getStartTime())) {
+            sql = sql + " AND w.warn_time>='" + dto.getStartTime() + " 00:00:00'";
+        }
+        if (StringUtils.isNotBlank(dto.getEndTime())) {
+            sql = sql + " AND w.warn_time<='" + dto.getEndTime() + " 23:59:59'";
+        }
+        sql = sql + " GROUP BY w.eqmid";
+        List<CableWarningVo> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(CableWarningVo.class));
+        return list;
+    }
 }