From 212db18835f441639892b97943950ec54259a64f Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 18 Dec 2025 22:24:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=82=E5=B8=B8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/supervision/pojo/vo/device/OnlineVo.java     | 3 +++
 .../service/device/impl/LineWarningServiceImpl.java       | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/OnlineVo.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/OnlineVo.java
index e3ea0b9e9..26e18b573 100644
--- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/OnlineVo.java
+++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/OnlineVo.java
@@ -82,4 +82,7 @@ public class OnlineVo implements Serializable {
     @ApiModelProperty("最新数据时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private LocalDateTime updateTime;
+
+    @ApiModelProperty("数据类型 0:无数据 1:超标告警 2:异常数据")
+    private Integer dataType;
 }
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
index 68f2b2a33..d508e8555 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java
@@ -292,7 +292,11 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
             }
         }
         queryWrapper.orderBy(true, true, "D.Name", "p4.Name", "p3.Name");
-        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
+        Page<OnlineVo> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
+        page.getRecords().forEach(item -> {
+            item.setDataType(param.getDataType());
+        });
+        return page;
     }
 
     @Override
@@ -344,6 +348,8 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
                     }
                 });
                 dataMap.put("${noData}", CollUtil.isEmpty(dataList1) ? "0" : String.valueOf(dataList1.size()));
+            } else {
+                dataMap.put("${noData}", "0");
             }
             if (CollUtil.isNotEmpty(list2)) {
                 list2.forEach(item -> {