修改

signal-optimize-service/src/main/resources/mapper/CrossMapper.xml

@@ -66,9 +66,9 @@
         from t_event_info a
         where a.start_time = (select  MAX(start_time) from t_event_info where cross_id = #{crossID}
         and start_time <![CDATA[ <= ]]>  DATE_FORMAT(#{time}, '%Y-%m-%d %H:%i:%s') and start_time >=  DATE_FORMAT(DATE_SUB(#{time},INTERVAL 30 MINUTE), '%Y-%m-%d %H:%i:%s')
-        and dt = DATE_FORMAT(#{time}, '%Y%m%d')
+        and dt = DATE_FORMAT(#{time}, '%Y%m%d') and type in (701, 702,703, 707) )
         and a.type in (701, 702,703, 707)
-        and a.cross_id = #{crossID} )
+        and a.cross_id = #{crossID} 
     </select>
 
     <select id="getCrossRealTimeAlarmsPlan" parameterType="String" resultMap="CrossRealTimeAlarmsResultMap">

signal-optimize-service/src/main/resources/mapper/TrunkLineMapper.xml

@@ -42,10 +42,10 @@
         select a.type , a.start_time as startTime , SUBSTR(a.dir, 2, length(a.dir)-2) as dir , TIMESTAMPDIFF(SECOND, a.start_time, ifnull(a.end_time,now()))  as  duration
         from t_event_info a
         where a.start_time = (select  MAX(start_time) from t_event_info where green_id = #{greenID}
-          and start_time <![CDATA[ <= ]]>  DATE_FORMAT(#{time}, '%Y-%m-%d %H:%i:%s') and start_time >=  DATE_FORMAT(DATE_SUB(#{time},INTERVAL 7 MINUTE), '%Y-%m-%d %H:%i:%s')
-          and dt = DATE_FORMAT(#{time}, '%Y%m%d')
+          and start_time <![CDATA[ <= ]]>  DATE_FORMAT(#{time}, '%Y-%m-%d %H:%i:%s') and start_time >=  DATE_FORMAT(DATE_SUB(#{time},INTERVAL 30 MINUTE), '%Y-%m-%d %H:%i:%s')
+          and dt = DATE_FORMAT(#{time}, '%Y%m%d') and type in (705, 706) )
           and a.type in (705, 706)
-          and a.green_id = #{greenID} )
+          and a.green_id = #{greenID} 
     </select>
 
     <select id="getTrunkLineRealTimeAlarmPlan" parameterType="map" resultMap="tlRealTimeAlarmsResultMap">