2023-10-21 机柜修改分页错误。

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/fallback/RemoteLaboratoryFallbackFactory.java

@@ -537,6 +537,11 @@ public class RemoteLaboratoryFallbackFactory implements FallbackFactory<RemoteLa
             }
 
             @Override
+            public ResultData updateLocationState(WarningNoticeLogDto warningNoticeLogDto) {
+                return ResultData.fail("修改告警通知日志！"+ cause.getMessage());
+            }
+
+            @Override
             public ResultData getRemindData(Long keyId, Integer type) {
                 return ResultData.fail("获取告警次数失败！"+ cause.getMessage());
             }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpCabinetServiceImpl.java

@@ -88,14 +88,15 @@ public class HxpCabinetServiceImpl implements IHxpCabinetService {
         R <List <LinkedHashMap <String, String>>> cabinetLockList = remoteLaboratoryService.getHardwareByLockList(allMap);
         Predicate <R <List <LinkedHashMap <String, String>>>> predicate = b -> b.getData() != null && b.getData().size() > 0;
         if (predicate.test(cabinetLockList)) {
-            List <HxpCabinetVo> cabinetVoList = Optional.ofNullable(hxpCabinetVos).orElseGet(Collections::emptyList).parallelStream()
-                    .map(a -> {
+            Optional.ofNullable(hxpCabinetVos).orElseGet(Collections::emptyList).parallelStream()
+                    .forEach(a -> {
                                 Optional.ofNullable(cabinetLockList.getData()).orElseGet(Collections::emptyList)
                                         .stream().filter(b -> b.get("joinCabinetId").equals(a.getId() + "")).forEach(b -> a.getCabinetLockList().add(b));
-                                return a;
-                            }
-                    ).sorted(Comparator.comparing(HxpCabinetVo::getCreateTime).reversed()).collect(Collectors.toList());
-            return cabinetVoList;
+//                                return a;
+                            });
+
+//                    ).sorted(Comparator.comparing(HxpCabinetVo::getCreateTime).reversed()).collect(Collectors.toList());
+            return hxpCabinetVos;
         }
         return hxpCabinetVos;
     }