Bläddra i källkod

bugfix:
1、前端设备获取时间线,数据查询丢失中间时间。替换查询SQL

lihao16 5 månader sedan
förälder
incheckning
ec3c45ba7b

+ 10 - 0
smsb-modules/smsb-source/src/main/java/com/inspur/source/mapper/SmsbItemPushPlaylineMapper.java

@@ -31,4 +31,14 @@ public interface SmsbItemPushPlaylineMapper extends BaseMapperPlus<SmsbItemPushP
      * @param deviceIds
      */
     void deleteByPushIdAndDeviceIds(@Param("pushId") Long pushId, @Param("deviceIds") List<Long> deviceIds);
+
+    /**
+     * 前端设备获取时间线
+     * @param startTime
+     * @param endTime
+     * @param deviceId
+     * @return
+     */
+    List<SmsbItemPushPlaylineVo> selectPlayLineForFront(@Param("startTime") String startTime, @Param("endTime") String endTime,
+                                                        @Param("deviceId") Long deviceId);
 }

+ 1 - 1
smsb-modules/smsb-source/src/main/java/com/inspur/source/service/impl/SmsbItemPushServiceImpl.java

@@ -764,7 +764,7 @@ public class SmsbItemPushServiceImpl implements ISmsbItemPushService {
         // 查询当前设备三天的时序
         Date startDate = DateUtil.beginOfDay(new Date());
         Date endDate = DateUtil.endOfDay(DateUtil.offsetDay(startDate, 2));
-        List<SmsbItemPushPlaylineVo> devicePlaylineList = smsbItemPushPlaylineMapper.selectExistTimeNodes(DateUtil.formatDateTime(startDate),
+        List<SmsbItemPushPlaylineVo> devicePlaylineList = smsbItemPushPlaylineMapper.selectPlayLineForFront(DateUtil.formatDateTime(startDate),
             DateUtil.formatDateTime(endDate), deviceVo.getId());
         for (SmsbItemPushPlaylineVo devicePlayline : devicePlaylineList) {
             FrontPushInfoVo oneLineResult = new FrontPushInfoVo();

+ 10 - 0
smsb-modules/smsb-source/src/main/resources/mapper/SmsbItemPushPlaylineMapper.xml

@@ -15,6 +15,16 @@
             OR #{endTime} BETWEEN start_time and end_time )
     </select>
 
+    <select id="selectPlayLineForFront" resultType="com.inspur.source.domain.vo.SmsbItemPushPlaylineVo">
+        SELECT
+            *
+        from
+            smsb_item_push_playline
+        where
+            device_id = #{deviceId} and start_time <![CDATA[ >= ]]> #{startTime} and end_time <![CDATA[ <= ]]> #{endTime}
+        order by start_time asc
+    </select>
+
     <delete id="deleteByPushIdAndDeviceIds">
         delete from
         smsb_item_push_playline