From 19d18187bf7f3f51e9ebdfd7eef369d1b3cb6829 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 16 八月 2024 15:34:31 +0800 Subject: [PATCH] 批量数量调整为500 --- ycl-server/src/main/java/com/ycl/dataListener/CurrencyDataListener.java | 2 +- ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 10 ++++++++-- ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 7 +++---- ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/dataListener/CurrencyDataListener.java b/ycl-server/src/main/java/com/ycl/dataListener/CurrencyDataListener.java index 50ef882..b343155 100644 --- a/ycl-server/src/main/java/com/ycl/dataListener/CurrencyDataListener.java +++ b/ycl-server/src/main/java/com/ycl/dataListener/CurrencyDataListener.java @@ -24,7 +24,7 @@ /** * 姣忛殧100鏉″瓨鍌ㄦ暟鎹簱锛岀劧鍚庢竻鐞唋ist 锛屾柟渚垮唴瀛樺洖鏀� */ - private static final int BATCH_COUNT = 100; + private static final int BATCH_COUNT = 500; /** * 缂撳瓨鐨勬暟鎹� diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java index 506e616..b85ddb5 100644 --- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java +++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java @@ -5,6 +5,7 @@ import com.ycl.system.domain.group.Add; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotBlank; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import lombok.RequiredArgsConstructor; @@ -116,8 +117,13 @@ @PostMapping("/import/{unitId}") @ApiOperation(value = "瀵煎叆鏁版嵁", notes = "瀵煎叆鏁版嵁") - public Result importData(MultipartFile file, @PathVariable("unitId") Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException { - return ywPointService.importData(file, unitId, startTime, endTime, provinceTag, importantTag, importantCommandImageTag); + public Result importData(MultipartFile file, + @PathVariable("unitId") Integer unitId, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, + Boolean provinceTag, + Boolean importantCommandImageTag) throws IOException { + return ywPointService.importData(file, unitId, startTime, endTime, provinceTag, importantCommandImageTag); } } diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java index 0af0f0a..61e329d 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java @@ -121,5 +121,5 @@ * @param unitId 杩愮淮鍗曚綅id * @return */ - Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException; + Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantCommandImageTag) throws IOException; } diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java index 52af163..e41a9c8 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java @@ -245,9 +245,9 @@ } @Override - public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) throws IOException { + public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantCommandImageTag) throws IOException { Consumer<List<PointExport>> consumer = (dataList) -> { - this.updatePoint(dataList, unitId, startTime, endTime, provinceTag, importantTag, importantCommandImageTag); + this.updatePoint(dataList, unitId, startTime, endTime, provinceTag, importantCommandImageTag); }; EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll(); return Result.ok(); @@ -259,7 +259,7 @@ * @param dataList * @param unitId */ - private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantTag, Boolean importantCommandImageTag) { + private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime, Boolean provinceTag, Boolean importantCommandImageTag) { if (CollectionUtils.isEmpty(dataList)) { throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖"); } @@ -270,7 +270,6 @@ .set(YwPoint::getStartTime, startTime) .set(YwPoint::getEndTime, endTime) .set(YwPoint::getProvinceTag, provinceTag) - .set(YwPoint::getImportantTag, importantTag) .set(YwPoint::getImportantCommandImageTag, importantCommandImageTag) .update(); } -- Gitblit v1.8.0