From 1e965343c217b4629302baad25d68d4ecad8679e Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Wed, 12 May 2021 11:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=83=AD=E5=8A=9B=E5=9B=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persist/dao/LogisticsHeatImagingRecordDao.java        | 3 ++-
 .../java/com/ccsens/logistics/service/MbpsService.java    | 5 +++++
 .../main/resources/mapper_dao/LogisticsCarRecordDao.xml   | 8 ++++----
 .../mapper_dao/LogisticsHeatImagingRecordDao.xml          | 4 +++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsHeatImagingRecordDao.java b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsHeatImagingRecordDao.java
index 7b6f9291..8a109bb5 100644
--- a/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsHeatImagingRecordDao.java
+++ b/logistics/src/main/java/com/ccsens/logistics/persist/dao/LogisticsHeatImagingRecordDao.java
@@ -1,6 +1,7 @@
 package com.ccsens.logistics.persist.dao;
 
 import com.ccsens.logistics.bean.vo.MbpsVo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,5 +15,5 @@ public interface LogisticsHeatImagingRecordDao {
      * @param id 热成像设备id
      * @return  热成像信息
      */
-    MbpsVo.SelHeatImaging selHeatImaging(Long id);
+    MbpsVo.SelHeatImaging selHeatImaging(@Param("id") Long id);
 }
diff --git a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java
index c12d9250..1cd4a728 100644
--- a/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java
+++ b/logistics/src/main/java/com/ccsens/logistics/service/MbpsService.java
@@ -118,8 +118,13 @@ public class MbpsService implements IMbpsService {
             List<LogisticsWarehouse> warehouses = warehouseDao.selectByExample(warehouseExample);
             if (CollectionUtil.isNotEmpty(warehouses)){
                 for (LogisticsWarehouse warehouse : warehouses) {
+                    //火灾
                     Byte fireAlarm  = environmentRecordDao.selFire(warehouse.getId());
+                    fireAlarm = fireAlarm == null ? 0 : fireAlarm;
+                    //水灾
                     Byte floodAlarm  = environmentRecordDao.selFlood(warehouse.getId());
+                    floodAlarm = floodAlarm == null ? 0 : floodAlarm;
+
                     if (ObjectUtil.isNotNull(fireAlarm)){
                         if (1 == fireAlarm){
                             fireOrFlood.setIsFire(true);
diff --git a/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml
index 0a753684..0ea8c920 100644
--- a/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml
+++ b/logistics/src/main/resources/mapper_dao/LogisticsCarRecordDao.xml
@@ -68,7 +68,7 @@
                 <if test="queryType==3">
                     FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 0  AND cr.rec_status =0
                 </if>
-        GROUP BY s.date ORDER BY s.date DESC
+        GROUP BY s.date ORDER BY s.date
     </select>
 
     <select id="selCarOfOutByTime" resultType="com.ccsens.logistics.bean.vo.MbpsVo$CarOfOutByTime">
@@ -109,7 +109,7 @@
             <if test="queryType==3">
                 FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 1  AND cr.rec_status =0
             </if>
-        GROUP BY s.date ORDER BY s.date DESC
+        GROUP BY s.date ORDER BY s.date
     </select>
 
     <select id="selWeightOfInByTime" resultType="com.ccsens.logistics.bean.vo.MbpsVo$WeightOfInByTime">
@@ -150,7 +150,7 @@
             <if test="queryType==3">
                 FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 0  AND cr.rec_status =0
             </if>
-        GROUP BY s.date ORDER BY s.date DESC
+        GROUP BY s.date ORDER BY s.date
     </select>
 
     <select id="selWeightOfOutByTime" resultType="com.ccsens.logistics.bean.vo.MbpsVo$WeightOfOutByTime">
@@ -191,7 +191,7 @@
             <if test="queryType==3">
                 FROM_UNIXTIME(cr.record_time/1000,'%Y') = s.date AND cr.in_out = 1  AND cr.rec_status =0
             </if>
-            GROUP BY s.date ORDER BY s.date DESC
+            GROUP BY s.date ORDER BY s.date
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml b/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml
index 7307b8cc..c3dcb109 100644
--- a/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml
+++ b/logistics/src/main/resources/mapper_dao/LogisticsHeatImagingRecordDao.xml
@@ -13,7 +13,9 @@
             t_logistics_heat_imaging_record AS ir
             LEFT JOIN t_logistics_equipment AS le ON ir.equipment_id = le.id
             AND le.rec_status = 0
-            <if test="id!=null and id!=''">
+        WHERE
+            ir.rec_status = 0
+            <if test="id != null">
                 AND le.id = #{id}
             </if>
         ORDER BY