bug修复

src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java

@@ -80,6 +80,7 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
 
     @Override
     public void addEnvironmentAlarm(DustNoiseData dustNoiseData, EnvironmentDev environmentDev) {
+        boolean isThreeAlarm = false;
         // 查询平均阈值
         EnvironmentWarning alarmMap = environmentWarningMapper.getEnvironmentWarningByType(dustNoiseData.getProjectSn(), dustNoiseData.getDeviceId(), 1);
         //预警
@@ -200,10 +201,8 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                     noticeService.addNotice(notice, true);
                 }
             }
-
+            isThreeAlarm = true;
-            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 2);
         } else {
-            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 1);
 
             if (Objects.equals(dustNoiseData.getPm25AlarmType(), 1) && warningMap != null && warningMap.getPm25Warning() != null && dustNoiseData.getPm25() != null
                     && dustNoiseData.getPm25().doubleValue() >= warningMap.getPm25Warning().doubleValue()) {
@@ -274,9 +273,8 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                     noticeService.addNotice(notice, true);
                 }
             }
-            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 2);
+            isThreeAlarm = true;
         } else {
-            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 1);
 
             if (Objects.equals(dustNoiseData.getPm10AlarmType(), 1) && warningMap != null && warningMap.getPm10Warning() != null && dustNoiseData.getPm10() != null
                     && dustNoiseData.getPm10().doubleValue() >= warningMap.getPm10Warning().doubleValue()) {
@@ -348,9 +346,8 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                 }
             }
 
-            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 2);
+            isThreeAlarm = true;
         } else {
-            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 1);
 
             if (Objects.equals(dustNoiseData.getTspAlarmType(), 1) && warningMap != null && warningMap.getRealTimeTsp() != null && dustNoiseData.getTsp() != null
                     && dustNoiseData.getTsp().doubleValue() >= warningMap.getRealTimeTsp().doubleValue()) {
@@ -684,6 +681,12 @@ public class EnvironmentAlarmServiceImpl extends ServiceImpl<EnvironmentAlarmMap
                 }
             }
         }
+
+        if (isThreeAlarm) {
+            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 2);
+        } else {
+            sprayRtDevService.setSwitchStatusIf(dustNoiseData.getProjectSn(), 1);
+        }
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml

@@ -29,7 +29,7 @@
         </if>
         )t2 on t1.day=t2.day
         union
-        select t1.day,ifnull(t1.当日入库量,0) as 当日入库量,ifnull(t2.当日出库量,0) as 当日出库量 from (
+        select t2.day,ifnull(t1.当日入库量,0) as 当日入库量,ifnull(t2.当日出库量,0) as 当日出库量 from (
         select date_format(entry_time, '%Y-%m-%d') day, count(*) 当日入库量
         from rt_tool
         where project_sn = #{projectSn}

src/main/java/com/zhgd/xmgl/modules/sprayrt/service/impl/SprayRtDevServiceImpl.java

@@ -88,7 +88,7 @@ public class SprayRtDevServiceImpl extends ServiceImpl<SprayRtDevMapper, SprayRt
     @Override
     public void setSwitchStatusIf(String projectSn, Integer switchStatus) {
         List<SprayRtDev> devs = sprayRtDevMapper.selectList(new LambdaQueryWrapper<SprayRtDev>()
-                .eq(SprayRtDev::getDevSn, projectSn));
+                .eq(SprayRtDev::getProjectSn, projectSn));
         for (SprayRtDev dev : devs) {
             if (Objects.equals(dev.getSprayMode(), 2)) {
                 dev.setSwitchStatus(switchStatus);