Browse Source

汇总页接口排序

lmstack 3 years ago
parent
commit
6e0f44b01d
1 changed files with 11 additions and 9 deletions
  1. 11 9
      src/main/java/com/qx/didi/controller/ShowDataController.java

+ 11 - 9
src/main/java/com/qx/didi/controller/ShowDataController.java

@@ -67,16 +67,18 @@ public class ShowDataController {
         }
         List<ResultOriginData> resultOriginDataList = resultOriginDataService.list(resultOriginDataQueryWrapper);
         resultOriginDataList.forEach(p -> sns.add(p.getDeviceId()));
-        List<ResultInfo> resultInfos = resultInfoService.list(new QueryWrapper<ResultInfo>().in("sn", sns).orderBy(true, false, "status"));
-        List<String> sns2 = new ArrayList<>();
-        resultInfos.forEach(p -> sns2.add(p.getSn()));
-        sns2.forEach(p -> {
-            QueryParam param1 = new QueryParam();
-            param1.setSn(p);
+        if (!CollectionUtils.isEmpty(sns)) {
+            List<ResultInfo> resultInfos = resultInfoService.list(new QueryWrapper<ResultInfo>().in("sn", sns).orderBy(true, false, "status"));
+            List<String> sns2 = new ArrayList<>();
+            resultInfos.forEach(p -> sns2.add(p.getSn()));
+            sns2.forEach(p -> {
+                QueryParam param1 = new QueryParam();
+                param1.setSn(p);
 
-            ApiDTO apiDTO = getRight(param1);
-            responses.add((Response) apiDTO.getData());
-        });
+                ApiDTO apiDTO = getRight(param1);
+                responses.add((Response) apiDTO.getData());
+            });
+        }
         return ApiDTO.ok(responses);
     }