城市区域价格改表
This commit is contained in:
+33
-49
@@ -452,18 +452,18 @@ public class CityController {
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Object avgPrice2Action(@Param(name = "city") String city, @Param(name = "periodCount") Integer periodCount,@Param(name = "periodType") String periodType) {
|
||||
public Object avgPrice2Action(@Param(name = "city") String city, @Param(name = "periodCount") Integer periodCount) {
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
mav.setViewType("rest");
|
||||
if (StringUtils.isBlank(city)) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("city不能为null"));
|
||||
return mav;
|
||||
}
|
||||
if(!RegionData.isCity(city)){
|
||||
if (!RegionData.isCity(city)) {
|
||||
String formatCity = RegionData.formatCity(city);
|
||||
if(StringUtils.isNotBlank(formatCity)){
|
||||
if (StringUtils.isNotBlank(formatCity)) {
|
||||
city = formatCity;
|
||||
}else{
|
||||
} else {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("city非法"));
|
||||
return mav;
|
||||
}
|
||||
@@ -473,57 +473,41 @@ public class CityController {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("city非法"));
|
||||
return mav;
|
||||
}
|
||||
if(null == periodCount || 0 == periodCount){
|
||||
periodCount = 1;
|
||||
}
|
||||
if(periodCount < 1 || periodCount>156){
|
||||
mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]"));
|
||||
return mav;
|
||||
}
|
||||
|
||||
if(StringUtils.isBlank(periodType)){
|
||||
periodType = "weekly";
|
||||
}else{
|
||||
if(!"weekly".equals(periodType) && !"monthly".equals(periodType)){
|
||||
mav.setModel(BasicModel.buildBadRequestModel("periodModel值非法,合法值为:weekly,monthly"));
|
||||
return mav;
|
||||
}
|
||||
}
|
||||
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
if("weekly".equals(periodType)){
|
||||
calendar.add(Calendar.DATE, -periodCount*7);
|
||||
}else{
|
||||
calendar.add(Calendar.MONTH, -periodCount);
|
||||
}
|
||||
|
||||
List<RegionStat> regionStats = regionStatService.findRegionBlockStat(city,null,null,calendar.getTime(),new Date(),periodType);
|
||||
|
||||
if (CollectionUtils.isEmpty(regionStats)) {
|
||||
if (null == periodCount || 0 == periodCount) {
|
||||
periodCount = 1;
|
||||
}
|
||||
if (periodCount < 1 || periodCount > 36) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-36]"));
|
||||
return mav;
|
||||
}
|
||||
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.add(Calendar.MONTH, -periodCount);
|
||||
|
||||
int year = calendar.get(Calendar.YEAR);
|
||||
int month = calendar.get(Calendar.MONTH) + 1; // 注意:月份从 0 开始,需要加 1
|
||||
int montyInt = year * 100 + month;
|
||||
List<CitySellStat> cityStats = citySellStatService.findNearCityStat(city, montyInt, periodCount);
|
||||
if (CollectionUtils.isEmpty(cityStats)) {
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.TARGET_DATA_NOT_EXIST, "该城市没有均价数据"));
|
||||
return mav;
|
||||
}
|
||||
|
||||
if(regionStats.size() > periodCount){
|
||||
regionStats = regionStats.subList(regionStats.size() - periodCount,regionStats.size());
|
||||
}
|
||||
List<Map<String,Object>> result = new ArrayList<Map<String,Object>>(periodCount);
|
||||
for (RegionStat regionStat : regionStats) {
|
||||
Map<String,Object> item = new LinkedHashMap<String,Object>();
|
||||
item.put("city", regionStat.getCity());
|
||||
item.put("avgPrice", String.valueOf(regionStat.getAvgPrice()));
|
||||
if("monthly".equals(periodType)){
|
||||
item.put("date", DateUtil.formatByPattern(regionStat.getWeekend(), "yyyy-MM"));
|
||||
}else{
|
||||
item.put("date", DateUtil.formatByPattern(regionStat.getWeekend(), "yyyy-MM-dd"));
|
||||
}
|
||||
item.put("changePercent", String.valueOf(regionStat.getMarkup() / 100d));
|
||||
result.add(item);
|
||||
}
|
||||
mav.setModel(BasicModel.buildOKModel().setResult(result));
|
||||
if (cityStats.size() > periodCount) {
|
||||
cityStats = cityStats.subList(cityStats.size() - periodCount, cityStats.size());
|
||||
}
|
||||
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(periodCount);
|
||||
for (CitySellStat cityStat : cityStats) {
|
||||
Map<String, Object> item = new LinkedHashMap<String, Object>();
|
||||
item.put("city", cityStat.getCity());
|
||||
item.put("avgPrice", String.valueOf(cityStat.getAvgPrice()));
|
||||
item.put("date", cityStat.getDate() / 100 + "-" + String.format("%02d", cityStat.getDate() % 100));
|
||||
item.put("changePercent", String.format("%.2f", cityStat.getMom() * 100));
|
||||
result.add(item);
|
||||
}
|
||||
mav.setModel(BasicModel.buildOKModel().setResult(result));
|
||||
return mav;
|
||||
}
|
||||
|
||||
/**
|
||||
* 城市均价范围Action
|
||||
*
|
||||
|
||||
+27
-35
@@ -17,10 +17,8 @@ import com.fangjia.service.datastore.RegionStatService;
|
||||
import com.fangjia.service.district.DistrictFacilitysService;
|
||||
import com.fangjia.service.district.DistrictStatRentService;
|
||||
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.*;
|
||||
|
||||
import com.fangjia.service.mongo.fangjia.SeaweedImagesService;
|
||||
import net.sf.json.JSONArray;
|
||||
import net.sf.json.JSONException;
|
||||
import net.sf.json.JSONObject;
|
||||
@@ -69,7 +67,6 @@ import com.fangjia.service.index.BoostQueryPolicy;
|
||||
import com.fangjia.service.menu.Menu;
|
||||
import com.fangjia.service.menu.MenuCategoryEnum;
|
||||
import com.fangjia.service.mongo.bkoff.ExtractDistrictService;
|
||||
import com.fangjia.service.mongo.fangjia.DistrictHouseService;
|
||||
import com.fangjia.service.open.DistrictBo;
|
||||
import com.fangjia.service.sql.ApiUserService;
|
||||
import com.fangjia.service.web.MenuService;
|
||||
@@ -94,6 +91,7 @@ public class DistrictController {
|
||||
private RegionStatRentService regionStatRentService;
|
||||
private DistrictFacilitysService districtFacilitysService;
|
||||
private SeaweedImagesService seaweedImagesService;
|
||||
private RegionStatTrendService regionStatTrendService;
|
||||
|
||||
|
||||
public static final String[] COLUMNS = {"id", "name", "estateType", "buildType", "licence", "buildArea", "allArea",
|
||||
@@ -692,42 +690,30 @@ public class DistrictController {
|
||||
if (model.getPeriodCount() == null) {
|
||||
model.setPeriodCount(1);
|
||||
}
|
||||
if (model.getPeriodCount() < 1 || model.getPeriodCount() > 156) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-156]"));
|
||||
if (model.getPeriodCount() < 1 || model.getPeriodCount() > 36) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("periodCount值不合法,取值范围是:[1-36]"));
|
||||
return mav;
|
||||
}
|
||||
|
||||
if (StringUtils.isBlank(model.getPeriodType())) {
|
||||
model.setPeriodType("weekly");
|
||||
} else {
|
||||
if (!"weekly".equals(model.getPeriodType()) && !"monthly".equals(model.getPeriodType())) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("periodModel值非法,合法值为:weekly,monthly"));
|
||||
return mav;
|
||||
}
|
||||
}
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
if ("weekly".equals(model.getPeriodType())) {
|
||||
calendar.add(Calendar.DATE, -model.getPeriodCount().intValue() * 7);
|
||||
} else {
|
||||
calendar.add(Calendar.MONTH, -model.getPeriodCount().intValue());
|
||||
}
|
||||
List<RegionStat> regionStats = regionStatService.findRegionBlockStat(model.getCity(), model.getDistrict(), null, calendar.getTime(), new Date(), model.getPeriodType());
|
||||
if (regionStats.size() > model.getPeriodCount()) {
|
||||
regionStats = regionStats.subList(regionStats.size() - model.getPeriodCount(), regionStats.size());
|
||||
calendar.add(Calendar.MONTH, -model.getPeriodCount());
|
||||
|
||||
int year = calendar.get(Calendar.YEAR);
|
||||
int month = calendar.get(Calendar.MONTH) + 1; // 注意:月份从 0 开始,需要加 1
|
||||
int montyInt = year * 100 + month;
|
||||
List<RegionStatTrend> datas = regionStatTrendService.getAllWithMonths(model.getCity(), region, model.getPeriodCount());
|
||||
|
||||
if (datas.size() > model.getPeriodCount()) {
|
||||
datas = datas.subList(datas.size() - model.getPeriodCount(), datas.size());
|
||||
}
|
||||
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(model.getPeriodCount());
|
||||
for (RegionStat regionStat : regionStats) {
|
||||
for (RegionStatTrend regionStat : datas) {
|
||||
Map<String, Object> item = new LinkedHashMap<String, Object>();
|
||||
item.put("city", regionStat.getCity());
|
||||
item.put("district", regionStat.getRegion());
|
||||
item.put("block", regionStat.getBlock());
|
||||
item.put("avgPrice", String.valueOf(regionStat.getAvgPrice()));
|
||||
if ("monthly".equals(model.getPeriodType())) {
|
||||
item.put("date", DateUtil.formatByPattern(regionStat.getWeekend(), "yyyy-MM"));
|
||||
} else {
|
||||
item.put("date", DateUtil.formatByPattern(regionStat.getWeekend(), "yyyy-MM-dd"));
|
||||
}
|
||||
item.put("changePercent", String.valueOf(regionStat.getMarkup() / 100d));
|
||||
item.put("date", regionStat.getDate() / 100 + "-" + String.format("%02d", regionStat.getDate() % 100));
|
||||
item.put("changePercent", String.format("%.2f", regionStat.getMom() * 100));
|
||||
result.add(item);
|
||||
}
|
||||
mav.setModel(BasicModel.buildOKModel().setResult(result));
|
||||
@@ -1186,7 +1172,7 @@ public class DistrictController {
|
||||
data.put("bus", model.getBus());
|
||||
data.put("bank", model.getBank());
|
||||
data.put("atm", model.getAtm());
|
||||
data.put("metro",model.getMetro());
|
||||
data.put("metro", model.getMetro());
|
||||
districtService.updateDistrictFacilitysById(data, model.getId());
|
||||
} else {
|
||||
DistrictFacilitys districtFacilitys = CommonDtoUtils.transformV(DistrictFacilitys.class, model);
|
||||
@@ -1199,7 +1185,7 @@ public class DistrictController {
|
||||
List<String> result = new ArrayList<String>();
|
||||
|
||||
if (value != null && !value.isEmpty()) {
|
||||
value = value.replaceAll("\\[", "").replaceAll("]", "").replaceAll(" ","");
|
||||
value = value.replaceAll("\\[", "").replaceAll("]", "").replaceAll(" ", "");
|
||||
String[] splitValues = value.split(","); // 按逗号分割
|
||||
|
||||
// 遍历数组并过滤空字符串
|
||||
@@ -1285,6 +1271,7 @@ public class DistrictController {
|
||||
}
|
||||
return mav;
|
||||
}
|
||||
|
||||
public Object deletePicAction(DistrictModel model) {
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
mav.setViewType("rest");
|
||||
@@ -1292,21 +1279,22 @@ public class DistrictController {
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "ID必须输入"));
|
||||
return mav;
|
||||
}
|
||||
seaweedImagesService.deleteImage(model.getId(),model.getUrl(),model.getPicType(), model.getRoomType());
|
||||
seaweedImagesService.deleteImage(model.getId(), model.getUrl(), model.getPicType(), model.getRoomType());
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.OK, "删除成功"));
|
||||
return mav;
|
||||
}
|
||||
|
||||
public Object addPicAction(DistrictModel model) {
|
||||
RestfulModelAndView mav = new RestfulModelAndView();
|
||||
mav.setViewType("rest");
|
||||
if (model.getImageUrls()!=null){
|
||||
if (model.getImageUrls() != null) {
|
||||
model.setImageUrls(convertToList(model.getImageUrls().toString()));
|
||||
}
|
||||
if (StringUtils.isBlank(model.getId())) {
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "ID必须输入"));
|
||||
return mav;
|
||||
}
|
||||
seaweedImagesService.addImage(model.getId(),model.getImageUrls(),model.getPicType(), model.getRoomType());
|
||||
seaweedImagesService.addImage(model.getId(), model.getImageUrls(), model.getPicType(), model.getRoomType());
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.OK, "添加成功"));
|
||||
return mav;
|
||||
}
|
||||
@@ -1435,4 +1423,8 @@ public class DistrictController {
|
||||
public void setSeaweedImagesService(SeaweedImagesService seaweedImagesService) {
|
||||
this.seaweedImagesService = seaweedImagesService;
|
||||
}
|
||||
|
||||
public void setRegionStatTrendService(RegionStatTrendService regionStatTrendService) {
|
||||
this.regionStatTrendService = regionStatTrendService;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user