xucaiqin 1 ano atrás
pai
commit
ee8a41f80f

+ 8 - 3
iot-module/iot-module-stream/iot-module-stream-biz/src/main/java/com/middle/platform/stream/biz/service/impl/StreamMediaServiceImpl.java

@@ -18,6 +18,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -37,10 +38,14 @@ public class StreamMediaServiceImpl implements StreamMediaService {
     @Override
     public Object recordPage(StreamRecordPage streamRecordPage) {
         PageRes<RecordPageRes> pageRes = new PageRes<>();
-        //API调用
-        RecordPage recordPage = apiProxy.recordListPage(type, streamRecordPage.getPageSize(), streamRecordPage.getPage(), streamRecordPage.getPath());
         pageRes.setPageSize(streamRecordPage.getPageSize());
         pageRes.setPages(streamRecordPage.getPage());
+        //API调用
+        RecordPage recordPage = apiProxy.recordListPage(type, streamRecordPage.getPageSize(), streamRecordPage.getPage(), streamRecordPage.getPath());
+        if (Objects.isNull(recordPage)) {
+            pageRes.setList(new ArrayList<>());
+            return pageRes;
+        }
         pageRes.setTotal(recordPage.getTotalCount());
         if (CollUtil.isEmpty(recordPage.getFiles())) {
             pageRes.setList(new ArrayList<>());
@@ -70,7 +75,7 @@ public class StreamMediaServiceImpl implements StreamMediaService {
 
     @Override
     public void delete(String path) {
-         apiProxy.recordDelete(path);
+        apiProxy.recordDelete(path);
     }
 
     private String getUrl() {