From 3191e927b533192720badb59cc9e7579d1f43610 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 22 Oct 2024 12:50:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E9=93=81=E9=A1=B9=E7=9B=AE=E5=AE=9A?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SewageAlarmServiceImpl.java   |  4 ++++
 .../java/com/zhgd/xmgl/task/SewageTask.java    | 18 +++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java
index 9bfab042d..40fecd7b4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java
@@ -100,6 +100,10 @@ public class SewageAlarmServiceImpl extends ServiceImpl<SewageAlarmMapper, Sewag
         String alias = "sa.";
         QueryWrapper<SewageAlarm> queryWrapper = QueryGenerator.initPageQueryWrapper(SewageAlarm.class, paramMap, alias);
         queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SewageAlarm::getAlarmTime));
+        String projectSn = MapUtils.getString(paramMap, "projectSn");
+        if (Objects.equals(projectSn, "51E111F3FDFB41D0AB67F812F1B80794")) {
+            paramMap.put("type", null);
+        }
         if (Objects.equals(type, 1)) {
             queryWrapper.ge(alias + RefUtil.fieldNameUlc(SewageAlarm::getAlarmTime), DateUtil.today());
         }
diff --git a/src/main/java/com/zhgd/xmgl/task/SewageTask.java b/src/main/java/com/zhgd/xmgl/task/SewageTask.java
index befc7a512..40d5af186 100644
--- a/src/main/java/com/zhgd/xmgl/task/SewageTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/SewageTask.java
@@ -69,7 +69,7 @@ public class SewageTask {
             try {
                 saveAllRecord(project);
             } catch (Exception e) {
-                log.error("", e);
+                log.error("获取污水实时数据错误", e);
             }
         }
     }
@@ -127,11 +127,7 @@ public class SewageTask {
         }
         if (CollUtil.isNotEmpty(records)) {
             for (SewageData record : records) {
-                try {
-                    sewageDataService.add(record);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+                sewageDataService.add(record);
             }
         }
     }
@@ -169,13 +165,13 @@ public class SewageTask {
             try {
                 saveAllAlarm(project, start, end);
             } catch (Exception e) {
-                log.error("", e);
+                log.error("获取污水报警数据错误", e);
             }
         }
 
     }
 
-    private void saveAllAlarm(Project project, String start, String end) {
+    private void saveAllAlarm(Project project, String start, String end) throws InterruptedException {
         List<SewageDev> devs = sewageDevService.list(new LambdaQueryWrapper<SewageDev>().eq(SewageDev::getProjectSn, project.getProjectSn()));
         if (CollUtil.isEmpty(devs)) {
             return;
@@ -184,11 +180,7 @@ public class SewageTask {
         String token = RenZhiUtil.getToken(project.getJnrzckAccount(), project.getJnrzckPw());
         for (SewageDev dev : devs) {
             JSONArray dataJa = RenZhiUtil.getAlarmRecordList(dev.getDevSn(), token, -1, start, end);
-            try {
-                Thread.sleep(200);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
+            Thread.sleep(200);
             if (CollUtil.isEmpty(dataJa)) {
                 continue;
             }