From ee2fae105b17f6904c118a3d210a9ffd5d3861c5 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Wed, 7 Jan 2026 10:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=8D=97bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/impl/LineWarningServiceImpl.java       | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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 f2be7b298..7989e2d76 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
@@ -942,7 +942,8 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         LambdaQueryWrapper<WarningLeaflet> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(WarningLeaflet::getState, 1)
                 .eq(WarningLeaflet::getProblemType, 2)
-                .between(WarningLeaflet::getCreateTime, firstDayOfYear, lastDayOfYear);
+                .like(WarningLeaflet::getFilePath,year);
+//                .between(WarningLeaflet::getCreateTime, firstDayOfYear, lastDayOfYear);
         List<WarningLeaflet> list = warningLeafletService.list(lambdaQueryWrapper);
         if (list.isEmpty()) {
             return "1";
@@ -961,6 +962,18 @@ public class LineWarningServiceImpl extends MppServiceImpl<LineWarningMapper, Li
         return String.valueOf(maxNumber + 1);
     }
 
+    public static void main(String[] args) {
+        Pattern pattern = compile("年(\\d+)号");
+        String filePath = "onlineReport/电能[告]2025年28号-海口地市 电能质量技术监督告警单.docx";
+        Matcher matcher = pattern.matcher(filePath);
+
+        if (matcher.find()) {
+            int number = Integer.parseInt(matcher.group(1));
+            System.out.println(number);
+        }
+    }
+
+
     /**
      * 获取频率偏差-日最大值-最大值
      */