From 7ac13fd481720420a7c483951d4b9e3e5d81e9f1 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 29 May 2023 14:32:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/open/controllers/PropertyController.java | 10 +++++----- .../open/controllers/weixin/DistrictController.java | 2 -- .../fangjia-open/src/main/resources/urlrewrite2.0.xml | 6 ++++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index 5e3c7c3d7..e44529895 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -3668,11 +3668,11 @@ public class PropertyController { } else { b.setDirection(""); } - if (house.getPics() != null && !house.getPics().isEmpty()) { - b.setPic(transformPicsToFangJia(house.getPics().get(house.getPics().size() / 2))); - } else { - b.setPic(""); - } +// if (house.getPics() != null && !house.getPics().isEmpty()) { +// b.setPic(transformPicsToFangJia(house.getPics().get(house.getPics().size() / 2))); +// } else { +// b.setPic(""); +// } if (house.getPublishDate() != null) { if (new Date().before(house.getPublishDate())) { house.setPublishDate(house.getModificationDate()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java index 674834e68..6ad4b19bc 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/DistrictController.java @@ -141,7 +141,6 @@ public class DistrictController { } public Object districtDetailAction(DistrictModel districtModel,HttpServletRequest request,HttpServletResponse response) { - System.out.println("小区详情coming"); //id和name不能同时为空 if(StringUtils.isBlank(districtModel.getId()) && (StringUtils.isBlank(districtModel.getCityName()) || StringUtils.isBlank(districtModel.getName()))) { districtModel.setMsg("参数错误"); @@ -150,7 +149,6 @@ public class DistrictController { District district = null; if(StringUtils.isNotBlank(districtModel.getId())) { - System.out.println("小区详情1"); district = districtService.findById(districtModel.getId()); if(district != null) { diff --git a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml index c17530d88..22c9f3057 100644 --- a/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml +++ b/projects/fangjia-open/src/main/resources/urlrewrite2.0.xml @@ -43,5 +43,11 @@ /address/fiveDivisionStructure + + + /property/detail + + + \ No newline at end of file From 78d9968e302e133995c17c59fa77f08776fbd0d4 Mon Sep 17 00:00:00 2001 From: "shenjian@fangjia.com" Date: Wed, 31 May 2023 10:04:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=94=E6=83=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/AddrSvcController.java | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java index d17fb74f3..95d5b2ad4 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java @@ -11,7 +11,6 @@ import com.fangjia.open.model.RestfulModelAndView; import com.fangjia.open.util.CommonDtoUtils; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; -import org.springframework.stereotype.Controller; import java.util.HashMap; import java.util.Map; @@ -44,20 +43,20 @@ public class AddrSvcController { Map params = new HashMap(); params.put("city", model.getCity()); params.put("address", model.getAddress()); - try{ + try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structure/v2", params, "UTF-8"); if (json != null) { int code = json.getInt("status"); String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ + if (json.containsKey("result")) { basicModel.setResult(CommonDtoUtils.transformV(StructureDto.class, json.get("result"))); } mav.setModel(basicModel); } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } - } catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } @@ -83,20 +82,20 @@ public class AddrSvcController { Map params = new HashMap(); params.put("city", model.getCity()); params.put("address", model.getAddress()); - try{ + try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/fiveDivisionStructure/v2", params, "UTF-8"); if (json != null) { int code = json.getInt("status"); String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ + if (json.containsKey("result")) { basicModel.setResult(CommonDtoUtils.transformV(DistrictIdentifyDto.class, json.get("result"))); } mav.setModel(basicModel); } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } - } catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } @@ -121,20 +120,20 @@ public class AddrSvcController { Map params = new HashMap(); params.put("city", model.getCity()); params.put("address", model.getAddress()); - try{ + try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); if (json != null) { int code = json.getInt("status"); String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ + if (json.containsKey("result")) { basicModel.setResult(CommonDtoUtils.transformV(StructureAndCompleteDto.class, json.get("result"))); } mav.setModel(basicModel); } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } - } catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } @@ -157,20 +156,20 @@ public class AddrSvcController { Map params = new HashMap(); params.put("city", model.getCity()); params.put("address", model.getAddress()); - try{ + try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/addrVerify", params, "UTF-8"); if (json != null) { int code = json.getInt("status"); String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ + if (json.containsKey("result")) { basicModel.setResult(json.get("result")); } mav.setModel(basicModel); } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } - } catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } @@ -195,20 +194,20 @@ public class AddrSvcController { params.put("address", model.getAddress()); params.put("category", model.getCategory()); params.put("district", model.getSuggestDistrict()); - try{ + try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/match", params, "UTF-8"); if (json != null) { int code = json.getInt("status"); String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ + if (json.containsKey("result")) { basicModel.setResult(CommonDtoUtils.transformV(MatchedBuildingDto.class, json.get("result"))); } mav.setModel(basicModel); } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } - } catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } @@ -239,21 +238,24 @@ public class AddrSvcController { params.put("region", model.getRegion()); params.put("keywords", model.getKeyword()); params.put("page", "0"); - params.put("size", String.valueOf(model.getMax() == 0 ? 20 : (model.getMax() > 100 ? 100 : model.getMax()) )); - try{ + params.put("size", String.valueOf(model.getMax() == 0 ? 20 : (model.getMax() > 100 ? 100 : model.getMax()))); + try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/addressAssociation2", params, "UTF-8"); if (json != null) { int code = json.getInt("status"); String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); - if(json.containsKey("result")){ - basicModel.setResult(CommonDtoUtils.transformListV(DistrictDto.class, (JSONObject.fromObject(json.get("result"))).getJSONArray("content"))); + if (json.containsKey("result")) { + JSONObject result = (JSONObject.fromObject(json.get("result"))); + if (result.getInt("totalElements") > 0) { + basicModel.setResult(CommonDtoUtils.transformListV(DistrictDto.class, result.getJSONArray("content"))); + } } mav.setModel(basicModel); } else { mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); } - } catch(Exception e){ + } catch (Exception e) { e.printStackTrace(); mav.setModel(BasicModel.buildServerErrorModel().setMsg("服务升级中...")); }