From 78f81398b511a23ece900ae5460309271a98c0d6 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Thu, 4 Jan 2024 11:14:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/GantryCraneWorkCycleMapper.xml          |  3 +++
 src/main/java/com/zhgd/xmgl/util/yunboCarUtils.java    | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneWorkCycleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneWorkCycleMapper.xml
index 521f983d5..b7c5cd736 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneWorkCycleMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/GantryCraneWorkCycleMapper.xml
@@ -59,6 +59,9 @@
         <if test="devSn != null and devSn != ''">
             and dev_sn = #{devSn}
         </if>
+        <if test="type == '1'.toString()">
+            and add_time >= current_date
+        </if>
     </select>
 
     <select id="workTimeAnalysis" resultType="com.zhgd.xmgl.base.entity.vo.TrendVo">
diff --git a/src/main/java/com/zhgd/xmgl/util/yunboCarUtils.java b/src/main/java/com/zhgd/xmgl/util/yunboCarUtils.java
index 98882bbc8..fb226fbfc 100644
--- a/src/main/java/com/zhgd/xmgl/util/yunboCarUtils.java
+++ b/src/main/java/com/zhgd/xmgl/util/yunboCarUtils.java
@@ -4,7 +4,7 @@ import java.io.UnsupportedEncodingException;
 
 /**
  * 车辆系统控制工具类
- * 
+ *
  * @author Administrator
  *
  */
@@ -15,7 +15,7 @@ public class yunboCarUtils {
 
 	/**
 	 * 语音播报函数 入参： "语音内容"
-	 * 
+	 *
 	 * @param plateNumber
 	 *            (播放车牌语音) "粤B12345" content（播放语音）"欢迎光临;临时车不允许进场;此车已出场;一路平安"
 	 * @return
@@ -94,7 +94,7 @@ public class yunboCarUtils {
 
 	/***
 	 * 下发显示命令 参数：
-	 * 
+	 *
 	 * @param type
 	 *            01表示第一行 02 表示第二行 03表示第三行 04表示第四行
 	 * @param content
@@ -171,7 +171,7 @@ public class yunboCarUtils {
 
 	/**
 	 * 10进制转16进制(长度编译)
-	 * 
+	 *
 	 * @param systems
 	 * @return
 	 */
@@ -206,7 +206,7 @@ public class yunboCarUtils {
 
 	/**
 	 * 流水号
-	 * 
+	 *
 	 * @param randoms
 	 * @return
 	 */