|
@@ -47,8 +47,14 @@ public class ProjectAmountJob {
|
|
|
ProjectAmountUpdateTask updateTask = new ProjectAmountUpdateTask(updateIds);
|
|
|
forkJoinPool.invoke(insertTask);
|
|
|
forkJoinPool.invoke(updateTask);
|
|
|
- forkJoinPool.awaitTermination(2L, TimeUnit.HOURS);
|
|
|
forkJoinPool.shutdown();
|
|
|
+ int times = 0;
|
|
|
+ while(!forkJoinPool.awaitTermination(2L, TimeUnit.MINUTES)){
|
|
|
+ times ++;
|
|
|
+ if(times >= 60){
|
|
|
+ forkJoinPool.shutdownNow();
|
|
|
+ }
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
|
log.error(e.getMessage(),e);
|
|
|
forkJoinPool.shutdownNow();
|