diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java index d5a0230..34b5362 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.List; +import java.util.concurrent.ExecutionException; /** * @Description: 业务看板 @@ -35,7 +36,7 @@ @ApiOperation("实时工作统计") @GetMapping("/workStatistics") - public ReturnDTO> workStatistics() { + public ReturnDTO> workStatistics() throws ExecutionException, InterruptedException { return ReturnUtil.success(boardService.workStatistics()); } @@ -72,7 +73,7 @@ @ApiOperation("实时工作统计导出") @GetMapping("/workStatistics/export") - public void workStatisticsExport() throws IOException { + public void workStatisticsExport() throws IOException, ExecutionException, InterruptedException { List list = boardService.workStatistics(); super.exportExcel(BoardWorkStatisticsResponse.class, list, ExportEnum.WORK_STATISTICS_EXPORT.getSheetName()); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java index d5a0230..34b5362 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.List; +import java.util.concurrent.ExecutionException; /** * @Description: 业务看板 @@ -35,7 +36,7 @@ @ApiOperation("实时工作统计") @GetMapping("/workStatistics") - public ReturnDTO> workStatistics() { + public ReturnDTO> workStatistics() throws ExecutionException, InterruptedException { return ReturnUtil.success(boardService.workStatistics()); } @@ -72,7 +73,7 @@ @ApiOperation("实时工作统计导出") @GetMapping("/workStatistics/export") - public void workStatisticsExport() throws IOException { + public void workStatisticsExport() throws IOException, ExecutionException, InterruptedException { List list = boardService.workStatistics(); super.exportExcel(BoardWorkStatisticsResponse.class, list, ExportEnum.WORK_STATISTICS_EXPORT.getSheetName()); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java index e883a12..321b0f1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java @@ -10,11 +10,13 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Map; +import java.util.concurrent.ForkJoinPool; import java.util.function.Function; /** @@ -96,4 +98,9 @@ }); } + @Bean + public ForkJoinPool forkJoinPool() { + return new ForkJoinPool(100); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java index d5a0230..34b5362 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessBoardController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.List; +import java.util.concurrent.ExecutionException; /** * @Description: 业务看板 @@ -35,7 +36,7 @@ @ApiOperation("实时工作统计") @GetMapping("/workStatistics") - public ReturnDTO> workStatistics() { + public ReturnDTO> workStatistics() throws ExecutionException, InterruptedException { return ReturnUtil.success(boardService.workStatistics()); } @@ -72,7 +73,7 @@ @ApiOperation("实时工作统计导出") @GetMapping("/workStatistics/export") - public void workStatisticsExport() throws IOException { + public void workStatisticsExport() throws IOException, ExecutionException, InterruptedException { List list = boardService.workStatistics(); super.exportExcel(BoardWorkStatisticsResponse.class, list, ExportEnum.WORK_STATISTICS_EXPORT.getSheetName()); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java index e883a12..321b0f1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/SpringContextUtil.java @@ -10,11 +10,13 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.util.List; import java.util.Map; +import java.util.concurrent.ForkJoinPool; import java.util.function.Function; /** @@ -96,4 +98,9 @@ }); } + @Bean + public ForkJoinPool forkJoinPool() { + return new ForkJoinPool(100); + } + } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index 1670281..f601d91 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -210,7 +210,7 @@