提交 4b3a059f authored 作者: 邓砥奕's avatar 邓砥奕

修改门禁延迟

上级 c99bdd2f
...@@ -135,7 +135,7 @@ public class AccessController { ...@@ -135,7 +135,7 @@ public class AccessController {
outPutCardIds.removeAll(canOutputCardIds); outPutCardIds.removeAll(canOutputCardIds);
List<DeviceLibrary> deviceLibraries = new ArrayList<>(); List<DeviceLibrary> deviceLibraries = new ArrayList<>();
outPutCardIds.forEach(s -> deviceLibraries.addAll(deviceLibraryDao.getAllByRfidCardId(s))); outPutCardIds.forEach(s -> deviceLibraries.addAll(deviceLibraryDao.getAllByRfidCardId(s)));
//获取最近1分钟报警的Id //获取最近10s报警的Id
List<Integer> ids = getLatestWarningDeviceIds(); List<Integer> ids = getLatestWarningDeviceIds();
//排除使用状态中的装备,映射成id //排除使用状态中的装备,映射成id
List<Integer> idList = deviceLibraries.stream().filter(deviceLibrary -> deviceLibrary.getLifeStatus()!=14).map(DeviceLibrary::getId).collect(Collectors.toList()); List<Integer> idList = deviceLibraries.stream().filter(deviceLibrary -> deviceLibrary.getLifeStatus()!=14).map(DeviceLibrary::getId).collect(Collectors.toList());
...@@ -198,12 +198,12 @@ public class AccessController { ...@@ -198,12 +198,12 @@ public class AccessController {
} }
/** /**
* 获取最近1分钟内出库异常的装备Id * 获取最近10s内出库异常的装备Id
*/ */
private List<Integer> getLatestWarningDeviceIds(){ private List<Integer> getLatestWarningDeviceIds(){
return libraryWarningLogDetailDao.findAll().stream().filter(libraryWarningLogDetail -> { return libraryWarningLogDetailDao.findAll().stream().filter(libraryWarningLogDetail -> {
Boolean isOutPut = "异常出库".equals(libraryWarningLogDetail.getInventoryResults()); Boolean isOutPut = "异常出库".equals(libraryWarningLogDetail.getInventoryResults());
Boolean isLatest = System.currentTimeMillis() - libraryWarningLogDetail.getUpdateTime().getTime()<60_000; Boolean isLatest = System.currentTimeMillis() - libraryWarningLogDetail.getUpdateTime().getTime()<10_000;
return isOutPut&&isLatest; return isOutPut&&isLatest;
}).map(LibraryWarningLogDetail::getDeviceId).collect(Collectors.toList()); }).map(LibraryWarningLogDetail::getDeviceId).collect(Collectors.toList());
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论