diff --git a/pom.xml b/pom.xml index 0beef44..b34356f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 2.3.5.RELEASE 1.8 1.8 - 3.4.3 + 3.5.1 30.1.1-jre 3.12.0 2.9.0 diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java index 365d968..38d3dd4 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java @@ -191,7 +191,7 @@ public class UserProjectController { @Login @PostMapping("/user/project/publish") public Result publishProject(@RequestBody PublishProjectRequest request) { - int count = projectItemService + long count = projectItemService .count(Wrappers.lambdaQuery().eq(UserProjectItemEntity::getProjectKey, request.getKey())); if (count == CommonConstants.ConstantNumber.ZERO) { return Result.failed("无有效表单项,无法发布"); @@ -529,7 +529,7 @@ public class UserProjectController { .orderByDesc(BaseEntity::getUpdatedTime)); List records = page.getRecords(); List projectVOList = records.stream().map(item -> { - int count = projectResultService.count(Wrappers.lambdaQuery().eq(UserProjectResultEntity::getProjectKey, item.getKey())); + long count = projectResultService.count(Wrappers.lambdaQuery().eq(UserProjectResultEntity::getProjectKey, item.getKey())); return new RecycleProjectVO(item.getKey(), count, item.getName(), item.getCreatedTime(), item.getUpdatedTime()); }).collect(Collectors.toList()); page.setRecords(projectVOList); diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java index 8dc88f2..db743df 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java @@ -63,7 +63,7 @@ public class UserProjectSettingServiceImpl extends ServiceImpllambdaQuery().eq(UserProjectResultEntity::getProjectKey, projectKey)); + long resultCount = userProjectResultService.count(Wrappers.lambdaQuery().eq(UserProjectResultEntity::getProjectKey, projectKey)); if (resultCount >= timedQuantitativeQuantity) { return Result.success(setting, StringUtils.isEmpty(setting.getTimedEndPromptText()) ? "收集数量已达到。" : setting.getTimedEndPromptText()); } @@ -80,7 +80,7 @@ public class UserProjectSettingServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery() .eq(UserProjectResultEntity::getProjectKey, projectKey) .eq(UserProjectResultEntity::getWxOpenId, wxOpenId); - int writeCount = userProjectResultService.count(wrapper); + long writeCount = userProjectResultService.count(wrapper); if (CommonConstants.ConstantNumber.ONE <= writeCount) { return Result.success(null, "已经填写过,无法再次填写"); } diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/vo/RecycleProjectVO.java b/tduck-project/src/main/java/com/tduck/cloud/project/vo/RecycleProjectVO.java index 3b16215..29de417 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/vo/RecycleProjectVO.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/vo/RecycleProjectVO.java @@ -18,11 +18,11 @@ public class RecycleProjectVO extends BaseEntity { /*** * 收集数量 */ - private Integer resultCount; + private Long resultCount; private String name; - public RecycleProjectVO(String key, int resultCount, String name, LocalDateTime createdTime, LocalDateTime updatedTime) { + public RecycleProjectVO(String key, Long resultCount, String name, LocalDateTime createdTime, LocalDateTime updatedTime) { this.key = key; this.resultCount = resultCount; this.name = name;