From e02d91bf57c1a2f2c60d79f596c25d08ac94c7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Thu, 19 Dec 2024 09:42:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B0=8F=E5=8C=BA=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/DistrictController.java | 29 +++++++++++++++++++ .../weixin/DistrictController.java | 16 ---------- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java index 90bd877e3..a35805605 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/DistrictController.java @@ -12,6 +12,7 @@ import com.fangjia.dal.mongo.model.*; import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto; import com.fangjia.open.model.AvgPriceQueryModel; import com.fangjia.open.model.BasicModel; +import com.fangjia.open.model.weixin.DistrictModel; import com.fangjia.open.util.CommonDtoUtils; import com.fangjia.service.datastore.RegionStatService; import com.fangjia.service.district.DistrictFacilitysService; @@ -20,6 +21,7 @@ import com.fangjia.service.district.RegionStatRentService; import com.fangjia.service.mongo.fangjia.AverageAnalyService; import com.fangjia.service.mongo.fangjia.RegionBlockService; +import com.fangjia.service.mongo.fangjia.SeaweedImagesService; import net.sf.json.JSONArray; import net.sf.json.JSONException; import net.sf.json.JSONObject; @@ -95,6 +97,7 @@ public class DistrictController { private RegionStatService regionStatService; private RegionStatRentService regionStatRentService; private DistrictFacilitysService districtFacilitysService; + private SeaweedImagesService seaweedImagesService; public static final String[] COLUMNS = { "id", "name", "estateType", "buildType", "licence", "buildArea", "allArea", @@ -1168,6 +1171,28 @@ public class DistrictController { return mav; } + /** + * 获取小区图片 + * + * @param districtModel + * @return + */ + public Object listPicAction(DistrictModel districtModel) { + RestfulModelAndView mav = new RestfulModelAndView(); + mav.setViewType("rest"); + if (StringUtils.isBlank(districtModel.getId())) { + mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "ID必须输入")); + return mav; + } + SeaweedImages seaweedImages = seaweedImagesService.findById(districtModel.getId()); + if (seaweedImages != null) { + mav.setModel(BasicModel.buildOKModel().setResult(seaweedImages.getOutPics())); + } else { + mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "图片数据不存在")); + } + return mav; + } + public Object addrFacilitysAction(DistrictSearchModel model, @Param(name = "city") String city, @Param(name = "address") String address) throws Exception{ RestfulModelAndView mav = new RestfulModelAndView(); @@ -1288,4 +1313,8 @@ public class DistrictController { public void setDistrictFacilitysService(DistrictFacilitysService districtFacilitysService) { this.districtFacilitysService = districtFacilitysService; } + + public void setSeaweedImagesService(SeaweedImagesService seaweedImagesService) { + this.seaweedImagesService = seaweedImagesService; + } } 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 3ddeeaaeb..ed11d51ae 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 @@ -102,22 +102,6 @@ public class DistrictController { return model; } - /** - * 获取小区图片 - * - * @param districtModel - * @return - */ - public Object listPicAction(DistrictModel districtModel) { - if (StringUtils.isBlank(districtModel.getId())) { - return null; - } - SeaweedImages seaweedImages = seaweedImagesService.findById(districtModel.getId()); - if (seaweedImages != null) { - return seaweedImages.getOutPics(); - } - return null; - } private List getDistrictByKeyword(String cat, String city, String keyword, int limit, final Double lng, final Double lat) {