tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-05-25 15:59:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref[storage] rewrite code of @ExcelFieldName

Browse Source
This commit is contained in:
aoyu
2023-01-10 15:33:11 +08:00
parent 5ef04e0b17
commit 5fde28f669
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
storage/src/main/java/com/zfoo/storage/interpreter/ResourceInterpreter.java
+19 -15
View File
@@ -109,25 +109,29 @@ public class ResourceInterpreter {
}
}
}
return fieldList.stream().filter(it1 -> fieldMap.keySet().stream().anyMatch(it -> {
var ans = false;
if (it1.isAnnotationPresent(ExcelFieldName.class)) {
ans |= it.equals(it1.getAnnotation(ExcelFieldName.class).value());
Collection<FieldInfo> fieldInfos=new ArrayList<>();
for(var field : fieldList){
var ans=false;
for(var fieldMapKey:fieldMap.keySet()){
if(field.isAnnotationPresent(ExcelFieldName.class)){
ans|=fieldMapKey.equals(field.getAnnotation(ExcelFieldName.class).value());
}
ans|=fieldMapKey.equals(field.getName());
}
ans |= it.equals(it1.getName());
return ans;
})).map(it1 -> {
if(ans==false)
continue;
String excelFieldName;
List<String> list = null;
if (it1.isAnnotationPresent(ExcelFieldName.class)) {
list = fieldMap.keySet().stream().filter(it -> it.equals(it1.getAnnotation(ExcelFieldName.class).value())).collect(Collectors.toList());
List<String> list=null;
if(field.isAnnotationPresent(ExcelFieldName.class)){
list=fieldMap.keySet().stream().filter(it->it.equals(field.getAnnotation(ExcelFieldName.class).value())).collect(Collectors.toList());
}
if (list == null || list.size() == 0) {
list = fieldMap.keySet().stream().filter(it -> it.equals(it1.getName())).collect(Collectors.toList());
if(list==null||list.size()==0){
list=fieldMap.keySet().stream().filter(it->it.equals(field.getName())).collect(Collectors.toList());
}
excelFieldName = list.get(0);
return new FieldInfo(fieldMap.get(excelFieldName), it1);
}).collect(Collectors.toList());
excelFieldName=list.get(0);
fieldInfos.add(new FieldInfo(fieldMap.get(excelFieldName), field));
}
return fieldInfos;
}
private static class FieldInfo {