guzijian / wvp-GB28181-pro · Commits

Commit b90969f180475659307157322ca0108d4b39c6ee

Authored by 648540858
1 parent 29d69267

优化推流列表查询排序

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushUploadFileHandler.java
  View file @b90969f
@@ -28,7 +28,7 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPus @@ -28,7 +28,7 @@ public class StreamPushUploadFileHandler extends AnalysisEventListener<StreamPus
28 streamPushItem.setGbId(streamPushExcelDto.getGbId()); 28 streamPushItem.setGbId(streamPushExcelDto.getGbId());
29 streamPushItem.setStatus(false); 29 streamPushItem.setStatus(false);
30 streamPushItem.setStreamType("push"); 30 streamPushItem.setStreamType("push");
31 - streamPushItem.setCreateStamp(System.currentTimeMillis()); 31 + streamPushItem.setCreateStamp(System.currentTimeMillis()/1000);
32 streamPushItem.setMediaServerId(defaultMediaServerId); 32 streamPushItem.setMediaServerId(defaultMediaServerId);
33 streamPushItem.setName(streamPushExcelDto.getName()); 33 streamPushItem.setName(streamPushExcelDto.getName());
34 streamPushItem.setOriginType(2); 34 streamPushItem.setOriginType(2);
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
  View file @b90969f
@@ -40,7 +40,7 @@ public interface StreamPushMapper { @@ -40,7 +40,7 @@ public interface StreamPushMapper {
40 "</script>") 40 "</script>")
41 int delAll(List<StreamPushItem> streamPushItems); 41 int delAll(List<StreamPushItem> streamPushItems);
42 42
43 - @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream") 43 + @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream order by st.createStamp desc")
44 List<StreamPushItem> selectAll(); 44 List<StreamPushItem> selectAll();
45 45
46 @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=${enable}") 46 @Select("SELECT st.*, pgs.gbId, pgs.status, pgs.name, pgs.longitude, pgs.latitude FROM stream_push st LEFT JOIN gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=${enable}")