admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

海康卡主修改

Browse Source
This commit is contained in:
GUO 2024-06-17 00:34:58 +08:00
parent 4da1379f67
commit 01012b1898
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
View File

@ -521,8 +521,7 @@ public class AsyncHikvision {
} }
} }
for (Future future : futures) { for (Future future : futures) {
while (!future.isDone()) { future.get();
}
} }
} }
Map<String, UfaceDev> devSnMap = allDevList.stream().collect(Collectors.toMap(UfaceDev::getDevSn, Function.identity())); Map<String, UfaceDev> devSnMap = allDevList.stream().collect(Collectors.toMap(UfaceDev::getDevSn, Function.identity()));
@ -545,8 +544,7 @@ public class AsyncHikvision {
futures.add(future); futures.add(future);
} }
for (Future future : futures) { for (Future future : futures) {
while (!future.isDone()) { future.get();
}
} }
} }
//下发完成 //下发完成

8
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
View File

@ -84,6 +84,7 @@ import java.math.BigDecimal;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -2252,9 +2253,14 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
Future future = workerInfoService.editWorkerInfoAsync(workerInfo); Future future = workerInfoService.editWorkerInfoAsync(workerInfo);
futures.add(future); futures.add(future);
} }
try {
for (Future future : futures) { for (Future future : futures) {
while (!future.isDone()) { future.get();
} }
} catch (InterruptedException e) {
throw new RuntimeException(e);
} catch (ExecutionException e) {
throw new RuntimeException(e);
} }
//通知 //通知
if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) { if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) {