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

feat：修正字典入库逻辑

Browse Source
This commit is contained in:
wangyu 2022-01-15 20:19:37 +08:00
parent e09b5efbfe
commit 273484b62e
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryProcessor.java
View File

@ -56,6 +56,7 @@ public class DictionaryProcessor implements InitializingBean {
.map(field -> field.getAnnotation(DictValue.class)) .map(field -> field.getAnnotation(DictValue.class))
.filter(annotation -> null != annotation && StringUtils.isNotBlank(annotation.value()) && .filter(annotation -> null != annotation && StringUtils.isNotBlank(annotation.value()) &&
BlankEnum.class != annotation.enumType()) BlankEnum.class != annotation.enumType())
.distinct(DictValue::enumType)
// 查找是否存在，不存在插入，存在无视 // 查找是否存在，不存在插入，存在无视
.flatMap(annotation -> dictionaryService .flatMap(annotation -> dictionaryService
.getByCode(annotation.value()) .getByCode(annotation.value())

2
flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java
View File

@ -1,5 +1,6 @@
package com.flyfish.framework.file.domain; package com.flyfish.framework.file.domain;
import com.flyfish.framework.annotations.Property;
import com.flyfish.framework.domain.base.AuditDomain; import com.flyfish.framework.domain.base.AuditDomain;
import lombok.*; import lombok.*;
import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Document;
@ -10,6 +11,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Builder @Builder
@Property(key = "name", value = "附件名称")
public class Attachment extends AuditDomain { public class Attachment extends AuditDomain {
/** /**

1
flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
View File

@ -222,6 +222,7 @@ public class BeanProperty {
Class<?> elementClass = ReflectionUtils.getGenericType(field).orElse(Object.class); Class<?> elementClass = ReflectionUtils.getGenericType(field).orElse(Object.class);
if (property.isAttachment(elementClass)) { if (property.isAttachment(elementClass)) {
property.prop("attachment", true); property.prop("attachment", true);
break;
} }
annotations annotations
.as(SubBean.class) .as(SubBean.class)