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] =?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

---
 .../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 @@
         <if test="deviceId != null and deviceId != ''">
             and device_id = #{deviceId}
         </if>
-        and upload_date >= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00')
+        <if test="today == '1'.toString()">
+            and upload_date >= CONCAT(DATE_FORMAT(now(), '%Y-%m-%d'), ' 00:00:00')
+        </if>
         ORDER BY upload_date desc
         limit 1
     </select>
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<DustNoiseDataMapper, D
 
     @Override
     public DustNoiseData getRealTimeDustNoiseData(Map<String, Object> 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<SewageAlarmMapper, Sewag
         SewageAlarm conductivity = sewageAlarmMapper.getNewestOne(paramMap);
         paramMap.put("sewageType", ParamEnum.SewageTypeEnum.WATER_TEMPERATURE.getValue());
         SewageAlarm waterTemperature = sewageAlarmMapper.getNewestOne(paramMap);
+        paramMap.put("sewageType", ParamEnum.SewageTypeEnum.WATER_LEVEL.getValue());
+        SewageAlarm waterLevel = sewageAlarmMapper.getNewestOne(paramMap);
         SewageData data = new SewageData();
         if (conductivity != null) {
             data.setConductivity(conductivity.getMonitorValue());
@@ -68,6 +70,9 @@ public class SewageAlarmServiceImpl extends ServiceImpl<SewageAlarmMapper, Sewag
         if (waterTemperature != null) {
             data.setWaterTemperature(waterTemperature.getMonitorValue());
         }
+        if (waterLevel != null) {
+            data.setWaterLevel(waterLevel.getMonitorValue());
+        }
         SewageWarnThreshold threshold = sewageWarnThresholdMapper.selectOne(new LambdaQueryWrapper<SewageWarnThreshold>()
                 .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<SmokeDevMapper, SmokeDev> i
 
     @Override
     public CountDev countSmokeDev(HashMap<String, Object> 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;
     }
 
 }