Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 增加必填字段的判断,解决生成的文档中请求参数为"-d'null'"的异常 #59

Closed
wants to merge 1 commit into from
Closed

fix: 增加必填字段的判断,解决生成的文档中请求参数为"-d'null'"的异常 #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/main/java/org/word/service/impl/WordServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,8 @@
import org.word.utils.JsonUtils;

import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.Map.Entry;
import java.util.TreeMap;
import java.util.stream.Collectors;

/**
Expand Down Expand Up @@ -427,8 +421,10 @@ private ModelAttr getAndPutModelAttr(Map<String, Map<String, Object>> swaggerMap
if (modeProperties == null) {
return null;
}
//必填字段
List<String> requiredProps = (List<String>)swaggerMap.get(modeName).get("required");

List<ModelAttr> attrList = getModelAttrs(swaggerMap, resMap, modeAttr, modeProperties);
List<ModelAttr> attrList = getModelAttrs(swaggerMap, resMap, modeAttr, modeProperties,requiredProps);
List allOf = (List) swaggerMap.get(modeName).get("allOf");
if(allOf!=null){
for (int i = 0; i < allOf.size(); i++) {
Expand All @@ -438,7 +434,8 @@ private ModelAttr getAndPutModelAttr(Map<String, Map<String, Object>> swaggerMap
//截取 #/definitions/ 后面的
String clsName = refName.substring(14);
Map<String, Object> modeProperties1 = (Map<String, Object>) swaggerMap.get(clsName).get("properties");
List<ModelAttr> attrList1 = getModelAttrs(swaggerMap, resMap, modeAttr, modeProperties1);
requiredProps = (List<String>)swaggerMap.get(clsName).get("required");
List<ModelAttr> attrList1 = getModelAttrs(swaggerMap, resMap, modeAttr, modeProperties1,requiredProps);
if(attrList1!=null && attrList!=null){
attrList.addAll(attrList1);
}else if(attrList==null && attrList1!=null){
Expand All @@ -456,7 +453,7 @@ private ModelAttr getAndPutModelAttr(Map<String, Map<String, Object>> swaggerMap
return modeAttr;
}

private List<ModelAttr> getModelAttrs(Map<String, Map<String, Object>> swaggerMap, Map<String, ModelAttr> resMap, ModelAttr modeAttr, Map<String, Object> modeProperties) {
private List<ModelAttr> getModelAttrs(Map<String, Map<String, Object>> swaggerMap, Map<String, ModelAttr> resMap, ModelAttr modeAttr, Map<String, Object> modeProperties,List<String> requiredProps) {
Iterator<Entry<String, Object>> mIt = modeProperties.entrySet().iterator();

List<ModelAttr> attrList = new ArrayList<>();
Expand All @@ -472,6 +469,9 @@ private List<ModelAttr> getModelAttrs(Map<String, Map<String, Object>> swaggerMa
child.setType(child.getType() + "(" + attrInfoMap.get("format") + ")");
}
child.setType(StringUtils.defaultIfBlank(child.getType(), "object"));
if (requiredProps != null && requiredProps.contains(mEntry.getKey())) {
child.setRequire(true);
}

Object ref = attrInfoMap.get("$ref");
Object items = attrInfoMap.get("items");
Expand Down Expand Up @@ -616,6 +616,7 @@ private Object getValue(String type, ModelAttr modelAttr) {
}
list.add(map);
return list;
case "body":
case "object":
map = new LinkedHashMap<>();
if (modelAttr != null && !CollectionUtils.isEmpty(modelAttr.getProperties())) {
Expand Down