Merge branch 'open_v2' into 'master'

接口新增参数

See merge request !1175
This commit is contained in:
2025-09-22 15:31:21 +08:00
@@ -142,7 +142,7 @@ public class CommercialController {
return mav;
}
if (model.getSize()==null || model.getEstateType()==null ) {
mav.setModel(BasicModel.buildBadRequestModel("参数非法:地址,面积,商铺类型为必填项"));
mav.setModel(BasicModel.buildBadRequestModel("参数非法:面积,商铺类型为必填项"));
return mav;
}
@@ -165,7 +165,7 @@ public class CommercialController {
return mav;
}
if (model.getPassengerFlow() != null && (model.getLeaseStability() <0 || model.getLeaseStability() > 3)) {
if (model.getLeaseStability() != null && (model.getLeaseStability() <0 || model.getLeaseStability() > 3)) {
mav.setModel(BasicModel.buildBadRequestModel("租约稳定性取值非法,正确范围[0,3]"));
return mav;
}
@@ -179,6 +179,16 @@ public class CommercialController {
mav.setModel(BasicModel.buildBadRequestModel("商铺类型取值非法,正确范围[0,7]"));
return mav;
}
if (model.getDecorationCost()!=null && (model.getDecorationCost() <0 || model.getDecorationCost() > 1000)) {
mav.setModel(BasicModel.buildBadRequestModel("商铺装修费用取值非法,正确范围[0,1000]"));
return mav;
}
if (model.getDecorationYear()!=null && (model.getDecorationYear() <0 || model.getDecorationYear() > 50)) {
mav.setModel(BasicModel.buildBadRequestModel("商铺装修年限取值非法,正确范围[0,50]"));
return mav;
}
return mav;
}
@@ -197,6 +207,32 @@ public class CommercialController {
params.put("area", String.valueOf(model.getSize()));
params.put("estateType", String.valueOf(model.getEstateType()));
if(model.getPassengerFlow()!=null){
params.put("passengerFlow", String.valueOf(model.getPassengerFlow()));
}
if(model.getLeaseStability()!=null){
params.put("leaseStability", String.valueOf(model.getLeaseStability()));
}
if(model.getSellType()!=null){
params.put("sellType", String.valueOf(model.getSellType()));
}
if(model.getDecorationCost()!=null){
params.put("decorationCost", String.valueOf(model.getDecorationCost()));
}
if(model.getDecorationYear()!=null){
params.put("decorationYear", String.valueOf(model.getDecorationYear()));
}
if(model.getFloor()!=null){
params.put("floor", String.valueOf(model.getFloor()));
}
if(model.getMaxFloor()!=null){
params.put("height", String.valueOf(model.getMaxFloor()));
}
try {
json = request.getJsonContent("http://192.168.0.100:30020"+ uri, params, "UTF-8");
} catch (Exception e) {