Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
+25
-3
@@ -9,6 +9,7 @@ import com.fangjia.dal.mongo.model.Evaluation;
|
|||||||
import com.fangjia.dal.mongo.model.RentDealPrice;
|
import com.fangjia.dal.mongo.model.RentDealPrice;
|
||||||
import com.fangjia.dal.seawater.model.Seawater;
|
import com.fangjia.dal.seawater.model.Seawater;
|
||||||
import com.fangjia.dal.seaweed.model.District;
|
import com.fangjia.dal.seaweed.model.District;
|
||||||
|
import com.fangjia.open.APIConstant;
|
||||||
import com.fangjia.open.compatible.model.JsonModel;
|
import com.fangjia.open.compatible.model.JsonModel;
|
||||||
import com.fangjia.open.dto.DistrictHouseDtao;
|
import com.fangjia.open.dto.DistrictHouseDtao;
|
||||||
import com.fangjia.open.interceptors.AuthenticationBean;
|
import com.fangjia.open.interceptors.AuthenticationBean;
|
||||||
@@ -30,7 +31,6 @@ import org.apache.batik.transcoder.Transcoder;
|
|||||||
import org.apache.batik.transcoder.TranscoderException;
|
import org.apache.batik.transcoder.TranscoderException;
|
||||||
import org.apache.batik.transcoder.TranscoderInput;
|
import org.apache.batik.transcoder.TranscoderInput;
|
||||||
import org.apache.batik.transcoder.TranscoderOutput;
|
import org.apache.batik.transcoder.TranscoderOutput;
|
||||||
import org.apache.batik.transcoder.image.JPEGTranscoder;
|
|
||||||
import org.apache.batik.transcoder.image.PNGTranscoder;
|
import org.apache.batik.transcoder.image.PNGTranscoder;
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.apache.lucene.index.Term;
|
import org.apache.lucene.index.Term;
|
||||||
@@ -46,10 +46,10 @@ import org.sothis.web.mvc.annotation.Param;
|
|||||||
import org.xhtmlrenderer.pdf.ITextFontResolver;
|
import org.xhtmlrenderer.pdf.ITextFontResolver;
|
||||||
import org.xhtmlrenderer.pdf.ITextRenderer;
|
import org.xhtmlrenderer.pdf.ITextRenderer;
|
||||||
|
|
||||||
import javax.servlet.ServletOutputStream;
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
@@ -87,7 +87,29 @@ public class CcbRentController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Object downloadPageAction(PropertyEvaluationModel result, HttpServletRequest request, @Param(name = "city") String city, @Param(name = "district") String districtStr,
|
public Object evaluateRentAction(com.fangjia.open.model.PropertyEvaluationModel model, HttpServletRequest request)throws NumberFormatException, IllegalAccessException {
|
||||||
|
String result = null;
|
||||||
|
HttpRequest httpRequest = new HttpRequest();
|
||||||
|
try {
|
||||||
|
Map<String, String> headers = new HashMap<String, String>();
|
||||||
|
|
||||||
|
final String path = "http://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath();
|
||||||
|
String url = path + "/property/evaluateRent?token=" + APIConstant.SUPER_USER_TOKEN + "&__refresh_cache=1";
|
||||||
|
Map<String, String> params = new HashMap<String, String>();
|
||||||
|
params = org.apache.commons.beanutils.BeanUtils.describe(model);
|
||||||
|
//params.put("request", JsonUtils.httpParameterToJSONObject(request));
|
||||||
|
result = httpRequest.post(url, params, headers,"UTF-8");
|
||||||
|
} catch (HttpRequestException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
} catch (NoSuchMethodException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
} catch (InvocationTargetException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Object downloadPageAction(PropertyEvaluationModel result, HttpServletRequest request, @Param(name = "city") String city, @Param(name = "district") String districtStr,
|
||||||
@Param(name = "name") String name, @Param(name = "address") String address,
|
@Param(name = "name") String name, @Param(name = "address") String address,
|
||||||
@Param(name = "size") Double size, @Param(name = "floor") Integer floor, @Param(name = "height") Integer height, @Param(name = "room") Integer room,
|
@Param(name = "size") Double size, @Param(name = "floor") Integer floor, @Param(name = "height") Integer height, @Param(name = "room") Integer room,
|
||||||
@Param(name = "hall") Integer hall, @Param(name = "toilet") Integer toilet, @Param(name = "direction") String direction, @Param(name = "fitment") String fitment, @Param(name = "chartImgUrl") String chartImgUrl) {
|
@Param(name = "hall") Integer hall, @Param(name = "toilet") Integer toilet, @Param(name = "direction") String direction, @Param(name = "fitment") String fitment, @Param(name = "chartImgUrl") String chartImgUrl) {
|
||||||
|
|||||||
@@ -260,7 +260,7 @@
|
|||||||
$("#evaluateBtn").prop("disabled", true)
|
$("#evaluateBtn").prop("disabled", true)
|
||||||
$.ajax({
|
$.ajax({
|
||||||
// 注意需要加..
|
// 注意需要加..
|
||||||
url: '../property/evaluateRent',
|
url: '../ccbRent/evaluateRent',
|
||||||
data:$("#evaluateForm").serialize(),
|
data:$("#evaluateForm").serialize(),
|
||||||
dataType:"json",
|
dataType:"json",
|
||||||
type:"post",
|
type:"post",
|
||||||
|
|||||||
Reference in New Issue
Block a user