diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/SeaweedImagesDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/SeaweedImagesDao.java new file mode 100644 index 000000000..f4b8ba4b2 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/SeaweedImagesDao.java @@ -0,0 +1,9 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDao; +import com.fangjia.dal.mongo.model.DevelopmentZone; +import com.fangjia.dal.mongo.model.SeaweedImages; + +public interface SeaweedImagesDao extends MongoDao { + +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/SeaweedImagesDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/SeaweedImagesDaoImpl.java new file mode 100644 index 000000000..898d882c0 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/SeaweedImagesDaoImpl.java @@ -0,0 +1,7 @@ +package com.fangjia.dal.mongo.dao; + +import com.fangjia.dal.MongoDaoImpl; +import com.fangjia.dal.mongo.model.SeaweedImages; + +public class SeaweedImagesDaoImpl extends MongoDaoImpl implements SeaweedImagesDao{ +} diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SeaweedImages.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SeaweedImages.java new file mode 100644 index 000000000..33ff36050 --- /dev/null +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/SeaweedImages.java @@ -0,0 +1,90 @@ +package com.fangjia.dal.mongo.model; + +import com.fangjia.dal.MongoEntity; + +import javax.persistence.*; +import java.util.Date; +import java.util.List; + +@Entity +@Table(name = "fangjia_base.seaweed_images") +public class SeaweedImages implements MongoEntity { + + private static final long serialVersionUID = 4356189537384834754L; + private String id; + private String city; + private String district; + + private List floorplanPics; + + private Date mDate; + private String name; + private List outPics; + + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "_id") + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + + @Column(name = "city") + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + @Column(name = "district") + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } + + @Column(name = "floorplan_pics") + public List getFloorplanPics() { + return floorplanPics; + } + + public void setFloorplanPics(List floorplanPics) { + this.floorplanPics = floorplanPics; + } + + @Column(name = "m_date") + public Date getmDate() { + return mDate; + } + + public void setmDate(Date mDate) { + this.mDate = mDate; + } + + @Column(name = "name") + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Column(name = "out_pics") + public List getOutPics() { + return outPics; + } + + public void setOutPics(List outPics) { + this.outPics = outPics; + } +} 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 6ad4b19bc..b04b2992d 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 @@ -6,6 +6,7 @@ import com.fangjia.dal.QueryParam; import com.fangjia.dal.SdQuery; import com.fangjia.dal.SrQuery; import com.fangjia.dal.common.DistrictKey; +import com.fangjia.dal.mongo.model.SeaweedImages; import com.fangjia.dal.seaweed.model.District; import com.fangjia.dal.sql.model.FjtUsers; import com.fangjia.open.compatible.model.JsonModel; @@ -18,6 +19,7 @@ import com.fangjia.service.bo.DistrictStatRentBo; import com.fangjia.service.datastore.DistrictService; import com.fangjia.service.district.DistrictStatRentService; import com.fangjia.service.district.DistrictStatService; +import com.fangjia.service.mongo.fangjia.SeaweedImagesService; import com.fangjia.service.sql.FjtUsersService; import com.fangjia.service.sql.UserCityService; import com.fangjia.service.user.UsersInfoService; @@ -46,6 +48,8 @@ public class DistrictController { private UserCityService userCityService; private FjtUsersService fjtUsersService; + private SeaweedImagesService seaweedImagesService; + /********************************************* new start *****************************************************/ /** * 自动完成新实现 @@ -171,14 +175,15 @@ public class DistrictController { //小区租金 List districtStatRentBos = districtStatRentService.findAllHouseTypeByDistrictStatRent(new DistrictKey(district)); //处理图片链接 - List outPics = Lists.newArrayList(); - if(district.getOutPics() != null) { - for (String outPic : district.getOutPics()) { -// outPics.add(districtModel.getPicUrl() + DataUtil.encodePicUrl(outPic, "s", "district")); - outPics.add("http://static.fangjia.com/stc/fs/" + DataUtil.encodePicUrl(outPic, "s", "district")); - } - } - district.setOutPics(outPics); +// List outPics = Lists.newArrayList(); +// if(district.getOutPics() != null) { +// for (String outPic : district.getOutPics()) { +//// outPics.add(districtModel.getPicUrl() + DataUtil.encodePicUrl(outPic, "s", "district")); +// outPics.add("http://static.fangjia.com/stc/fs/" + DataUtil.encodePicUrl(outPic, "s", "district")); +// } +// } + SeaweedImages seaweedImages = seaweedImagesService.findById(district.getId()); + district.setOutPics(seaweedImages.getOutPics()); districtModel.setDistrict(district); districtModel.setDistrictStatBo(districtStatBo); districtModel.setDistrictStatRentBos(districtStatRentBos); @@ -321,6 +326,8 @@ public class DistrictController { public void setFjtUsersService(FjtUsersService fjtUsersService) { this.fjtUsersService = fjtUsersService; } - - + + public void setSeaweedImagesService(SeaweedImagesService seaweedImagesService) { + this.seaweedImagesService = seaweedImagesService; + } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index 460a95e78..7437ed56e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -338,10 +338,10 @@ public class UserController { } //测试时可以先去掉 - if (StringUtils.isBlank(username) || StringUtils.isBlank(pass) || StringUtils.isBlank(weiXinId)){ - resultModel.setMsg(Message.PARAM_NOT_NULL); - return resultModel; - } +// if (StringUtils.isBlank(username) || StringUtils.isBlank(pass) || StringUtils.isBlank(weiXinId)){ +// resultModel.setMsg(Message.PARAM_NOT_NULL); +// return resultModel; +// } try { FjtUsers user = usersInfoService.enterpriseLogin(username, pass); diff --git a/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl b/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl index 761d749d7..a4277bd1a 100644 --- a/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl +++ b/projects/fangjia-open/src/main/webapp/district/districtDetail.ftl @@ -89,7 +89,7 @@ <#if district.outPics?? && district.outPics?size gt 0> <#list district.outPics as pics> <#if pics_index < 6> - + diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeaweedImagesService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeaweedImagesService.java new file mode 100644 index 000000000..945437de1 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeaweedImagesService.java @@ -0,0 +1,15 @@ +package com.fangjia.service.mongo.fangjia; + +import com.fangjia.dal.mongo.model.DevelopmentZone; +import com.fangjia.dal.mongo.model.SeaweedImages; +import org.sothis.core.util.Pager; + +import java.util.List; +import java.util.Map; + +/** + * Created by dxy on 2015/6/8. + */ +public interface SeaweedImagesService { + public SeaweedImages findById(String id); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeaweedImagesServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeaweedImagesServiceImpl.java new file mode 100644 index 000000000..a58462040 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/SeaweedImagesServiceImpl.java @@ -0,0 +1,16 @@ +package com.fangjia.service.mongo.fangjia; + +import com.fangjia.dal.mongo.dao.SeaweedImagesDao; +import com.fangjia.dal.mongo.model.SeaweedImages; + +public class SeaweedImagesServiceImpl implements SeaweedImagesService { + private SeaweedImagesDao seaweedImagesDao; + @Override + public SeaweedImages findById(String id) { + return seaweedImagesDao.findById(id); + } + + public void setSeaweedImagesDao(SeaweedImagesDao seaweedImagesDao) { + this.seaweedImagesDao = seaweedImagesDao; + } +}