Commit 91359e71 authored by 朱允伟's avatar 朱允伟

<dev> 生成接口请求参数默认值调整

parent 09c01550
...@@ -36,6 +36,7 @@ import org.springframework.web.client.RestTemplate; ...@@ -36,6 +36,7 @@ import org.springframework.web.client.RestTemplate;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import java.sql.*; import java.sql.*;
import java.time.temporal.ValueRange;
import java.util.Date; import java.util.Date;
import java.util.*; import java.util.*;
...@@ -643,8 +644,8 @@ public class ApiServiceApplicationImpl implements ApiApplication { ...@@ -643,8 +644,8 @@ public class ApiServiceApplicationImpl implements ApiApplication {
String operator = requestParam.getOperator(); String operator = requestParam.getOperator();
String name = requestParam.getName(); String name = requestParam.getName();
String value = inParam.get(name); String value = inParam.get(name);
if (StringUtils.isEmpty(value)) { if(null == value){
value = requestParam.getDefaultValue(); continue;
} }
if (i == 0) { if (i == 0) {
switch (operator) { switch (operator) {
...@@ -773,8 +774,8 @@ public class ApiServiceApplicationImpl implements ApiApplication { ...@@ -773,8 +774,8 @@ public class ApiServiceApplicationImpl implements ApiApplication {
String operator = requestParam.getOperator(); String operator = requestParam.getOperator();
String name = requestParam.getName(); String name = requestParam.getName();
String value = inParam.get(name); String value = inParam.get(name);
if (StringUtils.isEmpty(value)) { if(null == value){
value = requestParam.getDefaultValue(); continue;
} }
if (i == 0) { if (i == 0) {
sbSql.append(bindField).append(bindField).append(" ").append(operator).append(" ").append(value); sbSql.append(bindField).append(bindField).append(" ").append(operator).append(" ").append(value);
...@@ -845,8 +846,8 @@ public class ApiServiceApplicationImpl implements ApiApplication { ...@@ -845,8 +846,8 @@ public class ApiServiceApplicationImpl implements ApiApplication {
String name = requestParam.getName(); String name = requestParam.getName();
String value = inParam.get(name); String value = inParam.get(name);
if (null == value) { if (null == value) {
String defaultValue = requestParam.getDefaultValue(); Integer requried = requestParam.getRequried();
if (StringUtils.isEmpty(defaultValue)) { if(requried > 0){
log.error("接口参数:{}不可以为空", name); log.error("接口参数:{}不可以为空", name);
return false; return false;
} }
...@@ -865,8 +866,8 @@ public class ApiServiceApplicationImpl implements ApiApplication { ...@@ -865,8 +866,8 @@ public class ApiServiceApplicationImpl implements ApiApplication {
String name = requestParam.getName(); String name = requestParam.getName();
String value = inParam.get(name); String value = inParam.get(name);
if (null == value) { if (null == value) {
String defaultValue = requestParam.getDefaultValue(); Integer requried = requestParam.getRequried();
if (StringUtils.isEmpty(defaultValue)) { if(requried > 0){
log.error("接口参数:{}不可以为空", name); log.error("接口参数:{}不可以为空", name);
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment