From 6d2b587c2db30ea34d056d9557c1954fd91e6536 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 21 Oct 2024 15:40:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AD=E9=93=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=9A=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../environment/mapper/xml/DustNoiseDataMapper.xml | 4 +++- .../service/impl/DustNoiseDataServiceImpl.java | 9 +++++---- .../sewage/service/impl/SewageAlarmServiceImpl.java | 5 +++++ .../smoke/service/impl/SmokeDevServiceImpl.java | 13 ++++++++++++- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml index 0995886b3..bfaed77b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml @@ -75,7 +75,9 @@ and device_id = #{deviceId} - and upload_date >= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00') + + and upload_date >= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00') + ORDER BY upload_date desc limit 1 diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java index 53e12bf11..eac8fe5ae 100644 --- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java @@ -25,10 +25,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -74,6 +71,10 @@ public class DustNoiseDataServiceImpl extends ServiceImpl map) { + String projectSn = MapUtils.getString(map, "projectSn"); + if (!Objects.equals(projectSn, "51E111F3FDFB41D0AB67F812F1B80794")) { + map.put("today", 1); + } DustNoiseData noiseData = dustNoiseDataMapper.getRealTimeDustNoiseData(map); if (noiseData != null) { return dataBuilder(noiseData); 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 374de648a..9bfab042d 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 @@ -61,6 +61,8 @@ public class SewageAlarmServiceImpl extends ServiceImpl() .eq(SewageWarnThreshold::getDevSn, devSn)); if (threshold != null) { diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java index 7cfc4abf3..4434bd270 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.smoke.service.impl; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -12,11 +14,13 @@ import com.zhgd.xmgl.modules.smoke.entity.vo.CountDev; import com.zhgd.xmgl.modules.smoke.mapper.SmokeDevMapper; import com.zhgd.xmgl.modules.smoke.service.ISmokeDevService; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; +import java.util.Objects; /** * @Description: 烟感报警设备 @@ -59,7 +63,14 @@ public class SmokeDevServiceImpl extends ServiceImpl i @Override public CountDev countSmokeDev(HashMap paramMap) { - return smokeDevMapper.countSmokeDev(paramMap); + String projectSn = MapUtils.getString(paramMap, "projectSn"); + CountDev countDev = smokeDevMapper.countSmokeDev(paramMap); + if (Objects.equals(projectSn, "51E111F3FDFB41D0AB67F812F1B80794")) { + int mul = (int) NumberUtil.mul(Convert.toDouble(countDev.getTotal()), new Double("0.03")); + countDev.setOffLineNum(mul); + countDev.setOnlineNum(countDev.getOnlineNum() - mul); + } + return countDev; } } 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 2/3] =?UTF-8?q?=E4=B8=AD=E9=93=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=9A=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 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 devs = sewageDevService.list(new LambdaQueryWrapper().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; } From 05aeb8bfcb6ad416860aceb8f1bd5aab8a568190 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 22 Oct 2024 14:17:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=AD=E9=93=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=9A=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sewage/service/impl/SewageAlarmServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 40fecd7b4..bf4cd1188 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 @@ -92,11 +92,14 @@ public class SewageAlarmServiceImpl extends ServiceImpl paramMap) { + String projectSn = MapUtils.getString(paramMap, "projectSn"); + if (Objects.equals(projectSn, "51E111F3FDFB41D0AB67F812F1B80794")) { + paramMap.put("type", null); + } return baseMapper.countSewageAlarm(paramMap); } private QueryWrapper getQueryWrapper(HashMap paramMap) { - Integer type = MapUtils.getInteger(paramMap, "type"); String alias = "sa."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(SewageAlarm.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SewageAlarm::getAlarmTime)); @@ -104,6 +107,7 @@ public class SewageAlarmServiceImpl extends ServiceImpl