Browse Source

升级Mybatis-plus,旧版本有bug

dev
wxz 2 years ago
parent
commit
56db2cce00
  1. 2
      pom.xml
  2. 4
      tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
  3. 8
      tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java
  4. 4
      tduck-project/src/main/java/com/tduck/cloud/project/vo/RecycleProjectVO.java

2
pom.xml

@ -15,7 +15,7 @@
<spring-boot.version>2.3.5.RELEASE</spring-boot.version> <spring-boot.version>2.3.5.RELEASE</spring-boot.version>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<mybatis.plus.version>3.4.3</mybatis.plus.version> <mybatis.plus.version>3.5.1</mybatis.plus.version>
<guava.version>30.1.1-jre</guava.version> <guava.version>30.1.1-jre</guava.version>
<commons.lang3.vesrion>3.12.0</commons.lang3.vesrion> <commons.lang3.vesrion>3.12.0</commons.lang3.vesrion>
<commons.io.version>2.9.0</commons.io.version> <commons.io.version>2.9.0</commons.io.version>

4
tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java

@ -191,7 +191,7 @@ public class UserProjectController {
@Login @Login
@PostMapping("/user/project/publish") @PostMapping("/user/project/publish")
public Result publishProject(@RequestBody PublishProjectRequest request) { public Result publishProject(@RequestBody PublishProjectRequest request) {
int count = projectItemService long count = projectItemService
.count(Wrappers.<UserProjectItemEntity>lambdaQuery().eq(UserProjectItemEntity::getProjectKey, request.getKey())); .count(Wrappers.<UserProjectItemEntity>lambdaQuery().eq(UserProjectItemEntity::getProjectKey, request.getKey()));
if (count == CommonConstants.ConstantNumber.ZERO) { if (count == CommonConstants.ConstantNumber.ZERO) {
return Result.failed("无有效表单项,无法发布"); return Result.failed("无有效表单项,无法发布");
@ -529,7 +529,7 @@ public class UserProjectController {
.orderByDesc(BaseEntity::getUpdatedTime)); .orderByDesc(BaseEntity::getUpdatedTime));
List<UserProjectEntity> records = page.getRecords(); List<UserProjectEntity> records = page.getRecords();
List<RecycleProjectVO> projectVOList = records.stream().map(item -> { List<RecycleProjectVO> projectVOList = records.stream().map(item -> {
int count = projectResultService.count(Wrappers.<UserProjectResultEntity>lambdaQuery().eq(UserProjectResultEntity::getProjectKey, item.getKey())); long count = projectResultService.count(Wrappers.<UserProjectResultEntity>lambdaQuery().eq(UserProjectResultEntity::getProjectKey, item.getKey()));
return new RecycleProjectVO(item.getKey(), count, item.getName(), item.getCreatedTime(), item.getUpdatedTime()); return new RecycleProjectVO(item.getKey(), count, item.getName(), item.getCreatedTime(), item.getUpdatedTime());
}).collect(Collectors.toList()); }).collect(Collectors.toList());
page.setRecords(projectVOList); page.setRecords(projectVOList);

8
tduck-project/src/main/java/com/tduck/cloud/project/service/impl/UserProjectSettingServiceImpl.java

@ -63,7 +63,7 @@ public class UserProjectSettingServiceImpl extends ServiceImpl<UserProjectSettin
//收集数量达到 //收集数量达到
Integer timedQuantitativeQuantity = setting.getTimedQuantitativeQuantity(); Integer timedQuantitativeQuantity = setting.getTimedQuantitativeQuantity();
if (Optional.ofNullable(timedQuantitativeQuantity).isPresent() && 0 != timedQuantitativeQuantity) { if (Optional.ofNullable(timedQuantitativeQuantity).isPresent() && 0 != timedQuantitativeQuantity) {
int resultCount = userProjectResultService.count(Wrappers.<UserProjectResultEntity>lambdaQuery().eq(UserProjectResultEntity::getProjectKey, projectKey)); long resultCount = userProjectResultService.count(Wrappers.<UserProjectResultEntity>lambdaQuery().eq(UserProjectResultEntity::getProjectKey, projectKey));
if (resultCount >= timedQuantitativeQuantity) { if (resultCount >= timedQuantitativeQuantity) {
return Result.success(setting, StringUtils.isEmpty(setting.getTimedEndPromptText()) ? "收集数量已达到。" : setting.getTimedEndPromptText()); return Result.success(setting, StringUtils.isEmpty(setting.getTimedEndPromptText()) ? "收集数量已达到。" : setting.getTimedEndPromptText());
} }
@ -80,7 +80,7 @@ public class UserProjectSettingServiceImpl extends ServiceImpl<UserProjectSettin
wrapper.apply(StrUtil.format("date_format({},'%Y-%m-%d') = '{}'", wrapper.apply(StrUtil.format("date_format({},'%Y-%m-%d') = '{}'",
StrUtil.toUnderlineCase(BaseEntity.Fields.createdTime), DateUtil.today())); StrUtil.toUnderlineCase(BaseEntity.Fields.createdTime), DateUtil.today()));
} }
int writeCount = userProjectResultService.count(wrapper); long writeCount = userProjectResultService.count(wrapper);
if (CommonConstants.ConstantNumber.ONE <= writeCount) { if (CommonConstants.ConstantNumber.ONE <= writeCount) {
return Result.success(null, setting.getWriteOncePromptText()); return Result.success(null, setting.getWriteOncePromptText());
} }
@ -94,7 +94,7 @@ public class UserProjectSettingServiceImpl extends ServiceImpl<UserProjectSettin
wrapper.apply(StrUtil.format("date_format({},'%Y-%m-%d') = '{}'", wrapper.apply(StrUtil.format("date_format({},'%Y-%m-%d') = '{}'",
StrUtil.toUnderlineCase(BaseEntity.Fields.createdTime), DateUtil.today())); StrUtil.toUnderlineCase(BaseEntity.Fields.createdTime), DateUtil.today()));
} }
int writeCount = userProjectResultService.count(wrapper); long writeCount = userProjectResultService.count(wrapper);
if (CommonConstants.ConstantNumber.ONE <= writeCount) { if (CommonConstants.ConstantNumber.ONE <= writeCount) {
return Result.success(null, setting.getWriteOncePromptText()); return Result.success(null, setting.getWriteOncePromptText());
} }
@ -104,7 +104,7 @@ public class UserProjectSettingServiceImpl extends ServiceImpl<UserProjectSettin
LambdaQueryWrapper<UserProjectResultEntity> wrapper = Wrappers.<UserProjectResultEntity>lambdaQuery() LambdaQueryWrapper<UserProjectResultEntity> wrapper = Wrappers.<UserProjectResultEntity>lambdaQuery()
.eq(UserProjectResultEntity::getProjectKey, projectKey) .eq(UserProjectResultEntity::getProjectKey, projectKey)
.eq(UserProjectResultEntity::getWxOpenId, wxOpenId); .eq(UserProjectResultEntity::getWxOpenId, wxOpenId);
int writeCount = userProjectResultService.count(wrapper); long writeCount = userProjectResultService.count(wrapper);
if (CommonConstants.ConstantNumber.ONE <= writeCount) { if (CommonConstants.ConstantNumber.ONE <= writeCount) {
return Result.success(null, "已经填写过,无法再次填写"); return Result.success(null, "已经填写过,无法再次填写");
} }

4
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; 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.key = key;
this.resultCount = resultCount; this.resultCount = resultCount;
this.name = name; this.name = name;

Loading…
Cancel
Save