henryC
/
flyfish-framework
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：新增值联动和扩展覆盖属性

This commit is contained in:
wangyu 2021-09-27 22:39:45 +08:00
parent 0aed9c613b
commit 1b8d5e165c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flyfish-web/src/main/java/com/flyfish/framework/beans/meta/SubBean.java
View File

@ -1,5 +1,6 @@
package com.flyfish.framework.beans.meta; package com.flyfish.framework.beans.meta;
import javax.validation.Valid;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
@ -9,5 +10,6 @@ import java.lang.annotation.*;
@Target({ElementType.FIELD}) @Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Valid
public @interface SubBean { public @interface SubBean {
} }

6
flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseServiceImpl.java
View File

@ -300,9 +300,11 @@ public class BaseServiceImpl<T extends Domain> implements BaseService<T> {
// 带有id的集合 // 带有id的集合
List<String> ids = entities.stream() List<String> ids = entities.stream()
.filter(Objects::nonNull) .filter(Objects::nonNull)
.map(Domain::getId).collect(Collectors.toList()); .map(Domain::getId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
// 过滤不存在的记录 // 过滤不存在的记录
Map<String, T> savedMap = CollectionUtils.isEmpty(ids) ? ((List<T>) repository.findAllById(ids)).stream() Map<String, T> savedMap = CollectionUtils.isNotEmpty(ids) ? ((List<T>) repository.findAllById(ids)).stream()
.collect(Collectors.toMap(Domain::getId, t -> t)) : Collections.emptyMap(); .collect(Collectors.toMap(Domain::getId, t -> t)) : Collections.emptyMap();
List<T> updating = entities.stream() List<T> updating = entities.stream()
.map(t -> { .map(t -> {