接口优化

This commit is contained in:
2022-05-12 23:24:31 +08:00
parent 816616484f
commit 0fab2bc076
4 changed files with 273 additions and 5 deletions
@@ -1,6 +1,7 @@
package com.fangjia.open.controllers;
import com.fangjia.core.util.DateUtil;
import com.fangjia.core.util.HttpRequest;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.SortParam;
import com.fangjia.dal.common.DistrictKey;
@@ -14,6 +15,7 @@ import com.fangjia.open.model.BasicModel;
import com.fangjia.open.model.RestfulModelAndView;
import com.fangjia.service.fsh.DistrictNewPriceService;
import com.fangjia.service.open.PaiMaiService;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.bson.types.ObjectId;
@@ -204,10 +206,47 @@ public class AuctionController {
List<SortParam> sortParams = new ArrayList<SortParam>();
sortParams.add(new SortParam("startDate", false));
List<PaiMai> paimais = paiMaiService.findAll(params, sortParams, model.getLimit(), SEARCH_FIELDS);
if(paimais!=null && paimais.size()>0){
for(PaiMai paiMai : paimais){
Map<String, Object> map = standard(paiMai.getCity(), paiMai.getAddress());
if(map!=null){
paiMai.setHouseNum((String) map.get("buildingNumber"));
paiMai.setUnitNum((String) map.get("unitNumber"));
paiMai.setRoomNum((String) map.get("roomNumber"));
}
}
}
mav.setModel(BasicModel.buildOKModel().setResult(paimais));
return mav;
}
private Map standard(String city, String address){
HttpRequest request = new HttpRequest();
JSONObject json = null;
Map<String, String> params = new HashMap<String, String>();
params.put("city", city);
params.put("address", address);
try{
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8");
} catch(Exception e){
try {
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure", params, "UTF-8");
} catch(Exception ex){
ex.printStackTrace();
}
}
if (json != null) {
int code = json.getInt("status");
String msg = json.getString("msg");
if(json.containsKey("result")){
return (Map)json.get("result");
}
}
return null;
}
public void setPaiMaiService(PaiMaiService paiMaiService) {
this.paiMaiService = paiMaiService;
}
@@ -734,13 +734,13 @@ public class PropertyController {
districtInfoDto.setCommunity(district.getStreetCommunity());
districtInfoDto.setCommercialArea(district.getBusinessQuarter());
if (district.getHouseholdCount() != null) {
districtInfoDto.setTotalUnitCount(district.getHouseholdCount().toString());
districtInfoDto.setTotalUnitCount(SeaweedUtils.formatHouseholdCount(district.getHouseholdCount().toString()));
} else {
districtInfoDto.setTotalUnitCount("");
}
districtInfoDto.setManagementFee(district.getEstateCharge());
if (district.getCarSiteCount() != null) {
districtInfoDto.setParking(district.getCarSiteCount().toString());
districtInfoDto.setParking(SeaweedUtils.formatCarSiteCount(district.getCarSiteCount().toString()));
} else {
districtInfoDto.setParking("");
}
@@ -761,10 +761,10 @@ public class PropertyController {
districtInfoDto.setFinishBuildTime(district.getFinishBuildingDate());
districtInfoDto.setMoveinTime(district.getLiveDate());
districtInfoDto.setFloorSpace(district.getAllArea());
districtInfoDto.setFloorSpace(SeaweedUtils.formatAllArea(district.getAllArea()));
districtInfoDto.setConstructionSpace(district.getBuildArea());
districtInfoDto.setPlotRatio(district.getCubagePercent());
districtInfoDto.setGreenPercentage(district.getVirescencePercent());
districtInfoDto.setPlotRatio(SeaweedUtils.formatCubagePercent(district.getCubagePercent()));
districtInfoDto.setGreenPercentage(SeaweedUtils.formatVirescencePercent(district.getVirescencePercent()));
districtInfoDto.setPreSalePermit(district.getLicence());
districtInfoDto.setDeveloper(district.getDeveloper());
districtInfoDto.setDiscount(district.getDiscount());