小程序优化:最新租金与小区图片
This commit is contained in:
@@ -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<SeaweedImages> {
|
||||
|
||||
}
|
||||
@@ -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<SeaweedImages> implements SeaweedImagesDao{
|
||||
}
|
||||
@@ -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<String> floorplanPics;
|
||||
|
||||
private Date mDate;
|
||||
private String name;
|
||||
private List<String> 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<String> getFloorplanPics() {
|
||||
return floorplanPics;
|
||||
}
|
||||
|
||||
public void setFloorplanPics(List<String> 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<String> getOutPics() {
|
||||
return outPics;
|
||||
}
|
||||
|
||||
public void setOutPics(List<String> outPics) {
|
||||
this.outPics = outPics;
|
||||
}
|
||||
}
|
||||
+17
-10
@@ -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<DistrictStatRentBo> districtStatRentBos = districtStatRentService.findAllHouseTypeByDistrictStatRent(new DistrictKey(district));
|
||||
//处理图片链接
|
||||
List<String> 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<String> 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;
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -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);
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
<#if district.outPics?? && district.outPics?size gt 0>
|
||||
<#list district.outPics as pics>
|
||||
<#if pics_index < 6>
|
||||
<img src="${pics}">
|
||||
<img src="${pics}" style="width: 90% !important;">
|
||||
</#if>
|
||||
</#list>
|
||||
</#if>
|
||||
|
||||
+15
@@ -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);
|
||||
}
|
||||
+16
@@ -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;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user