Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into new_fjw

# Conflicts:
#	projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java
#	projects/fangjia-coresite/src/main/webapp/index.ftl
#	projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java
This commit is contained in:
2024-07-23 11:40:47 +08:00
371 changed files with 41387 additions and 7272 deletions
+5
View File
@@ -178,6 +178,11 @@
<version>1.0.0</version>
<classifier>jdk18</classifier>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>4.0.1</version>
</dependency>
</dependencies>
<repositories>
<repository>
File diff suppressed because it is too large Load Diff
@@ -602,6 +602,18 @@ public class AvgPriceUpdateController {
calcCommandService.save(cmds);
json.put("msg", "任务保存成功,共保存" + cmds.size() + "条任务");
//均价修改,让小区也修改,为了福州可以识别被修改小区
if(commands.size()>0){
for (int i = 0, len = commands.size(); i < len; i++) {
JSONObject command = (JSONObject) commands.get(i);
if(command.containsKey("id")){
Map<String, Object> udata = new HashMap<String, Object>();
udata.put("modificationDate", new Date());
districtService.updateById(udata, command.getString("id"));
}
}
}
return model;
}
@@ -0,0 +1,175 @@
package com.fangjia.bkoff.controllers;
import com.fangjia.bkoff.model.ApiUserModel;
import com.fangjia.bkoff.model.BuildingRatioModel;
import com.fangjia.dal.mongo.model.bkoff.BuildingRatio;
import com.fangjia.dal.sql.model.User;
import com.fangjia.service.bo.BuildingRatioBo;
import com.fangjia.service.mongo.bkoff.BuildingRatioService;
import org.apache.commons.lang.StringUtils;
import java.net.URLEncoder;
import java.util.*;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
public class BuildingRatioController {
private BuildingRatioService buildingRatioService;
/**
* 新建楼栋系数信息
*
* @param model
* @return
*/
public Object doAddAction(BuildingRatioModel model) throws Exception {
try {
if(checkBuildingNameAction(model)){
model.redirect("/buildingRatio/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8"));
return model;
}
Date date = new Date();
BuildingRatio buildingRatio = new BuildingRatio();
buildingRatio.setCity(model.getCity_name());
buildingRatio.setRegion(model.getRegion());
buildingRatio.setDistrict(model.getDistrict());
buildingRatio.setBuilding_name(model.getBuilding_name());
buildingRatio.setRatio(model.getRatio());
buildingRatio.setC_date(date);
buildingRatio.setM_date(date);
buildingRatio.setCreate_user(model.getCreate_user());
buildingRatio.setNote(model.getNote());
buildingRatio.setBuilding_avg_price(model.getBuilding_avg_price());
buildingRatio.setAvg_price(model.getAvg_price());
this.buildingRatioService.save(buildingRatio);
model.setMsg("新建成功!");
} catch (Exception e) {
e.printStackTrace();
model.setMsg("新建失败!");
}
model.redirect("/buildingRatio/add?msg=" + URLEncoder.encode(model.getMsg(), "UTF-8"));
return model;
}
public Object doDeleteAction(BuildingRatioModel model){
if(StringUtils.isNotBlank(model.getId())){
this.buildingRatioService.deleteById(model.getId());
}
model.setViewType("redirect");
model.setViewParam("location","/buildingRatio/list");
return model;
}
/**
* 修改楼栋系数信息
*
* @param model
* @return
*/
public Object updateAction(BuildingRatioModel model) throws Exception {
Map<String, Object> data_buildingRatio = new HashMap<String, Object>();
data_buildingRatio.put("id", model.getId());
data_buildingRatio.put("city", model.getCity_name());
data_buildingRatio.put("region", model.getRegion());
data_buildingRatio.put("district", model.getDistrict());
data_buildingRatio.put("building_name", model.getBuilding_name());
data_buildingRatio.put("building_avg_price", model.getBuilding_avg_price());
data_buildingRatio.put("avg_price", model.getAvg_price());
data_buildingRatio.put("ratio", model.getRatio());
data_buildingRatio.put("m_date", new Date());
data_buildingRatio.put("create_user", model.getCreate_user());
data_buildingRatio.put("note", model.getNote());
this.buildingRatioService.saveOrUpdateByBuildingName(model.getCity_name(),model.getRegion(),model.getDistrict(),model.getBuilding_name(), data_buildingRatio);
model.setViewType("redirect");
model.setViewParam("location", "/buildingRatio/list");
return model;
}
public Object listAction(BuildingRatioModel model) {
List<BuildingRatio> buildingRatioList = this.buildingRatioService.findAllByBuildingName(model.getCity_name(),model.getRegion(),model.getDistrict(),model.getBuilding_name());
List<BuildingRatioBo> buildingRatioBoList = new ArrayList<BuildingRatioBo>();
for (BuildingRatio buildingRatio : buildingRatioList) {
BuildingRatioBo bo = new BuildingRatioBo();
bo.setId(buildingRatio.getId());
bo.setCity_name(buildingRatio.getCity());
bo.setRegion(buildingRatio.getRegion());
bo.setDistrict(buildingRatio.getDistrict());
bo.setBuilding_name(buildingRatio.getBuilding_name());
bo.setBuilding_avg_price(buildingRatio.getBuilding_avg_price());
bo.setAvg_price(buildingRatio.getAvg_price());
bo.setRatio(buildingRatio.getRatio());
bo.setC_date(buildingRatio.getC_date());
bo.setM_date(buildingRatio.getM_date());
bo.setCreate_user(buildingRatio.getCreate_user());
bo.setNote(buildingRatio.getNote());
buildingRatioBoList.add(bo);
}
model.setBuildingRatioBoList(buildingRatioBoList);
return model;
}
public Object addAction(BuildingRatioModel model) {
return model;
}
/**
* 编辑api用户信息
*
* @param model
* @return
*/
public Object editAction(BuildingRatioModel model) {
BuildingRatio buildingRatio = this.buildingRatioService.findBuildingRatioById(model.getId());
BuildingRatioBo bo = new BuildingRatioBo();
bo.setId(buildingRatio.getId());
bo.setCity_name(buildingRatio.getCity());
bo.setRegion(buildingRatio.getRegion());
bo.setDistrict(buildingRatio.getDistrict());
bo.setBuilding_name(buildingRatio.getBuilding_name());
bo.setBuilding_avg_price(buildingRatio.getBuilding_avg_price());
bo.setAvg_price(buildingRatio.getAvg_price());
bo.setRatio(buildingRatio.getRatio());
bo.setCreate_user(buildingRatio.getCreate_user());
bo.setNote(buildingRatio.getNote());
model.setBuildingRatioBo(bo);
if (StringUtils.isNotBlank(model.getMsg()) && model.getMsg().equals("success")) {
model.setMsg("更新成功!");
}
return model;
}
public boolean checkBuildingNameAction(BuildingRatioModel model) {
model.setViewType("json");
model.setViewParam("config", null);
List<BuildingRatio> buildingRatioList = buildingRatioService.findAllByBuildingName(model.getCity_name(),model.getRegion(),model.getDistrict(),model.getBuilding_name());
if (buildingRatioList.size()>0) {
model.setMsg("此楼栋名称已经存在!");
return true;
}
return false;
}
public BuildingRatioService getBuildingRatioService() {
return buildingRatioService;
}
public void setBuildingRatioService(BuildingRatioService buildingRatioService) {
this.buildingRatioService = buildingRatioService;
}
}
@@ -618,8 +618,9 @@ public class DataController {
System.out.println ( "IOException." + e );
} finally {
try {
if (os != null)
if(os != null) {
os.close();
}
if(fos != null){
fos.close();
}
@@ -840,21 +841,40 @@ public class DataController {
HSSFRow onerow = s.createRow(0);
int oneRowIndex = 0;
Map displayMap = getFliedDisplay();
for(String key : outfields){
if(cat.equals("商铺")){
if(key.equals("bedKind")){
continue;
}
}
String display = (String) displayMap.get(key);
if(StringUtils.isNotBlank(display)){
onerow.createCell((short)oneRowIndex).setCellValue(display);
}else{
onerow.createCell((short)oneRowIndex).setCellValue(key);
}
oneRowIndex ++;
}
Map displayMap = getFliedDisplay(cat);
/*
以displayMap为准 移除outfields中多余字段
*/
Iterator<String> it = outfields.iterator();
while(it.hasNext()) {
String key = it.next();
String display = (String) displayMap.get(key);
if (StringUtils.isNotBlank(display)) {
onerow.createCell((short)oneRowIndex).setCellValue(display);
oneRowIndex ++;
}else{
it.remove();
}
}
//因 写字楼导出仅展示写字楼后台的字段需求 改动
// for(String key : outfields){
// if(cat.equals("商铺")){
// if(key.equals("bedKind")){
// continue;
// }
// }
// String display = (String) displayMap.get(key);
// if(StringUtils.isNotBlank(display)){
// onerow.createCell((short)oneRowIndex).setCellValue(display);
// }else{
// onerow.createCell((short)oneRowIndex).setCellValue(key);
// }
// oneRowIndex ++;
// }
for(Map<String, Object> map : list){
HSSFRow row = s.createRow(s.getPhysicalNumberOfRows());
@@ -891,151 +911,236 @@ public class DataController {
return wb;
}
public Map<String, String> getFliedDisplay(){
public Map<String, String> getFliedDisplay(String cat){
Map<String, String> map = new HashMap<String, String>(){ {
put( "province" , "省份" );
put( "city" , "城市" );
put( "cityLevel" , "城市等级" );
put( "rankingLevel" , "行政区划" );
put( "existingDistrictCount" , "小区数量" );
put( "districtsHasLoudong" , "有楼栋的小区数量" );
put( "districtsHasFanghao" , "有房号的小区数量" );
put( "existingOfficeCount" , "写字楼数量" );
put( "existingShopCount" , "商铺数量" );
put( "priceCoverage" , "价格覆盖率" );
put( "priceCreditGte80Coverage", "0.8≤价格可信度");
put( "priceCreditGte66Coverage", "0.66≤价格可信度<0.8");
put( "priceCreditGte60Coverage", "0.6≤价格可信度<0.66");
put( "priceCreditGte00Coverage", "价格可信度<0.6");
put( "name" , "名称" );
put( "region" , "区域" );
put( "block" , "板块" );
put( "address" , "地址" );
put( "estateType" , "物业类型" );
put( "householdCount" , "户数" );
put( "openDate" , "开盘时间" );
put( "latLng" , "mapabc经纬度" );
put( "latLng2" , "百度经纬度" );
put( "allArea" , "占地面积" );
put( "buildArea" , "建筑面积" );
put( "buildType" , "建筑类型" );
put( "developer" , "开发商" );
put( "estateCompany" , "物业公司" );
put( "cubagePercent" , "容积率" );
put( "virescencePercent" , "绿化率" );
put( "carSite" , "停车位" );
put( "carSiteCount" , "停车位描述" );
put( "estateCharge" , "物业费" );
put( "floorplanPics" , "楼层平面图" );
put( "outPics" , "外景图" );
put( "rentPrice" , "租金" );
put( "bedKind" , "写字楼等级" );
put( "houseFloor" , "楼层" );
put( "houseHeight" , "楼高" );
put( "houseArea" , "面积" );
put( "room" , "室" );
put( "hall" , "厅" );
put( "direction" , "朝向" );
put( "toilet" , "卫" );
put( "noise" , "噪音" );
put( "fitmentRank" , "装修" );
put( "fitmentAge" , "装修年限" );
put( "leaseTerm","租赁年限");
put( "paymentPattern","付款方式");
put( "rentPrice","出租价格");
put( "sellPrice","出售价格");
put( "mobile","电话");
put( "floor","建筑楼层");
put( "floorInfo","楼层状况");
put( "bayArea","开间面积");
put( "finishBuildingDate","竣工时间");
put( "liveDate","开业时间");
put( "divisible","是否可分割");
put( "unifiedManage","是否统一管理");
put( "metroInfo","地铁沿线");
put( "metroNames","地铁站名");
put( "facilities","配套设施");
put( "propertyInfo","物业概况");
put( "traffic","交通情况");
put( "surrounding","周边情况");
put( "businessStatus","经营业态");
put( "rentType","租售类型");
put( "price","价格");
put( "businessQuarter","商圈");
put( "startBuildingDate","开工时间");
put( "liveDate","交房时间");
put( "loopLineInfo","环线");
put( "propertyLife","产权年限");
put( "houseProperty","产权性质");
put( "licence","预售许可证");
put( "buildStructure","建筑结构");
put( "house_count","房号总量");
put( "exists_house_dis_count","有房号的小区数量");
put( "house_num_rate","楼号覆盖率");
put( "unit_num_rate","单元覆盖率");
put( "room_num_rate","室号覆盖率");
put( "area_rate","面积覆盖率");
put( "room_info_rate","户型覆盖率");
put( "hourse_structure_rate","户型结构覆盖率");
put( "actualFloor","实际层覆盖率");
put( "nominalFloor","名义层覆盖率");
put( "build_type","建筑类型覆盖率");
put( "loudong_count","楼栋总量");
put( "exists_loudong_dis_count","有楼栋的小区数量");
put( "loudong_num_rate","楼栋号覆盖率");
put( "loudong_height_rate","总楼层覆盖率");
put( "elevatornumber_rate","电梯数覆盖率");
put( "households_rate","户数覆盖率");
put( "address_rate","地址覆盖率");
put( "structure_rate","建筑结构覆盖率");
put( "build_year_rate","建筑年代覆盖率");
put( "usage_rate","楼栋用途覆盖率");
put( "loudong_type_rate","楼栋类型覆盖率");
put( "floor_type_reate","建筑类型(按楼层)覆盖率");
put( "archiNature_rate","建筑性质覆盖率");
put( "totalAreas_rate","建筑总面积覆盖率");
put("streetCommunity","街道社区");
put("committee","居委会");
put("schools","对口学校");
put("houseStructure","房屋结构");
put("estateType2","物业类型");
put("buildDate","建筑年代");
put("alias","别名");
put("addrAlias","地址别名");
put("mainTypeArea","主力面积");
put("loudongCount","楼栋数");
put("township","乡镇街道");
put("schools","对口小学");
put("kindergartens","对口幼儿园");
put("elevator","电梯");
put("landProperty","权属类别");
put("usageCard","土地使用权证号");
put("landUsageStart","土地使用年限");
put("occupancyRate","入住率");
put("mainType","主力户型");
put("mappingAlias","映射别名");
put("districtAliasTotalCount", "别名总量");
put( "latLng" , "mapabc经纬度" );
put( "latLng2" , "百度经纬度" );
put("undergroundCarSite", "地下车位数");
put("landCarSite", "地上车位数");
put("parkingFee", "车位月租金");
put("sight", "开间面积");
put("lobbyHeight", "大堂层高");
put("standardHeight", "标准层高");
put("clearHeight", "净高");
put("standardArea", "标准层面积");
put("foreign", "是否涉外");
put("register", "是否可注册");
put("divisible", "是否可分割");
put("elevatorsCount","电梯数量");
put("personElevatorsCount","客梯数");
put("goodsElevatorCount","货梯数");
put("realUsePercent","得房率");
put("landFloor","地上层数");
put("undergroundFloor","地下层数");
// put( "floorplanPics" , "楼层平面图" );
// put( "outPics" , "外景图" );
// put( "rentPrice" , "租金" );
// put( "houseFloor" , "楼层" );
// put( "houseHeight" , "楼高" );
// put( "houseArea" , "面积" );
// put( "room" , "室" );
// put( "hall" , "厅" );
// put( "direction" , "朝向" );
// put( "toilet" , "卫" );
// put( "noise" , "噪音" );
// put( "fitmentRank" , "装修" );
// put( "fitmentAge" , "装修年限" );
// put( "leaseTerm","租赁年限");
// put( "paymentPattern","付款方式");
// put( "sellPrice","出售价格");
// put( "mobile","电话");
// put( "liveDate","开业时间");
// put( "divisible","是否可分割");
// put( "unifiedManage","是否统一管理");
// put( "metroInfo","地铁沿线");
// put( "metroNames","地铁站名");
// put( "facilities","配套设施");
// put( "propertyInfo","物业概况");
// put( "traffic","交通情况");
// put( "surrounding","周边情况");
// put( "rentType","租售类型");
// put( "price","价格");
// put("schools","对口学校");
// put("estateType" , "物业类型" );
// put("estateType2","物业类型");
// put("buildDate","建筑年代");
} };//
if(cat.equals("小区")){
map = setDistrictFields(map);
}else if(cat.equals("写字楼")){
map = setOfficeFields(map);
}else if(cat.equals("房号")){
map = setRoomNumberFields(map);
}else if(cat.equals("商铺")){
map = setShopsFields(map);
}else if(cat.equals("楼栋")){
map = setBuildingFields(map);
}
return map;
}
private Map setDistrictFields (Map map){
map.put( "existingDistrictCount" , "小区数量" );
map.put( "districtsHasLoudong" , "有楼栋的小区数量" );
map.put( "districtsHasFanghao" , "有房号的小区数量" );
map.put( "priceCoverage" , "价格覆盖率" );
map.put("districtAliasTotalCount", "别名总量");
map.put( "priceCreditGte80Coverage", "0.8≤价格可信度");
map.put( "priceCreditGte66Coverage", "0.66≤价格可信度<0.8");
map.put( "priceCreditGte60Coverage", "0.6≤价格可信度<0.66");
map.put( "priceCreditGte00Coverage", "价格可信度<0.6");
map.put( "businessQuarter","商圈");
map.put( "startBuildingDate","开工时间");
map.put( "liveDate","交房时间");
map.put( "loopLineInfo","环线");
map.put( "propertyLife","产权年限");
map.put( "houseProperty","产权性质");
map.put( "licence","预售许可证");
map.put( "buildStructure","建筑结构");
map.put( "name" , "名称" );
map.put( "region" , "区域" );
map.put( "block" , "板块" );
map.put( "address" , "地址" );
map.put( "estateType2" , "物业类型" );
map.put( "householdCount" , "户数" );
map.put( "openDate" , "开盘时间" );
map.put("buildDate","建筑年代");
map.put( "allArea" , "占地面积" );
map.put( "buildArea" , "建筑面积" );
map.put( "buildType" , "建筑类型" );
map.put( "developer" , "开发商" );
map.put( "estateCompany" , "物业公司" );
map.put( "cubagePercent" , "容积率" );
map.put( "virescencePercent" , "绿化率" );
map.put( "carSite" , "停车位" );
map.put( "estateCharge" , "物业费" );
map.put( "finishBuildingDate","竣工时间");
map.put("streetCommunity","街道社区");
map.put("committee","居委会");
map.put("schools","对口小学");
map.put("houseStructure","房屋结构");
map.put("alias","别名");
map.put("addrAlias","地址别名");
map.put("mainTypeArea","主力面积");
map.put("loudongCount","楼栋数");
map.put( "carSiteCount" , "停车位描述" );
map.put("mappingAlias","映射别名");
map.put("elevator","电梯");
map.put("township","乡镇街道");
map.put("kindergartens","对口幼儿园");
map.put("mainType","主力户型");
map.put("landProperty","权属类别");
map.put("usageCard","土地使用权证号");
map.put("occupancyRate","入住率");
map.put("landUsageStart","土地使用年限");
map.put( "rentPrice","出租价格");
map.put("realUsePercent","得房率");
return map;
}
private Map setOfficeFields (Map map){
map.put( "existingOfficeCount" , "写字楼数量" );
map.put( "name" , "名称" );
map.put( "region" , "区域" );
map.put( "block" , "板块" );
map.put( "address" , "地址" );
// map.put( "estateType2" , "物业类型" );
// map.put( "openDate" , "开盘时间" );
// map.put( "liveDate","交房时间");
map.put( "allArea" , "占地面积" );
map.put( "buildArea" , "建筑面积" );
// map.put( "buildType" , "建筑类型" );
map.put( "developer" , "开发商" );
map.put( "estateCompany" , "物业公司" );
map.put( "cubagePercent" , "容积率" );
map.put( "virescencePercent" , "绿化率" );
map.put( "carSite" , "停车位" );
map.put( "estateCharge" , "物业费" );
map.put( "finishBuildingDate","竣工时间");
// map.put( "startBuildingDate","开工时间");
// map.put( "carSiteCount" , "停车位描述" );
map.put( "bedKind" , "写字楼等级" );
map.put("alias","别名");
map.put("addrAlias","地址别名");
// map.put( "businessQuarter","商圈");
map.put( "loopLineInfo","环线");
// map.put( "floorInfo","楼层状况");
map.put("undergroundCarSite", "地下车位数");
map.put("landCarSite", "地上车位数");
map.put("parkingFee", "车位月租金");
map.put( "bayArea","开间面积");
map.put( "propertyLife","产权年限");
map.put("elevatorsCount","电梯数量");
map.put("personElevatorsCount","客梯数");
map.put("goodsElevatorCount","货梯数");
map.put("standardHeight", "标准层高");
map.put("clearHeight", "净高");
map.put("standardArea", "标准层面积");
map.put("foreign", "是否涉外");
map.put("register", "是否可注册");
map.put("lobbyHeight", "大堂层高");
// map.put("township","乡镇街道");
map.put("divisible", "是否可分割");
map.put("landFloor","地上层数");
map.put("undergroundFloor","地下层数");
return map;
}
private Map setRoomNumberFields (Map map){
map.put( "house_count","房号总量");
map.put( "exists_house_dis_count","有房号的小区数量");
map.put( "house_num_rate","楼号覆盖率");
map.put( "unit_num_rate","单元覆盖率");
map.put( "room_num_rate","室号覆盖率");
map.put( "area_rate","面积覆盖率");
map.put( "room_info_rate","户型覆盖率");
map.put( "hourse_structure_rate","户型结构覆盖率");
map.put( "actualFloor","实际层覆盖率");
map.put( "nominalFloor","名义层覆盖率");
map.put( "build_type","建筑类型覆盖率");
return map;
}
private Map setShopsFields (Map map){
map.put( "existingShopCount" , "商铺数量" );
map.put( "name" , "名称" );
map.put( "region" , "区域" );
map.put( "block" , "板块" );
map.put( "address" , "地址" );
map.put("alias","别名");
map.put("addrAlias","地址别名");
map.put( "estateType2" , "物业类型" );
map.put( "openDate" , "开盘时间" );
map.put( "liveDate","交房时间");
map.put( "allArea" , "占地面积" );
map.put( "buildArea" , "建筑面积" );
map.put( "buildType" , "建筑类型" );
map.put( "developer" , "开发商" );
map.put( "estateCompany" , "物业公司" );
map.put( "carSite" , "停车位" );
map.put( "estateCharge" , "物业费" );
map.put( "floor","建筑楼层");
map.put( "finishBuildingDate","竣工时间");
map.put( "businessQuarter","商圈");
map.put( "startBuildingDate","开工时间");
map.put("sight", "开间面积");
map.put( "propertyLife","产权年限");
map.put( "businessStatus","经营业态");
map.put("parkingFee", "车位月租金");
map.put("township","乡镇街道");
map.put( "loopLineInfo","环线");
map.put("landFloor","地上层数");
map.put("undergroundFloor","地下层数");
return map;
}
private Map setBuildingFields (Map map){
map.put( "loudong_count","楼栋总量");
map.put( "exists_loudong_dis_count","有楼栋的小区数量");
map.put( "unit_num_rate","单元覆盖率");
map.put( "loudong_num_rate","楼栋号覆盖率");
map.put( "loudong_height_rate","总楼层覆盖率");
map.put( "elevatornumber_rate","电梯数覆盖率");
map.put( "households_rate","户数覆盖率");
map.put( "address_rate","地址覆盖率");
map.put( "structure_rate","建筑结构覆盖率");
map.put( "build_year_rate","建筑年代覆盖率");
map.put( "usage_rate","楼栋用途覆盖率");
map.put( "loudong_type_rate","楼栋类型覆盖率");
map.put( "floor_type_reate","建筑类型(按楼层)覆盖率");
map.put( "archiNature_rate","建筑性质覆盖率");
map.put( "totalAreas_rate","建筑总面积覆盖率");
return map;
}
public Object houseAction(DataModel model) {
if (StringUtils.isBlank(model.getCityDisplay())) {
@@ -0,0 +1,263 @@
package com.fangjia.bkoff.controllers;
import com.fangjia.bkoff.model.DevelopmentZoneModel;
import com.fangjia.bkoff.model.JsonModel;
import com.fangjia.bkoff.model.LatlngPolygonModel;
import com.fangjia.core.util.GeoUtils;
import com.fangjia.core.util.ThreadLocalData;
import com.fangjia.core.util.ThreadLocalKey;
import com.fangjia.dal.mongo.model.DevelopmentZone;
import com.fangjia.dal.mongo.model.LatlngPolygon;
import com.fangjia.dal.mongo.model.StatsIndex;
import com.fangjia.dal.mongo.model.bkoff.BkoffUsers;
import com.fangjia.service.mongo.bkoff.BkoffUsersService;
import com.fangjia.service.mongo.fangjia.DevelopmentZoneService;
import com.fangjia.service.mongo.fangjia.LatlngPolygonService;
import org.apache.commons.lang.StringUtils;
import org.sothis.core.util.Pager;
import java.util.*;
import static com.fangjia.core.util.GeoUtils.LAT;
import static com.fangjia.core.util.GeoUtils.LNG;
/**
* Created by dxy on 2015/6/8.
*/
public class DevelopmentZoneController {
private DevelopmentZoneService developmentZoneService;
private BkoffUsersService bkoffUsersService;
public Object listAction(DevelopmentZoneModel model) {
Pager pager = model.getPager(30);
if (pager.getCurrentPage() > 100) {
pager.setCurrentPage(1);
}
long countDev = developmentZoneService.countDev(model.getProvince(), model.getName(), model.getLevel());
pager.setTotalRows((int) countDev);
List<DevelopmentZone> developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getName(), model.getLevel(), pager);
model.setDevelopmentZoneList(developmentZones);
model.setPager(pager);
return model;
}
public Object showAction(DevelopmentZoneModel model) {
if (model.getId() == null) {
return model;
}
model.setDevelopmentZone(developmentZoneService.findDevelopmentZone(model.getId()));
return model;
}
public Object editAction(DevelopmentZoneModel model) {
if (model.getId() == null) {
return model;
}
model.setDevelopmentZone(developmentZoneService.findDevelopmentZone(model.getId()));
return model;
}
public Object deleteAction(LatlngPolygonModel model) {
JsonModel ret = new JsonModel();
if (model.getId() == null) {
return ret;
}
developmentZoneService.deleteDevelopmentZone(model.getId());
return ret;
}
public Object saveOrUpdateAction(DevelopmentZoneModel model) {
String userId = (String) ThreadLocalData.getInstance().get(ThreadLocalKey.UserId);
BkoffUsers user = bkoffUsersService.findBkoffUsersById(userId);
JsonModel ret = new JsonModel();
Map<String, Object> data = new HashMap<String, Object>();
ret.setJsonModel(data);
if (model.getId() == null) {
// name province bdLocation level 不能为空
if (StringUtils.isBlank(model.getProvince()) || StringUtils.isBlank(model.getName()) || StringUtils.isBlank(model.getLevel())) {
data.put("msg", "保存失败(开发区名称,所在省份,级别不能为空)");
return ret;
}
DevelopmentZone entity = new DevelopmentZone();
// name province bdLocation level 不能为空/
entity.setName(model.getName());
entity.setProvince(model.getProvince());
// 新加开发区,围栏不是必须有的
if (model.getBdShape() != null && !model.getBdShape().toString().equals("[]")) {
String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", "");
List<List<Double>> bdLocationList = new ArrayList<List<Double>>();
String[] splitStr = locationStr.split(";");
for (int i = 0; i < splitStr.length; i++) {
String[] splitStr2 = splitStr[i].split(",");
List<Double> location = new ArrayList<Double>();
location.add(Double.parseDouble(splitStr2[0]));
location.add(Double.parseDouble(splitStr2[1]));
bdLocationList.add(location);
}
//加上第一个,形成首尾闭合
bdLocationList.add(bdLocationList.get(0));
model.setBdShape(bdLocationList);
// 百度经纬度
Map<String, Object> bdShape = new HashMap<String, Object>();
bdShape.put("type", "polygon");
bdShape.put("coordinates", model.getBdShape());
entity.setBdShape(bdShape);
// 高德经纬度
Map<String, Object> shape = new HashMap<String, Object>();
shape.put("type", "polygon");
Object coordinates = convertGeoList(model.getBdShape());
shape.put("coordinates", coordinates);
entity.setShape(shape);
}
entity.setLevel(model.getLevel());
String aliasString = model.getAlias().replaceAll(",", ",");
List<String> alias = Arrays.asList(aliasString.split("\\s*,\\s*"));
entity.setAlias(alias);
entity.setAddress(StringUtils.isBlank(model.getAddress()) ? "" : model.getAddress());
entity.setArea(StringUtils.isBlank(model.getArea()) ? "" : model.getArea());
entity.setBlock(StringUtils.isBlank(model.getBlock()) ? "" : model.getBlock());
entity.setBuildDate(StringUtils.isBlank(model.getBuildDate()) ? "" : model.getBuildDate());
entity.setCreateTime(new Date());
entity.setIndustry(StringUtils.isBlank(model.getIndustry()) ? "" : model.getIndustry());
entity.setNameEn(StringUtils.isBlank(model.getNameEn()) ? "" : model.getNameEn());
entity.setType(StringUtils.isBlank(model.getType()) ? "" : model.getType());
entity.setUrl(StringUtils.isBlank(model.getUrl()) ? "" : model.getUrl());
entity.setCityName1(StringUtils.isBlank(model.getCityName1()) ? "" : model.getCityName1());
entity.setDistrict(StringUtils.isBlank(model.getDistrict()) ? "" : model.getDistrict());
//记录操作人员
entity.setOperator(user.getRealName());
developmentZoneService.saveDevelopmentZone(entity);
data.put("msg", "保存成功");
} else {
// DevelopmentZone entity = developmentZoneService.findDevelopmentZone(model.getId());
Map<String, Object> udata = new HashMap<String, Object>();
if (StringUtils.isNotBlank(model.getProvince())) {
udata.put("province", model.getProvince());
}
if (StringUtils.isNotBlank(model.getName())) {
udata.put("name", model.getName());
}
if (StringUtils.isNotBlank(model.getLevel())) {
udata.put("level", model.getLevel());
}
if (model.getBdShape() != null && !model.getBdShape().toString().equals("[]")) {
String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", "");
List<List<Double>> bdLocationList = new ArrayList<List<Double>>();
String[] splitStr = locationStr.split(";");
for (int i = 0; i < splitStr.length; i++) {
String[] splitStr2 = splitStr[i].split(",");
List<Double> location = new ArrayList<Double>();
location.add(Double.parseDouble(splitStr2[0]));
location.add(Double.parseDouble(splitStr2[1]));
bdLocationList.add(location);
}
//加上第一个,形成首尾闭合
bdLocationList.add(bdLocationList.get(0));
model.setBdShape(bdLocationList);
// 百度经纬度
Map<String, Object> bdShape = new HashMap<String, Object>();
bdShape.put("type", "polygon");
bdShape.put("coordinates", model.getBdShape());
udata.put("bdShape", bdShape);
// 高德经纬度
Map<String, Object> shape = new HashMap<String, Object>();
shape.put("type", "polygon");
Object coordinates = convertGeoList(model.getBdShape());
shape.put("coordinates", coordinates);
udata.put("shape", shape);
}
if (StringUtils.isNotBlank(model.getAlias())) {
String aliasString = model.getAlias().replaceAll(",", ",");
List<String> alias = Arrays.asList(aliasString.split("\\s*,\\s*"));
udata.put("alias", alias);
}
if (StringUtils.isNotBlank(model.getAddress())) {
udata.put("address", model.getAddress());
}
if (StringUtils.isNotBlank(model.getArea())) {
udata.put("area", model.getArea());
}
if (StringUtils.isNotBlank(model.getBlock())) {
udata.put("block", model.getBlock());
}
if (StringUtils.isNotBlank(model.getBuildDate())) {
udata.put("buildDate", model.getBuildDate());
}
if (StringUtils.isNotBlank(model.getIndustry())) {
udata.put("industry", model.getIndustry());
}
if (StringUtils.isNotBlank(model.getNameEn())) {
udata.put("nameEn", model.getNameEn());
}
if (StringUtils.isNotBlank(model.getType())) {
udata.put("type", model.getType());
}
if (StringUtils.isNotBlank(model.getUrl())) {
udata.put("url", model.getUrl());
}
if (StringUtils.isNotBlank(model.getCityName1())) {
udata.put("cityName1", model.getCityName1());
}
if (StringUtils.isNotBlank(model.getDistrict())){
udata.put("district", model.getDistrict());
}
udata.put("createTime", new Date());
//记录操作人员
udata.put("operator", user.getRealName());
developmentZoneService.updateDevelopmentZone(udata, model.getId());
data.put("msg", "修改成功");
}
return ret;
}
public JsonModel provincesAction() {
JsonModel model = new JsonModel();
List<String> provinces = developmentZoneService.findProvinces();
model.setJsonModel(provinces);
return model;
}
public JsonModel citiesAction(DevelopmentZoneModel model) {
JsonModel jsonModel = new JsonModel();
List<String> cities = developmentZoneService.findCities(model.getProvince());
jsonModel.setJsonModel(cities);
return jsonModel;
}
public JsonModel districtsAction(DevelopmentZoneModel model) {
JsonModel jsonModel = new JsonModel();
List<String> districts = developmentZoneService.findDistricts(model.getCityName1());
jsonModel.setJsonModel(districts);
return jsonModel;
}
public void setDevelopmentZoneService(DevelopmentZoneService developmentZoneService) {
this.developmentZoneService = developmentZoneService;
}
public void setBkoffUsersService(BkoffUsersService bkoffUsersService) {
this.bkoffUsersService = bkoffUsersService;
}
//将百度坐标转为高德坐标
public List<List<Double>> convertGeoList(List<List<Double>> bdLocationList) {
List<List<Double>> gdLocationList = new ArrayList<List<Double>>();
// 使用增强的 for 循环遍历列表
for (List<Double> bdLocation : bdLocationList) {
List<Double> gdLocation = new ArrayList<Double>();
// 将百度坐标转为高德坐标
Map<String, Double> map = GeoUtils.bd09ToGcj02(bdLocation.get(0), bdLocation.get(1));
gdLocation.add(map.get(LAT));
gdLocation.add(map.get(LNG));
gdLocationList.add(gdLocation);
}
return gdLocationList;
}
}
@@ -243,12 +243,12 @@ public class DistrictController {
}
} else {
BooleanQuery query = new BooleanQuery();
Query q1 = new TermQuery(new Term("keyword", model.getKeyword()));
q1.setBoost(0.99f);
query.add(q1, Occur.SHOULD);
// Query q2 = new TermQuery(new Term("keyword_cjk", model.getKeyword()));
// q2.setBoost(0.01f);
// query.add(q2, Occur.SHOULD);
// Query q1 = new TermQuery(new Term("keyword", model.getKeyword()));
// q1.setBoost(0.99f);
// query.add(q1, Occur.SHOULD);
Query q2 = new TermQuery(new Term("keyword_cjk", model.getKeyword()));
q2.setBoost(0.1f);
query.add(q2, Occur.SHOULD);
params.add(new QueryParam("$sr", new SrQuery(query)));
}
}
@@ -331,7 +331,7 @@ public class DistrictController {
for (QueryParam pa : params) {
fenQiParams.add(pa);
}
fenQiParams.add(new QueryParam("masterDistrictNname", "master"));
fenQiParams.add(new QueryParam("masterDistrictName", "master"));
fenQiParams.add(new QueryParam("visible", 0));
int fenQiCount = (int) districtService.findDistrictCount(0, fenQiParams);
// int surplusDistrictCount =
@@ -373,7 +373,7 @@ public class DistrictController {
} else if (model.getValid() != null && model.getValid() == 3) {
// 分期数据处理
params.add(new QueryParam("visible", 0));
params.add(new QueryParam("masterDistrictNname", "master"));
params.add(new QueryParam("masterDistrictName", "master"));
districts = districtService.findDistrictList(pager, params, sortParams);
List<District> vos = new ArrayList<District>();
for (District district : districts) {
@@ -482,19 +482,34 @@ public class DistrictController {
|| StringUtils.isBlank(model.getName())) {
return ret;
}
HttpRequest request = new HttpRequest();
HashMap<String, String> params = new HashMap<String, String>();
params.put("category", "sell");
params.put("city", model.getCityDisplay());
params.put("region", model.getRegion());
params.put("name", model.getName());
params.put("count", "4");
params.put("retainHistory", "true");
try {
request.getJsonContent(Constants.MSVC_FANG_JIA_DATA_SERVICE_BASE_PATH + "/districtPriceCalculate", params, "UTF-8");
} catch (HttpRequestException e) {
e.printStackTrace();
}
Runnable myRunnable = new Runnable(){
public void run(){
try {
District district = districtService.findDistrict(new DistrictKey(model.getCityDisplay(), model.getRegion(), model.getName()),"district");
if(null != district){
HttpRequest request = new HttpRequest();
HashMap<String, String> params = new HashMap<String, String>();
params.put("category", "sell");
params.put("city", model.getCityDisplay());
params.put("region", model.getRegion());
params.put("name", model.getName());
params.put("count", "4");
params.put("retainHistory", "true");
try {
request.getJsonContent(Constants.MSVC_FANG_JIA_DATA_SERVICE_BASE_PATH + "/districtPriceCalculate", params, "UTF-8");
} catch (HttpRequestException e) {
e.printStackTrace();
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
};
Thread thread = new Thread(myRunnable);
thread.start();
return ret;
}
@@ -1185,6 +1200,37 @@ public class DistrictController {
model.setJsonModel(data);
return model;
}
/**
* 校验小区名是否为其他小区的别名
*/
public Object checkDistrictNameAction(@Param(name = "city") String city, @Param(name = "region") String region,
@Param(name = "name") String name, @Param(name = "cat") String cat, @Param(name = "id") String id) {
JsonModel model = new JsonModel();
boolean exist = false;
List list = new ArrayList<String>();
list.add(name);
List<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("category", cat));
params.add(new QueryParam("city", city));
params.add(new QueryParam("region", region));
params.add(new QueryParam("alias", name));
params.add(new QueryParam("visible", 0));
List<District> ds = districtService.findAllByParams(params);
if (CollectionUtils.isNotEmpty(ds)) {
for (District d : ds) {
if (!d.getId().equals(id)) {
exist = true;
break;
}
}
}
Map<String, Object> data = new HashMap<String, Object>();
data.put("exist", exist);
model.setJsonModel(data);
return model;
}
/**
* 保存新增小区
@@ -1306,7 +1352,7 @@ public class DistrictController {
&& StringUtils.isNotBlank(district.getRegion())) {
// signFiledEditFlag(district, null);
districtService.save(district);
districtUpdateTaskService.createTask(district, 5);
districtUpdateTaskService.createTask(district, 5, null);
}
if (model.isGoPic()) {
@@ -1874,6 +1920,7 @@ public class DistrictController {
district.setMappingAlias(null);
}
}
district.setModificationDate(new Date());
districtService.save(district);
}
@@ -1935,6 +1982,7 @@ public class DistrictController {
district.setLandProperty(model.getLandProperty());
}
district.setModificationDate(new Date());
districtService.save(district);
}
return model;
@@ -2014,28 +2062,28 @@ public class DistrictController {
districtUpdateTaskService.createTask(orgDis, 2, newName, newRegion);
districtUpdateTaskService.createTask(orgDis, 6, newName, newRegion);
District distTask = new District();
distTask.setCity(orgDis.getCity());
if(StringUtils.isNotBlank(newName)){
distTask.setRegion(newRegion);
}else{
distTask.setRegion(orgDis.getRegion());
}
distTask.setEstateType2(orgDis.getEstateType2());
if(StringUtils.isNotBlank(newName)){
distTask.setName(newName);
}else{
distTask.setName(orgDis.getName());
}
districtUpdateTaskService.createTask(distTask, 5);
// District distTask = new District();
// distTask.setCity(orgDis.getCity());
// if(StringUtils.isNotBlank(newName)){
// distTask.setRegion(newRegion);
// }else{
// distTask.setRegion(orgDis.getRegion());
// }
//
// distTask.setEstateType2(orgDis.getEstateType2());
// if(StringUtils.isNotBlank(newName)){
// distTask.setName(newName);
// }else{
// distTask.setName(orgDis.getName());
// }
//
// districtUpdateTaskService.createTask(distTask, 5);
}
if (StringUtils.isNotBlank(district.getEstateType2())
&& district.getEstateType2().equals(orgDis.getEstateType2())) {
districtUpdateTaskService.createTask(district);
}
// if (StringUtils.isNotBlank(district.getEstateType2())
// && district.getEstateType2().equals(orgDis.getEstateType2())) {
// districtUpdateTaskService.createTask(district);
// }
Map<String, Object> data = new HashMap<String, Object>();
data.put("category", district.getCategory());
@@ -2236,6 +2284,9 @@ public class DistrictController {
data.put("markMap", markMap);
data.put("modificationDate", new Date());
districtService.updateById(data, district.getId());
//创建更新任务,用为更新常州农商行数据
createJnTask(district.getId(), null);
msg = "保存成功了!!!";
}
@@ -2245,6 +2296,17 @@ public class DistrictController {
return model;
}
private void createJnTask(String id, Integer type){
District newDist = districtService.findDistrictById(id);
District distTask = new District();
distTask.setCity(newDist.getCity());
distTask.setRegion(newDist.getRegion());
distTask.setName(newDist.getName());
distTask.setEstateType2(newDist.getEstateType2());
distTask.setId(id);
districtUpdateTaskService.createTask(distTask, 5, type);
}
public Object checkNamesAction(DistrictModel model) {
List<QueryParam> params = new ArrayList<QueryParam>();
@@ -2291,6 +2353,7 @@ public class DistrictController {
params = new ArrayList<QueryParam>(2);
params.add(new QueryParam("category", "district,new_district"));
params.add(new QueryParam("name", a));
params.add(new QueryParam("visible", 0));
ds = districtService.findAllByParams(params);
@@ -2406,10 +2469,12 @@ public class DistrictController {
JsonModel ret = new JsonModel();
if (StringUtils.isNotBlank(model.getId()) && ObjectId.isValid(model.getId())) {
districtService.logicDeleteById(model.getId());
createJnTask(model.getId(), 1);
} else if (model.getIds() != null) {
String[] ids = model.getIds().toString().split(",");
for (String id : ids) {
districtService.logicDeleteById(id);
createJnTask(id, 1);
}
}
return ret;
@@ -2421,10 +2486,12 @@ public class DistrictController {
public Object restoreAction(DistrictModel model) throws UnsupportedEncodingException {
if (ObjectId.isValid(model.getId())) {
districtService.restoreById(model.getId());
createJnTask(model.getId(), null);
} else if (model.getIds() != null) {
String[] ids = model.getIds().split("_");
for (String id : ids) {
districtService.restoreById(id);
createJnTask(id, null);
}
}
model.setViewType("redirect");
@@ -3446,8 +3513,8 @@ public class DistrictController {
if (type.equals("master")) {
masterDistrict = districtService.findById(id);
}
if (dis != null && dis.getMasterDistrictNname() != null
&& dis.getMasterDistrictNname().equals("master")) {
if (dis != null && dis.getMasterDistrictName() != null
&& dis.getMasterDistrictName().equals("master")) {
json.setSuccess(false);
json.setMsg(dis.getName() + "已经是主小区了");
return json;
@@ -3465,13 +3532,13 @@ public class DistrictController {
String type = stas[1];
if (type.equals("master")) {
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrictNname", "master");
data.put("masterDistrictName", "master");
districtService.updateById(data, id);
// 设置为人工操作分期标识
districtService.setPersonOperate(id);
} else {
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrictNname", masterDistrict.getName());
data.put("masterDistrictName", masterDistrict.getName());
districtService.updateById(data, id);
}
}
@@ -3499,8 +3566,8 @@ public class DistrictController {
json.setMsg("小区不存在,请检查是否输入正确");
return json;
}
if (slaveDistrict.getMasterDistrictNname() != null
&& slaveDistrict.getMasterDistrictNname().equals("master")) {
if (slaveDistrict.getMasterDistrictName() != null
&& slaveDistrict.getMasterDistrictName().equals("master")) {
json.setSuccess(false);
json.setMsg(slaveDistrict.getName() + "已经是主小区了");
return json;
@@ -3509,7 +3576,7 @@ public class DistrictController {
if (slaveDistrict.getCity().equals(masterDistrict.getCity())
&& slaveDistrict.getRegion().equals(masterDistrict.getRegion())) {
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrictNname", masterDistrict.getName());
data.put("masterDistrictName", masterDistrict.getName());
districtService.updateById(data, slaveId);
// 设置为人工操作分期标识
districtService.setPersonOperate(masterDistrict.getId());
@@ -3534,9 +3601,9 @@ public class DistrictController {
if (model.getId() != null && !model.getId().equals("")) {
District slaveDistrict = districtService.findById(model.getId());
District masterDistrict = districtService.findDistrict(new DistrictKey(slaveDistrict.getCity(),
slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictNname()), "district");
slaveDistrict.getRegion(), slaveDistrict.getMasterDistrictName()), "district");
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrictNname", null);
data.put("masterDistrictName", null);
districtService.updateById(data, model.getId());
// 设置为人工操作分期标识
if (masterDistrict != null) {
@@ -3560,7 +3627,7 @@ public class DistrictController {
List<District> slaves = districtService.findSlaves(masterDistrict.getCity(), masterDistrict.getRegion(),
masterDistrict.getName());
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrictNname", null);
data.put("masterDistrictName", null);
for (District district : slaves) {
districtService.updateById(data, district.getId());
}
@@ -3587,7 +3654,7 @@ public class DistrictController {
params.add(new QueryParam("visible", 0));
params.add(new QueryParam("city", slaveDistrict.getCity()));
params.add(new QueryParam("region", slaveDistrict.getRegion()));
params.add(new QueryParam("name", slaveDistrict.getMasterDistrictNname()));
params.add(new QueryParam("name", slaveDistrict.getMasterDistrictName()));
List<District> list = districtService.findAllByParams(params);
if (list == null || list.size() == 0) {
json.setSuccess(false);
@@ -3602,18 +3669,18 @@ public class DistrictController {
for (District district : slaves) {
if (district.getId().equals(slaveId)) {
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrictNname", "master");
data.put("masterDistrictName", "master");
districtService.updateById(data, district.getId());
// 设置为人工操作分期标识
districtService.setPersonOperate(district.getId());
} else {
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrictNname", slaveDistrict.getName());
data.put("masterDistrictName", slaveDistrict.getName());
districtService.updateById(data, district.getId());
}
}
Map<String, Object> data = new HashMap<String, Object>();
data.put("masterDistrictNname", slaveDistrict.getName());
data.put("masterDistrictName", slaveDistrict.getName());
districtService.updateById(data, masterDistrict.getId());
}
return json;
@@ -84,7 +84,7 @@ public class LoginController {
return model.redirect("/users/selfEdit");
} else {
String forward = StringUtils.defaultIfEmpty(model.getForward(), "/");
if(forward.endsWith("/login/login")){
if(forward.contains("/login/login") || forward.contains("/login/index")){
return model.redirect("/");
}else{
return model.redirect(forward);
@@ -0,0 +1,84 @@
package com.fangjia.bkoff.controllers;
import com.fangjia.bkoff.model.DevelopmentZoneModel;
import com.fangjia.bkoff.model.JsonModel;
import com.fangjia.bkoff.model.TownshipModel;
import com.fangjia.core.util.ThreadLocalData;
import com.fangjia.core.util.ThreadLocalKey;
import com.fangjia.dal.mongo.model.Township;
import com.fangjia.dal.mongo.model.bkoff.BkoffUsers;
import com.fangjia.service.mongo.bkoff.BkoffUsersService;
import com.fangjia.service.mongo.fangjia.TownshipService;
import org.apache.commons.lang.StringUtils;
import org.sothis.core.util.Pager;
import java.util.*;
/**
* Created by dxy on 2015/6/8.
*/
public class TownshipController {
private TownshipService townshipService;
private BkoffUsersService bkoffUsersService;
public Object listAction(TownshipModel model) {
Pager pager = model.getPager(30);
if (pager.getCurrentPage() > 100) {
pager.setCurrentPage(1);
}
long countDev = townshipService.countTownship(model.getProvince(), model.getCity1(), model.getDistrict(),model.getStreet());
pager.setTotalRows((int) countDev);
List<Township> townships = townshipService.findTownship(model.getProvince(), model.getCity1(), model.getDistrict(),model.getStreet(), pager);
model.setTownshipList(townships);
model.setPager(pager);
return model;
}
public Object editAction(TownshipModel model) {
if (model.getId() == null) {
return model;
}
model.setTownship(townshipService.findTownship(model.getId()));
return model;
}
public Object updateAction(TownshipModel model) {
String userId = (String) ThreadLocalData.getInstance().get(ThreadLocalKey.UserId);
BkoffUsers user = bkoffUsersService.findBkoffUsersById(userId);
JsonModel ret = new JsonModel();
Map<String, Object> data = new HashMap<String, Object>();
if (model.getId() != null) {
Map<String, Object> udata = new HashMap<String, Object>();
if (StringUtils.isNotBlank(model.getAlias())) {
String aliasString = model.getAlias().replaceAll(",", ",");
List<String> alias = Arrays.asList(aliasString.split("\\s*,\\s*"));
udata.put("alias", alias);
}
udata.put("updateTime", new Date());
//记录操作人员
udata.put("operator", user.getRealName());
townshipService.updateTownship(udata, model.getId());
data.put("msg", "修改成功");
}
ret.setJsonModel(data);
return ret;
}
public void setBkoffUsersService(BkoffUsersService bkoffUsersService) {
this.bkoffUsersService = bkoffUsersService;
}
public TownshipService getTownshipService() {
return townshipService;
}
public void setTownshipService(TownshipService townshipService) {
this.townshipService = townshipService;
}
public BkoffUsersService getBkoffUsersService() {
return bkoffUsersService;
}
}
@@ -0,0 +1,139 @@
package com.fangjia.bkoff.controllers;
import com.fangjia.bkoff.model.AverageStatisticsModel;
import com.fangjia.bkoff.model.JsonModel;
import com.fangjia.bkoff.model.VillageIdentifyModel;
import com.fangjia.bkoff.util.ExcelUtils;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.mongo.model.VillageIdentify;
import com.fangjia.service.mongo.fangjia.VillageIdentifyService;
import org.apache.commons.lang.StringUtils;
import org.sothis.core.util.Pager;
import org.sothis.web.mvc.ActionContext;
import org.sothis.web.mvc.interceptors.MultipartHttpServletRequest;
import org.springframework.core.io.ClassPathResource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.net.URLEncoder;
public class VillageIdentifyController {
private VillageIdentifyService villageIdentifyService;
public Object importResultAction(VillageIdentifyModel model) {
Pager pager = model.getPager(25);
pager.setTotalRows(villageIdentifyService.count(model.getVillageType(), model.getCity1(), model.getAddress()));
model.setVillageIdentifyList(villageIdentifyService.findAll(model.getVillageType(), model.getCity1(), model.getAddress(), pager));
return model;
}
public void expectAction(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
// 编码文件名,避免乱码
String fileName = "涉农结果导入后台模板.xlsx";
String encodedFileName = encodeFileName(fileName, request);
// 设置 Content-Disposition 响应头
response.setHeader("Content-Disposition", "attachment; filename=\"" + encodedFileName + "\"");
// 使用 ClassPathResource 来获取资源文件
ClassPathResource resource = new ClassPathResource(fileName);
InputStream in = resource.getInputStream();
OutputStream out = response.getOutputStream();
byte[] buffer = new byte[1024];
int bytesRead;
while ((bytesRead = in.read(buffer)) != -1) {
out.write(buffer, 0, bytesRead);
}
out.flush();
}
private String encodeFileName(String fileName, HttpServletRequest request) throws IOException {
String userAgent = request.getHeader("User-Agent");
String encodedFileName;
if (userAgent.contains("MSIE") || userAgent.contains("Trident")) {
// 针对IE浏览器
encodedFileName = URLEncoder.encode(fileName, "UTF-8").replace("+", "%20");
} else {
// 针对其他浏览器
encodedFileName = new String(fileName.getBytes("UTF-8"), "ISO-8859-1");
}
return encodedFileName;
}
public Object uploadAction(HttpServletRequest request) throws IOException {
Object fileInputStream = ActionContext.getContext().getParameters().get("fileInputStream")[0];
JsonModel ret = new JsonModel();
Map<String, Object> data = new HashMap<String, Object>();
Map<String, List> dataMap = ExcelUtils.read((InputStream) fileInputStream, 0, 0);
List<List<String>> addressList = dataMap.get("data");
List<List<String>> headers = dataMap.get("header");
if (!("涉农类型".equals(headers.get(0)) && "地址".equals(headers.get(2)))) {
data.put("msg", "模板错误");
} else if (addressList.size() > 100000) {
data.put("msg", "该批次数据量超过100000条");
} else {
//模板正确,数据不超过100000,开始处理数据
for (List<String> row : addressList) {
Map<String, Object> updata = new HashMap<String, Object>();
// 创建一个包含所有key的list
List<String> keys = Arrays.asList(
"villageType", "cityParam", "address", "province", "provinceCode",
"city1", "cityCode", "district", "districtCode", "town", "townCode",
"committee", "committeeCode", "typeCode", "typeName", "verifyFlag", "addrVerify",
"countyLevelCity", "administrativeTowns", "devDistrict",
"devDistrictName", "devLevel", "countyGov", "addrArea"
);
// 遍历keys list并从row中获取相应的值放入updata中
for (int i = 0; i < keys.size(); i++) {
if (i < row.size() && StringUtils.isNotBlank(row.get(i))) {
updata.put(keys.get(i), row.get(i));
}
}
// 处理特定情况: cityParam
String cityParam = "";
if (StringUtils.isNotBlank(row.get(1))) {
cityParam = row.get(1);
updata.put("cityParam", cityParam);
}
// 添加createTime
updata.put("createTime", new Date());
List<QueryParam> queryParams = new ArrayList<QueryParam>();
queryParams.add(new QueryParam("address", updata.get("address")));
if ("" != cityParam) {
queryParams.add(new QueryParam("cityParam", cityParam));
}
queryParams.add(new QueryParam("villageType", updata.get("villageType")));
// 保存/更新
villageIdentifyService.updateByparams(updata, queryParams);
}
data.put("msg", "保存成功");
}
ret.setJsonModel(data);
return ret;
}
public void setVillageIdentifyService(VillageIdentifyService villageIdentifyService) {
this.villageIdentifyService = villageIdentifyService;
}
}
@@ -0,0 +1,35 @@
package com.fangjia.bkoff.interceptor;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.sothis.core.beans.Bean;
import org.sothis.core.beans.Scope;
import org.sothis.web.mvc.ActionContext;
import org.sothis.web.mvc.ActionInvocation;
import org.sothis.web.mvc.ActionInvocationException;
import org.sothis.web.mvc.Interceptor;
import org.sothis.web.mvc.interceptors.HttpMultipartException;
import org.sothis.web.mvc.interceptors.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest;
/**
* ÎļþÉÏ´«À¹½ØÆ÷
* @author wenyan
*/
@Bean(scope = Scope.SINGLETON)
public class FileUploadInterceptor implements Interceptor {
public Object intercept(ActionInvocation invocation) throws ActionInvocationException {
ActionContext context = invocation.getActionContext();
HttpServletRequest request = context.getRequest();
if (ServletFileUpload.isMultipartContent(request)) {
try {
context.setRequest(new MultipartHttpServletRequest(request));
} catch (HttpMultipartException e) {
throw new ActionInvocationException("error process multipart reqeust: ", e);
}
}
return invocation.invoke();
}
}
@@ -38,6 +38,7 @@ public class ApiUserModel extends BaseModel {
private Integer creditLevelStatus;
private String priceType;
private Map<String,Double> priceRatingMap;
private Integer isMonitor;
public String getPriceType() {
return priceType;
@@ -606,4 +607,12 @@ public class ApiUserModel extends BaseModel {
public void setManager(String manager) {
this.manager = manager;
}
public Integer getIsMonitor() {
return isMonitor;
}
public void setIsMonitor(Integer isMonitor) {
this.isMonitor = isMonitor;
}
}
@@ -0,0 +1,152 @@
package com.fangjia.bkoff.model;
import com.fangjia.service.bo.BuildingRatioBo;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
public class BuildingRatioModel extends BaseModel{
private String id;
private String city_name;
private String region;
private String district;
private String building_name;
private String avg_price;
private String building_avg_price;
private String create_user;
private String note;
private Double ratio;
private String msg;
private List<BuildingRatioBo> buildingRatioBoList;
private BuildingRatioBo buildingRatioBo;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date c_date;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date m_date;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCity_name() {
return city_name;
}
public void setCity_name(String city_name) {
this.city_name = city_name;
}
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
public String getDistrict() {
return district;
}
public void setDistrict(String district_name) {
this.district = district_name;
}
public String getBuilding_name() {
return building_name;
}
public void setBuilding_name(String building_name) {
this.building_name = building_name;
}
public Double getRatio() {
return ratio;
}
public void setRatio(Double ratio) {
this.ratio = ratio;
}
public Date getC_date() {
return c_date;
}
public void setC_date(Date c_date) {
this.c_date = c_date;
}
public Date getM_date() {
return m_date;
}
public void setM_date(Date m_date) {
this.m_date = m_date;
}
public List<BuildingRatioBo> getBuildingRatioBoList() {
return buildingRatioBoList;
}
public void setBuildingRatioBoList(List<BuildingRatioBo> buildingRatioBoList) {
this.buildingRatioBoList = buildingRatioBoList;
}
public BuildingRatioBo getBuildingRatioBo() {
return buildingRatioBo;
}
public void setBuildingRatioBo(BuildingRatioBo buildingRatioBo) {
this.buildingRatioBo = buildingRatioBo;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public String getCreate_user() {
return create_user;
}
public void setCreate_user(String create_user) {
this.create_user = create_user;
}
public String getNote() {
return note;
}
public void setNote(String note) {
this.note = note;
}
public String getAvg_price() {
return avg_price;
}
public void setAvg_price(String avg_price) {
this.avg_price = avg_price;
}
public String getBuilding_avg_price() {
return building_avg_price;
}
public void setBuilding_avg_price(String building_avg_price) {
this.building_avg_price = building_avg_price;
}
}
@@ -0,0 +1,197 @@
package com.fangjia.bkoff.model;
import com.fangjia.dal.mongo.model.DevelopmentZone;
import com.fangjia.dal.mongo.model.LatlngPolygon;
import java.util.Date;
import java.util.List;
import java.util.Map;
public class DevelopmentZoneModel extends BaseModel {
private String id;
private String address;
private String buildDate;
private Date createTime;
private String industry;
private String area;
private String level;
private String name;
private String alias;
// private List<String> addr_alias;
private String nameEn;
private String province;
private String type;
private String url;
private String district;
List<List<Double>> shape;
List<List<Double>> bdShape;
private String block;
private DevelopmentZone developmentZone;
private List<DevelopmentZone> developmentZoneList;
private String cityName1;
public String getAlias() {
return alias;
}
public void setAlias(String alias) {
this.alias = alias;
}
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getBuildDate() {
return buildDate;
}
public void setBuildDate(String buildDate) {
this.buildDate = buildDate;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getIndustry() {
return industry;
}
public void setIndustry(String industry) {
this.industry = industry;
}
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getNameEn() {
return nameEn;
}
public void setNameEn(String nameEn) {
this.nameEn = nameEn;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public List<List<Double>> getShape() {
return shape;
}
public void setShape(List<List<Double>> shape) {
this.shape = shape;
}
public List<List<Double>> getBdShape() {
return bdShape;
}
public void setBdShape(List<List<Double>> bdShape) {
this.bdShape = bdShape;
}
public String getBlock() {
return block;
}
public void setBlock(String block) {
this.block = block;
}
public DevelopmentZone getDevelopmentZone() {
return developmentZone;
}
public void setDevelopmentZone(DevelopmentZone developmentZone) {
this.developmentZone = developmentZone;
}
public List<DevelopmentZone> getDevelopmentZoneList() {
return developmentZoneList;
}
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public void setDevelopmentZoneList(List<DevelopmentZone> developmentZoneList) {
this.developmentZoneList = developmentZoneList;
}
public String getCityName1() {
return cityName1;
}
public void setCityName1(String cityName1) {
this.cityName1 = cityName1;
}
}
@@ -0,0 +1,286 @@
package com.fangjia.bkoff.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.fangjia.dal.mongo.model.Township;
import java.util.List;
public class TownshipModel extends BaseModel {
private String province;
private String city1;
private String district;
private String street;
private String pid;
private String id;
@JSONField(name = "tjj_province_code")
private String tjjProvinceCode;
@JSONField(name = "tjj_city_code")
private String tjjCityCode;
@JSONField(name = "tjj_district_code")
private String tjjDistrictCode;
@JSONField(name = "tjj_street_code")
private String tjjStreetCode;
@JSONField(name = "tjj_source_year")
private Integer tjjSourceYear;
@JSONField(name = "mzb_province_code")
private String mzbProvinceCode;
@JSONField(name = "mzb_city_code")
private String mzbCityCode;
@JSONField(name = "mzb_district_code")
private String mzbDistrictCode;
@JSONField(name = "mzb_district_name")
private String mzbDistrictName;
@JSONField(name = "mzb_street_code")
private String mzbStreetCode;
private String type;
private String alias;
@JSONField(name = "street_pinyin")
private String streetPinyin;
//民政部区域和统计局区域是否相同,1为相同,0为不同,为了解决2条的问题
@JSONField(name = "district_diff")
private Integer districtDiff;
//乡镇街道是否输出 0:不输出 1:输出
@JSONField(name = "street_output")
private Integer streetOutput;
@JSONField(name = "province_short")
private String provinceShort;
@JSONField(name = "city_short")
private String cityShort;
@JSONField(name = "district_short")
private String districtShort;
private Township township;
private List<Township> townshipList;
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
public String getPid() {
return pid;
}
public void setPid(String pid) {
this.pid = pid;
}
public String getTjjProvinceCode() {
return tjjProvinceCode;
}
public void setTjjProvinceCode(String tjjProvinceCode) {
this.tjjProvinceCode = tjjProvinceCode;
}
public String getTjjCityCode() {
return tjjCityCode;
}
public void setTjjCityCode(String tjjCityCode) {
this.tjjCityCode = tjjCityCode;
}
public String getTjjDistrictCode() {
return tjjDistrictCode;
}
public void setTjjDistrictCode(String tjjDistrictCode) {
this.tjjDistrictCode = tjjDistrictCode;
}
public String getTjjStreetCode() {
return tjjStreetCode;
}
public void setTjjStreetCode(String tjjStreetCode) {
this.tjjStreetCode = tjjStreetCode;
}
public Integer getTjjSourceYear() {
return tjjSourceYear;
}
public void setTjjSourceYear(Integer tjjSourceYear) {
this.tjjSourceYear = tjjSourceYear;
}
public String getMzbProvinceCode() {
return mzbProvinceCode;
}
public void setMzbProvinceCode(String mzbProvinceCode) {
this.mzbProvinceCode = mzbProvinceCode;
}
public String getMzbCityCode() {
return mzbCityCode;
}
public void setMzbCityCode(String mzbCityCode) {
this.mzbCityCode = mzbCityCode;
}
public String getMzbDistrictCode() {
return mzbDistrictCode;
}
public void setMzbDistrictCode(String mzbDistrictCode) {
this.mzbDistrictCode = mzbDistrictCode;
}
public String getMzbDistrictName() {
return mzbDistrictName;
}
public void setMzbDistrictName(String mzbDistrictName) {
this.mzbDistrictName = mzbDistrictName;
}
public String getMzbStreetCode() {
return mzbStreetCode;
}
public void setMzbStreetCode(String mzbStreetCode) {
this.mzbStreetCode = mzbStreetCode;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getStreetPinyin() {
return streetPinyin;
}
public void setStreetPinyin(String streetPinyin) {
this.streetPinyin = streetPinyin;
}
public Integer getDistrictDiff() {
return districtDiff;
}
public void setDistrictDiff(Integer districtDiff) {
this.districtDiff = districtDiff;
}
public Integer getStreetOutput() {
return streetOutput;
}
public void setStreetOutput(Integer streetOutput) {
this.streetOutput = streetOutput;
}
public String getProvinceShort() {
return provinceShort;
}
public void setProvinceShort(String provinceShort) {
this.provinceShort = provinceShort;
}
public String getCityShort() {
return cityShort;
}
public void setCityShort(String cityShort) {
this.cityShort = cityShort;
}
public String getDistrictShort() {
return districtShort;
}
public void setDistrictShort(String districtShort) {
this.districtShort = districtShort;
}
public String getCity1() {
return city1;
}
public void setCity1(String city1) {
this.city1 = city1;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getAlias() {
return alias;
}
public void setAlias(String alias) {
this.alias = alias;
}
public Township getTownship() {
return township;
}
public void setTownship(Township township) {
this.township = township;
}
public List<Township> getTownshipList() {
return townshipList;
}
public void setTownshipList(List<Township> townshipList) {
this.townshipList = townshipList;
}
}
@@ -0,0 +1,365 @@
package com.fangjia.bkoff.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.fangjia.dal.mongo.model.Township;
import com.fangjia.dal.mongo.model.VillageIdentify;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.springframework.web.multipart.MultipartFile;
import javax.xml.crypto.Data;
import java.util.List;
import java.util.Date;
public class VillageIdentifyModel extends BaseModel {
private String province;
private String city1;
private String district;
private String town;
private String committee;
private String type;
private String provinceCode;
private String cityCode;
private String districtCode;
private String townCode;
private String committeeCode;
private String typeCode;
private String typeName;
private String verifyFlag;//涉农标识
private String addrVerify;//地址是否有效信息
private String countyLevelCity;//是否为县级市
private String administrativeTowns;//是否市辖建制镇
private String countyGov;//是否为县政府
private String devDistrict;//是否为开发区
private String devDistrictName;//开发区
private String devLevel;//开发区等级
private Double lat;
private Double lng;
private String addrArea;
//测试时使用
private String splitCommittee;
private String splitStreet;
private String poiName;
private String splitStreetNum;
private String dev;
private String communitySource;//居委来源
private String matchPoiName;//匹配poi的名称
private String regionInfo;//围栏区域信息
private String tjjDistrictName;
private Date createTime;
private String villageType;
private MultipartFile file;
private List<VillageIdentify> villageIdentifyList;
private String address;
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity1() {
return city1;
}
public void setCity1(String city1) {
this.city1 = city1;
}
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
public String getTown() {
return town;
}
public void setTown(String town) {
this.town = town;
}
public String getCommittee() {
return committee;
}
public void setCommittee(String committee) {
this.committee = committee;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getProvinceCode() {
return provinceCode;
}
public void setProvinceCode(String provinceCode) {
this.provinceCode = provinceCode;
}
public String getCityCode() {
return cityCode;
}
public void setCityCode(String cityCode) {
this.cityCode = cityCode;
}
public String getDistrictCode() {
return districtCode;
}
public void setDistrictCode(String districtCode) {
this.districtCode = districtCode;
}
public String getTownCode() {
return townCode;
}
public void setTownCode(String townCode) {
this.townCode = townCode;
}
public String getCommitteeCode() {
return committeeCode;
}
public void setCommitteeCode(String committeeCode) {
this.committeeCode = committeeCode;
}
public String getTypeCode() {
return typeCode;
}
public void setTypeCode(String typeCode) {
this.typeCode = typeCode;
}
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public String getVerifyFlag() {
return verifyFlag;
}
public void setVerifyFlag(String verifyFlag) {
this.verifyFlag = verifyFlag;
}
public String getAddrVerify() {
return addrVerify;
}
public void setAddrVerify(String addrVerify) {
this.addrVerify = addrVerify;
}
public String getCountyLevelCity() {
return countyLevelCity;
}
public void setCountyLevelCity(String countyLevelCity) {
this.countyLevelCity = countyLevelCity;
}
public String getAdministrativeTowns() {
return administrativeTowns;
}
public void setAdministrativeTowns(String administrativeTowns) {
this.administrativeTowns = administrativeTowns;
}
public String getCountyGov() {
return countyGov;
}
public void setCountyGov(String countyGov) {
this.countyGov = countyGov;
}
public String getDevDistrict() {
return devDistrict;
}
public void setDevDistrict(String devDistrict) {
this.devDistrict = devDistrict;
}
public String getDevDistrictName() {
return devDistrictName;
}
public void setDevDistrictName(String devDistrictName) {
this.devDistrictName = devDistrictName;
}
public String getDevLevel() {
return devLevel;
}
public void setDevLevel(String devLevel) {
this.devLevel = devLevel;
}
public Double getLat() {
return lat;
}
public void setLat(Double lat) {
this.lat = lat;
}
public Double getLng() {
return lng;
}
public void setLng(Double lng) {
this.lng = lng;
}
public String getAddrArea() {
return addrArea;
}
public void setAddrArea(String addrArea) {
this.addrArea = addrArea;
}
public String getSplitCommittee() {
return splitCommittee;
}
public void setSplitCommittee(String splitCommittee) {
this.splitCommittee = splitCommittee;
}
public String getSplitStreet() {
return splitStreet;
}
public void setSplitStreet(String splitStreet) {
this.splitStreet = splitStreet;
}
public String getPoiName() {
return poiName;
}
public void setPoiName(String poiName) {
this.poiName = poiName;
}
public String getSplitStreetNum() {
return splitStreetNum;
}
public void setSplitStreetNum(String splitStreetNum) {
this.splitStreetNum = splitStreetNum;
}
public String getDev() {
return dev;
}
public void setDev(String dev) {
this.dev = dev;
}
public String getCommunitySource() {
return communitySource;
}
public void setCommunitySource(String communitySource) {
this.communitySource = communitySource;
}
public String getMatchPoiName() {
return matchPoiName;
}
public void setMatchPoiName(String matchPoiName) {
this.matchPoiName = matchPoiName;
}
public String getRegionInfo() {
return regionInfo;
}
public void setRegionInfo(String regionInfo) {
this.regionInfo = regionInfo;
}
public String getTjjDistrictName() {
return tjjDistrictName;
}
public void setTjjDistrictName(String tjjDistrictName) {
this.tjjDistrictName = tjjDistrictName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getVillageType() {
return villageType;
}
public void setVillageType(String villageType) {
this.villageType = villageType;
}
public MultipartFile getFile() {
return file;
}
public void setFile(MultipartFile file) {
this.file = file;
}
public List<VillageIdentify> getVillageIdentifyList() {
return villageIdentifyList;
}
public void setVillageIdentifyList(List<VillageIdentify> villageIdentifyList) {
this.villageIdentifyList = villageIdentifyList;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
}
@@ -459,6 +459,11 @@ public class BaseAvgImportServlet extends HttpServlet {
price.setCat("district");
price.setModifyDate(new Date());
guidingPriceService.save(price);
Map<String, Object> udata = new HashMap<String, Object>();
udata.put("modificationDate", new Date());
districtService.updateById(udata, dis.getId());
HttpRequest request = new HttpRequest();
HashMap<String, String> params = new HashMap<String, String>();
params.put("category", "sell");
@@ -0,0 +1,148 @@
package com.fangjia.bkoff.util;
import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.usermodel.*;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* excel读写工具类
*
* @author shenjian
* @since 2021/07/12
*/
public class ExcelUtils {
public static Map<String, List> read(InputStream inputStream, int sheetIndex, int skipRow) {
// sheetIndex sheet下标
// skipRow 跳过的表头行数
Map<String, List> map = new HashMap<String, List>();
List<List<String>> ret = new ArrayList<List<String>>();
InputStream inp = null;
try {
inp = inputStream;
BufferedInputStream bufferedInputStream = new BufferedInputStream(inp, 1024 * 200);
Workbook workbook = WorkbookFactory.create(bufferedInputStream);
workbook.setForceFormulaRecalculation(true);
Sheet sheet = workbook.getSheetAt(sheetIndex);
//行号
int rowIndex = 0;
for (Row row : sheet) {
rowIndex++;
if (rowIndex <= skipRow) {
continue;
}
short minColIx = 0;
short maxColIx = row.getLastCellNum();
List<String> rowData = new ArrayList<String>();
for (short colIx = minColIx; colIx < maxColIx; colIx++) {
Cell cell = row.getCell(colIx);
if (cell == null) {
rowData.add(colIx, null);
} else {
if (StringUtils.isNotBlank(cell.toString())) {
rowData.add(getCellValue(cell).toString());
}else {
rowData.add("");
}
}
}
ret.add(rowData);
}
} catch (Exception e) {
e.printStackTrace();
} finally {
if (inp != null) {
try {
inp.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
map.put("header", ret.subList(0, 1).get(0));
map.put("data", ret.subList(1, ret.size()));
return map;
}
public static Object getCellValue(Cell cell) {
switch (cell.getCellType()) {
case Cell.CELL_TYPE_BLANK:
return null;
case Cell.CELL_TYPE_BOOLEAN:
return cell.getBooleanCellValue();
case Cell.CELL_TYPE_ERROR:
return ErrorEval.getText(cell.getErrorCellValue());
case Cell.CELL_TYPE_FORMULA:
try {
return cell.getNumericCellValue();
} catch (Exception e) {
try {
return cell.getStringCellValue();
} catch (Exception ex) {
return cell.getRichStringCellValue().getString();
}
}
case Cell.CELL_TYPE_NUMERIC:
if (org.apache.poi.ss.usermodel.DateUtil.isCellDateFormatted(cell)) {
return cell.getDateCellValue();
}
return cell.getNumericCellValue();
case Cell.CELL_TYPE_STRING:
return cell.getStringCellValue();
default:
return null;
}
}
public static class SimpleExcelListener extends AnalysisEventListener {
private List<List<String>> dataList = new ArrayList<List<String>>();
private List<String> headers = new ArrayList<String>();
@Override
public void invoke(Object o, AnalysisContext analysisContext) {
Map<String, String> map = (Map<String, String>) o;
dataList.add(new ArrayList<String>(map.values()));
}
@Override
public void invokeHeadMap(Map headMap, AnalysisContext context) {
for (Object val : headMap.values()) {
headers.add((String) val);
}
}
@Override
public void doAfterAllAnalysed(AnalysisContext analysisContext) {
}
List<List<String>> getDataList() {
return dataList;
}
void setDataList(List<List<String>> dataList) {
this.dataList = dataList;
}
public List<String> getHeaders() {
return headers;
}
public void setHeaders(List<String> headers) {
this.headers = headers;
}
}
}
@@ -9,7 +9,7 @@
<div class="city-border">
<div class="city-border-left hide" id="city-border-left"></div>
<div id="city-border-mid" class="">
<a title="选择城市" class="city-current" id="wt-city-title"><#if defaultValue?? && defaultValue != ''>${cityDisplayMap[defaultValue]}<#elseif showClear>无<#elseif showAll>全部<#else>选择城市</#if></a>
<a title="选择城市" class="city-current" id="wt-city-title"><#if defaultValue?? && defaultValue != '' &&cityDisplayMap[defaultValue]??>${cityDisplayMap[defaultValue]}<#elseif showClear>无<#elseif showAll>全部<#else>选择城市</#if></a>
<span class="downtip" id="wt-city-other"></span>
</div>
<div class="city-border-right hide" id="city-border-right"></div>
@@ -4,7 +4,7 @@ sothis.viewResolver.class=org.sothis.web.mvc.DefaultModelAndViewResolver
sothis.actionMapper.class=org.sothis.web.mvc.DefaultActionMapper
sothis.interceptors.params.class=org.sothis.web.mvc.interceptors.ParametersInterceptor
sothis.interceptors.upload.class=org.sothis.web.mvc.interceptors.FileUploadInterceptor
sothis.interceptors.upload.class=com.fangjia.bkoff.interceptor.FileUploadInterceptor
sothis.interceptors.auth.class=com.fangjia.bkoff.interceptor.AuthInterceptor
sothis.interceptors.stack.default=upload,params,auth
@@ -1,162 +1,206 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>api用户新增</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}" />
<#include "/common_js.ftl" />
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
<#include "/layout/header.ftl" />
<div class="main-content">
<font color="red">${msg!''}</font>
<div class="menuButton">
<a href="list" class="list">用户列表</a>
</div>
<hr/>
<div class="list">
<table width="50%">
<thead>
<tr>
<th align="center" width="150px;">
栏位
</th>
<th align="center">
值
</th>
</tr>
</thead>
<form id="addForm" action="doAdd" method="post" >
<tr>
<td><b>昵称</b></td>
<td><input name="displayName" value="${displayName!}" /></td>
</tr>
<tr>
<td><b>用户名</b></td>
<input name="userId" value="${userId!}" type="hidden"/>
<td><input id="userName" name="userName" value="${userName!}" /></td>
</tr>
<tr>
<td><b>密码</b></td>
<td><input name="password" type="text" value="" /></td>
</tr>
<tr>
<td><b>账户类型</b></td>
<td>
<select name="isTest">
<option value="0">正式账户</option>
<option value="1">测试账户</option>
</select>
</td>
</tr>
<tr>
<td>账户用途</td>
<td>
<select name="purpose">
<option value="" >请选择</option>
<option value="1" >API</option>
<option value="2" >PDS</option>
<option value="4" >房生活</option>
</select>
</td>
</tr>
<tr>
<td>Email</td>
<td><input name="email" value="${email!}" /></td>
</tr>
<tr>
<td>销售负责人</td>
<td><input name="manager" value="${manager!}" /></td>
</tr>
<tr>
<td>公司</td>
<td><input name="company" value="${company!}" /></td>
</tr>
<tr>
<td>估价调整比率</td>
<td><input name="evaluateRate" value="${evaluateRate!}" />(<b style="color: red">注意:</b>设置该参数后估价接口的返回价格将乘以该系数)</td>
</tr>
<tr>
<td>siteName</td>
<td><input name="siteName" value="${siteName!}" /></td>
</tr>
<tr>
<td>到期时间</td>
<td><input name="deadTime" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'%y-%M-{%d+7}'})"/></td>
</tr>
<tr>
<td>ip地址</td>
<td><textarea id="ip" name="ip" rows="5" cols="12" style="height: 120px;width: 250px;">${ip!}</textarea>(每行一个IP地址)</td>
</tr>
</form>
<tr>
<td colspan="2"><input onclick="submitForm();" type="submit" value="新增"/></td>
</tr>
</table>
</div>
</div>
<script type="text/javascript">
var _userNameCheck=false;
function submitForm(){
var ipText = $("#ip").val();
var ips = ipText.split('\n')
for(var i = 0;i<ips.length;i++){
ips[i] = $.trim(ips[i]);
if(ips[i]!=''&&!isIP(ips[i])){
alert("存在不合法的IP:"+ips[i])
return false
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>api用户新增</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}"/>
<#include "/common_js.ftl" />
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
<#include "/layout/header.ftl" />
<div class="main-content">
<font color="red">${msg!''}</font>
<div class="menuButton">
<a href="list" class="list">用户列表</a>
</div>
<hr/>
<div class="list">
<table width="50%">
<thead>
<tr>
<th align="center" width="150px;">
栏位
</th>
<th align="center">
值
</th>
</tr>
</thead>
<form id="addForm" action="doAdd" method="post">
<tr>
<td><b>昵称</b></td>
<td><input name="displayName" value="${displayName!}"/></td>
</tr>
<tr>
<td><b>用户名</b></td>
<input name="userId" value="${userId!}" type="hidden"/>
<td><input id="userName" name="userName" value="${userName!}"/></td>
</tr>
<tr>
<td><b>密码</b></td>
<td><input name="password" id="password" type="text" value=""/><input id="generatePassword" type="button" value="生成密码"/></td>
</tr>
<tr>
<td><b>账户类型</b></td>
<td>
<select name="isTest">
<option value="0">正式账户</option>
<option value="1">测试账户</option>
</select>
</td>
</tr>
<tr>
<td>账户用途</td>
<td>
<select name="purpose">
<option value="">请选择</option>
<option value="1">API</option>
<option value="2">PDS</option>
<option value="4">房生活</option>
</select>
</td>
</tr>
<tr>
<td>是否监控</td>
<td>
<input type="radio" name="isMonitor" value="0" checked="checked"/>不监控
<input type="radio" name="isMonitor" value="1" style="margin-left: 15px;"/>监控
</td>
</tr>
<tr>
<td>Email</td>
<td><input name="email" value="${email!}"/></td>
</tr>
<tr>
<td>销售负责人</td>
<td><input name="manager" value="${manager!}"/></td>
</tr>
<tr>
<td>公司</td>
<td><input name="company" value="${company!}"/></td>
</tr>
<tr>
<td>估价调整比率</td>
<td><input name="evaluateRate" value="${evaluateRate!}"/>(<b style="color: red">注意:</b>设置该参数后估价接口的返回价格将乘以该系数)
</td>
</tr>
<tr>
<td>siteName</td>
<td><input name="siteName" value="${siteName!}"/></td>
</tr>
<tr>
<td>到期时间</td>
<td><input name="deadTime"
onFocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'%y-%M-{%d+7}'})"/></td>
</tr>
<tr>
<td>ip地址</td>
<td><textarea id="ip" name="ip" rows="5" cols="12"
style="height: 120px;width: 250px;">${ip!}</textarea>(每行一个IP地址)
</td>
</tr>
</form>
<tr>
<td colspan="2"><input onclick="submitForm();" type="submit" value="新增"/></td>
</tr>
</table>
</div>
</div>
<script type="text/javascript">
var _userNameCheck = false;
function submitForm() {
var ipText = $("#ip").val();
var ips = ipText.split('\n')
for (var i = 0; i < ips.length; i++) {
ips[i] = $.trim(ips[i]);
if (ips[i] != '' && !isIP(ips[i])) {
alert("存在不合法的IP:" + ips[i])
return false
}
}
if (_userNameCheck) {
$("#addForm").submit();
}
}
if(_userNameCheck){
$("#addForm").submit();
}
}
function isIP(strIP) {
if (!strIP)
function isIP(strIP) {
if (!strIP)
return false;
var re = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/g //匹配IP地址的正则表达式
if (re.test(strIP)) {
if (RegExp.$1 < 256 && RegExp.$2 < 256 && RegExp.$3 < 256 && RegExp.$4 < 256) return true;
}
return false;
var re=/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/g //匹配IP地址的正则表达式
if(re.test(strIP))
{
if( RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256) return true;
}
return false;
}
jQuery('#userName').bind('blur',function(e) {
var _username=$("#userName").val();
jQuery.ajax({
type: "post",
url: "../apiUser/checkUserName",
data: {
userName:_username
},
dataType:'json',
success: function(msg){
$("#userName").parent().find(".wrong").remove();
if(msg.msg){
$("#userName").parent().append('<font style="color:red">' + getErrorValidate(msg.msg) + '</font>');
_userNameCheck=false;
}else{
$("#userName").parent().append('');
_userNameCheck=true;
}
},
error:function(msg) {}
});
});
var getErrorValidate= function(mess){
var _html='<span class=\"wrong\">';
_html=_html+mess;
_html=_html+'</span>';
return _html;
}
jQuery('#userName').bind('blur', function (e) {
var _username = $("#userName").val();
jQuery.ajax({
type: "post",
url: "../apiUser/checkUserName",
data: {
userName: _username
},
dataType: 'json',
success: function (msg) {
$("#userName").parent().find(".wrong").remove();
if (msg.msg) {
$("#userName").parent().append('<font style="color:red">' + getErrorValidate(msg.msg) + '</font>');
_userNameCheck = false;
} else {
$("#userName").parent().append('');
_userNameCheck = true;
}
},
error: function (msg) {
}
});
});
$("#generatePassword").click(function () {
var password = createPassword();
$("#password").val(password);
});
var getErrorValidate = function (mess) {
var _html = '<span class=\"wrong\">';
_html = _html + mess;
_html = _html + '</span>';
return _html;
}
var num = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
var english = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
var ENGLISH = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
var special = ["!", "@", "#", "$", "%", "^", "&", "*"];
var numAndengAndENGAndSpecial = num.concat(english).concat(ENGLISH).concat(special);
var randomNumAndengAndENGAndSpecial = "";
</script>
</body>
</html>
function getRandomElement(arr) {
return arr[parseInt(Math.random() * arr.length)];
}
function createPassword() {
var password = "";
// 确保至少包含一个特殊字符
password += getRandomElement(special);
// 随机选择其余7个字符
for (var i = 0; i < 7; i++) {
password += getRandomElement(numAndengAndENGAndSpecial);
}
// 将生成的密码打乱顺序
password = password.split('').sort(() => 0.5 - Math.random()).join('');
return password;
}
</script>
</body>
</html>
</#compress>
@@ -10,7 +10,27 @@
<#include "/common_js.ftl" />
<script type="text/javascript">
</script>
<#-- 将表头固定-->
<style>
table {
width: 100%;
border-collapse: collapse;
table-layout: fixed;
}
th, td {
border: 1px solid #dddddd;
text-align: left;
padding: 8px;
}
th {
position: sticky;
top: 0;
background-color: #f2f2f2;
}
</style>
</head>
<body>
@@ -31,12 +51,13 @@
<div class="list">
<table width="50%">
<thead>
<tr>Ap
<tr>
API数量:&nbsp<b>${authorityBoList?size}</b>个
<th align="center" width="15%">
uri
</th>
<th align="center" width="15%">
描述
API名称
</th>
<th align="center" width="10%">
是否有权限<input type="checkbox" id="auth" >全选</input>
@@ -63,7 +84,7 @@
${bo.uri!}
</td>
<td align="center">
${bo.description!}
${bo.name!}
</td>
<td align="center">
<input type="checkbox" <#if bo.hasAuth>checked </#if> id="auth_${bo_index + 1}" ></input>
@@ -43,10 +43,20 @@
<input id="userId" name="userId" value="${userId!}" type="hidden"/>
<td>${apiUserBo.userName!}<#if (apiUserBo.displayName??)>(${apiUserBo.displayName!})</#if></td>
</tr>
<#-- <tr>-->
<#-- <td>密码</td>-->
<#-- <td><input id="resetPwd" type="button" value="重置密码"/></td>-->
<#-- </tr>-->
<#-- <tr>-->
<#-- <td><b>密码</b></td>-->
<#-- <td><input name="password" value="${apiUserBo.password!}" /></td>-->
<#-- </tr>-->
<tr>
<td>密码</td>
<td><input id="resetPwd" type="button" value="重置密码"/></td>
<td>
&nbsp;&nbsp;&nbsp;&nbsp;<a href="../apiUser/editPwd?userId=${apiUserBo.userId!}">修改密码</a>
</td>
</tr>
<tr>
<td>账户类型</td>
<td>
@@ -72,6 +82,13 @@
</select>
</td>
</tr>
<tr>
<td>是否监控</td>
<td>
<input type="radio" <#if apiUserBo?? && apiUserBo.isMonitor?? && apiUserBo.isMonitor == 0>checked="checked"</#if> name="isMonitor" value="0" />不监控
<input type="radio" <#if apiUserBo?? && apiUserBo.isMonitor?? && apiUserBo.isMonitor == 1>checked="checked"</#if> name="isMonitor" value="1" style="margin-left: 15px;"/>监控
</td>
</tr>
<tr>
<td>Email</td>
<td><input name="email" value="${apiUserBo.email!}"/></td>
@@ -144,15 +161,15 @@
return re.test(strIP)
}
$("#resetPwd").click(function () {
if (confirm('确认重置密码为【123456】?')) {
$.get('resetPwd',
"userId=" + $("#userId").val(),
function (data) {
alert(status);
})
}
})
// $("#resetPwd").click(function () {
// if (confirm('确认重置密码为【123456】?')) {
// $.get('resetPwd',
// "userId=" + $("#userId").val(),
// function (data) {
// alert(status);
// })
// }
// })
</script>
</body>
</html>
@@ -0,0 +1,85 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>api用户密码修改</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}"/>
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
<#include "/common_js.ftl" />
<script type="text/javascript">
</script>
</head>
<body>
<#include "/layout/header.ftl" />
<div class="main-content">
<div class="list">
<table width="50%">
<form id="submitForm" action="doEditPwd" method="post" >
<tr>
<td>用户名</td>
<input id="userId" name="userId" value="${userId!}" type="hidden"/>
<td>${apiUserBo.userName!}<#if (apiUserBo.displayName??)>(${apiUserBo.displayName!})</#if></td>
</tr>
<tr>
<td><b>新密码</b></td>
<td><input name="password" id="password" value="${apiUserBo.password!}" /> <input id="generatePassword" type="button" value="生成密码"/></td></td>
</tr>
</form>
<tr>
<td></td>
<td><input onclick="submitForm();" type="reset" value="修改"/></td>
</tr>
</table>
</div>
</div>
<script type="text/javascript">
function submitForm() {
$("#submitForm").attr("action", "doEditPwd");
$("#submitForm").submit();
}
function isIP(strIP) {
if (!strIP)
return false;
var re = /^(\d+)(\.(\d+)){0,3}$/g //匹配IP地址的正则表达式
return re.test(strIP)
}
var num = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
var english = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
var ENGLISH = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
var special = ["!", "@", "#", "$", "%", "^", "&", "*"];
var numAndengAndENGAndSpecial = num.concat(english).concat(ENGLISH).concat(special);
var randomNumAndengAndENGAndSpecial = "";
function getRandomElement(arr) {
return arr[parseInt(Math.random() * arr.length)];
}
function createPassword() {
var password = "";
// 确保至少包含一个特殊字符
password += getRandomElement(special);
// 随机选择其余7个字符
for (var i = 0; i < 7; i++) {
password += getRandomElement(numAndengAndENGAndSpecial);
}
// 将生成的密码打乱顺序
password = password.split('').sort(() => 0.5 - Math.random()).join('');
return password;
}
$("#generatePassword").click(function () {
var password = createPassword();
$("#password").val(password);
});
</script>
</body>
</html>
</#compress>
@@ -1,140 +1,179 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>api用户列表</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}" />
<#include "/common_js.ftl" />
</head>
<body>
<#include "/layout/header.ftl" />
<div class="main-content">
<font color="red">${msg!''}</font>
<div class="menuButton">
<a href="list" class="list">用户列表</a><a href="add" class="create">新建用户</a>
</div>
<hr/>
<div class="list">
<div style="padding-left:5px;">
共有用户<b>${apiUserBoList?size}</b>个
</div>
<table width="100%">
<thead>
<tr>
<th align="center" width="55px">
ID
</th>
<th align="center" width="100px">
昵称
</th>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>api用户列表</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}"/>
<#include "/common_js.ftl" />
<#-- 将表头固定-->
<style>
table {
width: 100%;
border-collapse: collapse;
table-layout: fixed;
}
th, td {
border: 1px solid #dddddd;
text-align: left;
padding: 8px;
}
th {
position: sticky;
top: 0;
background-color: #f2f2f2;
}
.resizable-td {
resize: horizontal; /* 允许水平调整大小 */
overflow: auto; /* 显示滚动条以便查看超出部分 */
min-width: 50px; /* 设置最小宽度,防止过于缩小 */
}
</style>
</head>
<body>
<#include "/layout/header.ftl" />
<div class="main-content">
<font color="red">${msg!''}</font>
<div class="menuButton">
<a href="list" class="list">用户列表</a><a href="add" class="create">新建用户</a>
</div>
<hr/>
<div class="list">
<div style="padding-left:5px;">
共有用户<b>${apiUserBoList?size}</b>个
</div>
<table width="100%">
<thead>
<tr>
<th align="center" width="55px">
ID
</th>
<th align="center" width="100px">
昵称
</th>
<th align="center" width="60px">
账户用途
</th>
<th align="center" width="100px">
username
</th>
<th align="center" width="60px">
password
</th>
<th align="center" width="100px">
username
</th>
<th align="center" width="60px">
password
</th>
<th align="center" width="100px">
销售负责人
</th>
<th align="center" width="100px">
公司
</th>
<th align="center" width="550px">
appKey
</th>
<th align="center" width="150px">
appKey
</th>
<th align="center" width="60px">
账户类型
</th>
<th align="center" width="60px">
账户用途
</th>
<th align="center" width="60px">
是否监控
</th>
<th align="center" width="120px">
到期时间
</th>
<th align="center">
操作
</th>
</tr>
</thead>
<#if (apiUserBoList??&&apiUserBoList?size>0)>
<#list apiUserBoList as bo>
<tr <#if bo.status!=0>style="background-color:#C3C3C3"</#if>>
<td align="center">
${bo.userId!}
</td>
<td align="center">
<a href="../apiUser/edit?userId=${bo.userId!}">${bo.displayName!}</a>
</td>
<td>
<#if bo.purpose?? && bo.purpose == 1>
API
<#elseif bo.purpose?? && bo.purpose == 2>
PDS
<#elseif bo.purpose?? && bo.purpose == 4>
房生活
</#if>
</td>
<td align="center">
${bo.userName!}
</td>
<td align="center">
<#if bo.password?? && bo.password == t_util.md5Hex('123456')>
初始密码
<#else>
******
</#if>
</td>
<td align="center">
${bo.manager!}
</td>
<td align="center">
${bo.company!}
</td>
<td align="center">
${bo.appKey!}
</td>
<td align="center">
<#if bo.isTest==0>
正式账户
<#else>
测试账户
</#if>
</td>
<td>
<#if bo.purpose?? && bo.purpose == 1>
API
<#elseif bo.purpose?? && bo.purpose == 2>
PDS
<#elseif bo.purpose?? && bo.purpose == 4>
房生活
</#if>
</td>
<td align="center">
<#if bo.deadTime??>
${bo.deadTime?string("yyyy年MM月dd日")}
</#if>
</td>
<td align="center">
<a href="../apiUser/auth?userId=${bo.userId!}">权限控制</a>
<a href="../apiUser/city?userId=${bo.userId!}">城市管理</a>
<a href="../apiUser/priceRating?userId=${bo.userId!}">价格评级</a>
<#if bo.status==0>
<a href="javascript:if(confirm('确认禁用?')){location.href='../apiUser/status?userId=${bo.userId!}&status=1'}">禁用</a>
<#else>
<a href="javascript:if(confirm('确认再次启用?')){location.href='../apiUser/status?userId=${bo.userId!}&status=0'}"><font style="color:#198B3D;">再启用</font></a>
</#if>
</td>
</tr>
</#list>
</#if>
</table>
</div>
</div>
</body>
</html>
<th align="center">
操作
</th>
</tr>
</thead>
<#if (apiUserBoList??&&apiUserBoList?size>0)>
<#list apiUserBoList as bo>
<tr <#if bo.status!=0>style="background-color:#C3C3C3"</#if>>
<td align="center">
${bo.userId!}
</td>
<td align="center">
<a href="../apiUser/edit?userId=${bo.userId!}">${bo.displayName!}</a>
</td>
<td>
<#if bo.purpose?? && bo.purpose == 1>
API
<#elseif bo.purpose?? && bo.purpose == 2>
PDS
<#elseif bo.purpose?? && bo.purpose == 4>
房生活
</#if>
</td>
<td align="center">
${bo.userName!}
</td>
<td align="center">
<#if bo.password?? && bo.password == t_util.md5Hex('123456')>
初始密码
<#else>
******
</#if>
</td>
<td align="center">
${bo.manager!}
</td>
<td align="center">
${bo.company!}
</td>
<td align="center" class="resizable-td">
${bo.appKey!}
</td>
<td align="center">
<#if bo.isTest==0>
正式账户
<#else>
测试账户
</#if>
</td>
<td>
<#if bo.purpose?? && bo.purpose == 1>
API
<#elseif bo.purpose?? && bo.purpose == 2>
PDS
<#elseif bo.purpose?? && bo.purpose == 4>
房生活
</#if>
</td>
<td>
<#if bo.isMonitor==1>
是
<#else>
否
</#if>
</td>
<td align="center">
<#if bo.deadTime??>
${bo.deadTime?string("yyyy年MM月dd日")}
</#if>
</td>
<td align="center">
<a href="../apiUser/auth?userId=${bo.userId!}">API权限控制</a>
<a href="../apiUser/auth?userId=${bo.userId!}&msg=0">新增API</a>
<a href="../apiUser/city?userId=${bo.userId!}">城市管理</a>
<a href="../apiUser/priceRating?userId=${bo.userId!}">价格评级</a>
<#if bo.status==0>
<a href="javascript:if(confirm('确认禁用?')){location.href='../apiUser/status?userId=${bo.userId!}&status=1'}">禁用</a>
<#else>
<a href="javascript:if(confirm('确认再次启用?')){location.href='../apiUser/status?userId=${bo.userId!}&status=0'}"><font
style="color:#198B3D;">再启用</font></a>
</#if>
</td>
</tr>
</#list>
</#if>
</table>
</div>
</div>
</body>
</html>
</#compress>
@@ -1016,7 +1016,7 @@
var type = $(this).attr('type');
var data ={};
var commands = Array();
commands.push({city:'${district.city!}',region:'${district.region!}',name:'${district.name!}',estateType:'${district.estateType2!}'})
commands.push({id:'${district.id!}',city:'${district.city!}',region:'${district.region!}',name:'${district.name!}',estateType:'${district.estateType2!}'})
data.commands = commands ;
data.calcRange = type;
$.ajax({
@@ -68,7 +68,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script charset="utf-8" src="http://map.qq.com/api/js?v=2.exp&key=5fc2a1dec61fbd1df575a0967b87aa20"></script>
<script type="text/javascript">
@@ -0,0 +1,135 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>楼栋系数新增</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}" />
<#include "/common_js.ftl" />
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
<#include "/layout/header.ftl" />
<div class="main-content">
<font color="red">${msg!''}</font>
<div class="menuButton">
<a href="list" class="list">楼栋系数列表</a>
</div>
<hr/>
<div class="list">
<table width="50%">
<thead>
<tr>
<th align="center" width="150px;">
栏位
</th>
<th align="center">
值
</th>
</tr>
</thead>
<form id="addForm" action="doAdd" method="post" >
<tr>
<td><b>城市</b></td>
<td><input name="city_name" value="${city_name!}" /></td>
</tr>
<tr>
<td><b>区域</b></td>
<td><input id="region" name="region" value="${region!}" /></td>
</tr>
<tr>
<td><b>小区名称</b></td>
<td><input name="district" type="text" value="${district!}" /></td>
</tr>
<tr>
<td>楼栋名称</td>
<td><input name="building_name" value="${building_name!}" /></td>
</tr>
<tr>
<td>楼栋均价</td>
<td><input name="building_avg_price" oninput="getRatio()" value="${building_avg_price!}" onkeyup=
"value=value.replace(/[^\d]/g,'')" /></td>
</tr>
<tr>
<td>小区均价</td>
<td><input name="avg_price" oninput="getRatio()" value="${avg_price!}" onkeyup=
"value=value.replace(/[^\d]/g,'')" /></td>
</tr>
<tr>
<td>楼栋系数</td>
<td><input id="ratio" name="ratio" value="${ratio!}" readonly="true"/></td>
</tr>
<tr>
<td>创建人</td>
<td><input name="create_user" value="${session.realName!""}" /></td>
</tr>
<tr>
<td>备注</td>
<td><input name="note" value="${note!}" /></td>
</tr>
</form>
<tr>
<td colspan="2"><input onclick="submitForm();" type="submit" value="新增"/></td>
</tr>
</table>
</div>
</div>
<script type="text/javascript">
function getRatio() {
var building_avg_price = $("input[name='building_avg_price']").val();
var avg_price = $("input[name='avg_price']").val();
if(typeof(building_avg_price) == "undefined" || building_avg_price == ""){
return false;
}
if(typeof(avg_price) == "undefined" || avg_price == ""){
return false;
}
var ratio = building_avg_price/avg_price;
var num = new Number(ratio);
$("#ratio").val(num.toFixed(2));
}
function submitForm(){
var city_name = $("input[name='city_name']").val();
var region = $("input[name='region']").val();
var district = $("input[name='district']").val();
var building_name = $("input[name='building_name']").val();
var ratio = $("input[name='ratio']").val();
var create_user = $("input[name='create_user']").val();
if(typeof(city_name) == "undefined" || city_name == ""){
alert("城市不能为空");
return false;
}
if(typeof(region) == "undefined" || region == ""){
alert("区域不能为空");
return false;
}
if(typeof(district) == "undefined" || district == ""){
alert("小区名称不能为空");
return false;
}
if(typeof(building_name) == "undefined" || building_name == ""){
alert("楼栋名称不能为空");
return false;
}
if(typeof(ratio) == "undefined" || ratio == ""){
alert("楼栋系数不能为空");
return false;
}
if(typeof(create_user) == "undefined" || create_user == ""){
alert("创建人不能为空");
return false;
}
$("#addForm").submit();
}
var getErrorValidate= function(mess){
var _html='<span class=\"wrong\">';
_html=_html+mess;
_html=_html+'</span>';
return _html;
}
</script>
</body>
</html>
</#compress>
@@ -0,0 +1,136 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>楼栋系数信息修改</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}"/>
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
<#include "/common_js.ftl" />
<script type="text/javascript">
</script>
</head>
<body>
<#include "/layout/header.ftl" />
<div class="main-content">
<font color="red">${msg!''}</font>
<div class="menuButton">
<a href="list" class="list">楼栋系数列表</a><a href="add" class="create">新建楼栋系数</a>
</div>
<hr/>
<div class="list">
<table width="50%">
<thead>
<tr>
<th align="center" width="10%">
栏位
</th>
<th align="center" width="30%">
值
</th>
</tr>
</thead>
<form id="submitForm" action="update" method="post">
<tr>
<td>城市</td>
<td><input name="city_name" value="${buildingRatioBo.city_name!}"/></td>
</tr>
<tr>
<td>区域</td>
<td><input name="region" value="${buildingRatioBo.region!}"/></td>
</tr>
<tr>
<td>小区名称</td>
<td><input name="district" value="${buildingRatioBo.district!}"/></td>
</tr>
<tr>
<td>楼栋名称</td>
<input name="id" value="${buildingRatioBo.id!}" type="hidden"/>
<td><input name="building_name" value="${buildingRatioBo.building_name!}"/></td>
</tr>
<tr>
<td>楼栋均价</td>
<td><input name="building_avg_price" oninput="getRatio()" value="${buildingRatioBo.building_avg_price!}" onkeyup=
"value=value.replace(/[^\d]/g,'')" /></td>
</tr>
<tr>
<td>小区均价</td>
<td><input name="avg_price" oninput="getRatio()" value="${buildingRatioBo.avg_price!}" onkeyup=
"value=value.replace(/[^\d]/g,'')" /></td>
</tr>
<tr>
<td>楼栋系数</td>
<td><input id="ratio" name="ratio" value="${buildingRatioBo.ratio!}" readonly="true"/></td>
</tr>
<tr>
<td>创建人</td>
<td><input name="create_user" value="${buildingRatioBo.create_user!}" /></td>
</tr>
<tr>
<td>备注</td>
<td><input name="note" value="${buildingRatioBo.note!}" /></td>
</tr>
</form>
<tr>
<td></td>
<td><input onclick="submitForm();" type="reset" value="修改"/></td>
</tr>
</table>
</div>
</div>
<script type="text/javascript">
function getRatio() {
var building_avg_price = $("input[name='building_avg_price']").val();
var avg_price = $("input[name='avg_price']").val();
if(typeof(building_avg_price) == "undefined" || building_avg_price == ""){
return false;
}
if(typeof(avg_price) == "undefined" || avg_price == ""){
return false;
}
var ratio = building_avg_price/avg_price;
var num = new Number(ratio);
$("#ratio").val(num.toFixed(2));
}
function submitForm() {
var city_name = $("input[name='city_name']").val();
var region = $("input[name='region']").val();
var district = $("input[name='district']").val();
var building_name = $("input[name='building_name']").val();
var ratio = $("input[name='ratio']").val();
var create_user = $("input[name='create_user']").val();
if(typeof(city_name) == "undefined" || city_name == ""){
alert("城市不能为空");
return false;
}
if(typeof(region) == "undefined" || region == ""){
alert("区域不能为空");
return false;
}
if(typeof(district) == "undefined" || district == ""){
alert("小区名称不能为空");
return false;
}
if(typeof(building_name) == "undefined" || building_name == ""){
alert("楼栋名称不能为空");
return false;
}
if(typeof(ratio) == "undefined" || ratio == ""){
alert("楼栋系数不能为空");
return false;
}
if(typeof(create_user) == "undefined" || create_user == ""){
alert("创建人不能为空");
return false;
}
$("#submitForm").attr("action", "update");
$("#submitForm").submit();
}
</script>
</body>
</html>
</#compress>
@@ -0,0 +1,132 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>均价管理-楼栋系数管理</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}" />
<#include "/common_js.ftl" />
</head>
<body>
<#include "/layout/header.ftl" />
<div>
<form action="../buildingRatio/list" id="_search_ratio_form">
城市:<input type="text" name="city_name" value="${city_name!}" />
区域:<input type="text" name="region" value="${region!}" />
小区:<input type="text" name="district" value="${district!}" />
<input type="submit" value="查询" />
</form>
</div>
<div class="main-content">
<font color="red">${msg!''}</font>
<div class="menuButton">
<a href="list" class="list">楼栋系数列表</a><a href="add" class="create">新建楼栋系数</a>
</div>
<hr/>
<div class="list">
<div style="padding-left:5px;">
共有楼栋系数<b>${buildingRatioBoList?size}</b>个
</div>
<table width="100%">
<thead>
<tr>
<th align="center" width="55px">
ID
</th>
<th align="center" width="50px">
城市
</th>
<th align="center" width="60px">
区域
</th>
<th align="center" width="100px">
小区名称
</th>
<th align="center" width="60px">
楼栋名称
</th>
<th align="center" width="60px">
楼栋均价
</th>
<th align="center" width="60px">
小区均价
</th>
<th align="center" width="60px">
楼栋系数
</th>
<th align="center" width="60px">
创建人
</th>
<th align="center" width="150px">
创建日期
</th>
<th align="center" width="150px">
修改日期
</th>
<th align="center" width="100px">
备注
</th>
<th align="center">
操作
</th>
</tr>
</thead>
<#if (buildingRatioBoList??&&buildingRatioBoList?size>0)>
<#list buildingRatioBoList as bo>
<tr>
<td align="center">
${bo.id!}
</td>
<td align="center">
${bo.city_name!}
</td>
<td align="center">
${bo.region!}
</td>
<td align="center">
${bo.district!}
</td>
<td align="center">
${bo.building_name!}
</td>
<td align="center">
${bo.building_avg_price!}
</td>
<td align="center">
${bo.avg_price!}
</td>
<td align="center">
${bo.ratio!}
</td>
<td align="center">
${bo.create_user!}
</td>
<td align="center">
<#if bo.c_date??>
${bo.c_date?string("yyyy年MM月dd日 HH:mm:ss")}
</#if>
</td>
<td align="center">
<#if bo.m_date??>
${bo.m_date?string("yyyy年MM月dd日 HH:mm:ss")}
</#if>
</td>
<td align="center">
${bo.note!}
</td>
<td align="center">
<a href="../buildingRatio/edit?id=${bo.id!}">编辑</a>
<a href="../buildingRatio/doDelete?id=${bo.id}" onclick="return confirm('确定要删除 ${bo.city_name!}-${bo.region!}-${bo.district!}-${bo.building_name!}?')">删除</a>
</td>
</tr>
</#list>
</#if>
</table>
</div>
</div>
</body>
</html>
</#compress>
@@ -153,7 +153,7 @@ table{text-align: left;}
</div>
<div id="popMap" style="position:absolute;top:150px;left:50%;margin-left:-400px;border:1px solid #DADADA;padding:8px;z-index:999999;background:#F5F5F5;display:none;"></div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
function selectCity(id, display) {
if(typeof(display) == 'undefined' || display == 'undefined') {
@@ -25,7 +25,7 @@
<#include "/common_js.ftl" />
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script>
var map = new BMap.Map("map");
var city='${cityName!""}'
@@ -196,49 +196,55 @@
<tr>
<td>等级</td>
<td class="v"><#if officeDetail.bedKind??>${officeDetail.bedKind * 100}%<#else>未知</#if></td>
<td>建筑类型</td>
<#--<td>建筑类型</td>
<td class="v"><#if officeDetail.buildType??>${officeDetail.buildType * 100}%<#else>未知</#if></td>
-->
<td>经纬度-mapabc</td>
<td class="v"><#if officeDetail.latLng??>${officeDetail.latLng * 100}%<#else>未知</#if></td>
<td>经纬度-百度</td>
<td class="v"><#if officeDetail.latLng2??>${officeDetail.latLng2 * 100}%<#else>未知</#if></td>
<td>开发商</td>
<td class="v"><#if officeDetail.developer??>${officeDetail.developer * 100}%<#else>未知</#if></td>
</tr>
<tr>
<td>建筑面积</td>
<td class="v"><#if officeDetail.buildArea??>${officeDetail.buildArea * 100}%<#else>未知</#if></td>
<td>占地面积</td>
<td class="v"><#if officeDetail.allArea??>${officeDetail.allArea * 100}%<#else>未知</#if></td>
<td>入住时间</td>
<#--<td>入住时间</td>
<td class="v"><#if officeDetail.liveDate??>${officeDetail.liveDate * 100}%<#else>未知</#if></td>
<td>外景图</td>
<td class="v"><#if officeDetail.outPics??>${officeDetail.outPics * 100}%<#else>未知</#if></td>
-->
<td>容积率</td>
<td class="v"><#if officeDetail.cubagePercent??>${officeDetail.cubagePercent * 100}%<#else>未知</#if></td>
<td>绿化率</td>
<td class="v"><#if officeDetail.virescencePercent??>${officeDetail.virescencePercent * 100}%<#else>未知</#if></td>
</tr>
<tr>
<td>开发商</td>
<td class="v"><#if officeDetail.developer??>${officeDetail.developer * 100}%<#else>未知</#if></td>
<td>物业公司</td>
<td class="v"><#if officeDetail.estateCompany??>${officeDetail.estateCompany * 100}%<#else>未知</#if></td>
<td>容积率</td>
<td class="v"><#if officeDetail.cubagePercent??>${officeDetail.cubagePercent * 100}%<#else>未知</#if></td>
<td>绿化率</td>
<td class="v"><#if officeDetail.virescencePercent??>${officeDetail.virescencePercent * 100}%<#else>未知</#if></td>
<td>物业费</td>
<td class="v"><#if officeDetail.estateCharge??>${officeDetail.estateCharge * 100}%<#else>未知</#if></td>
<td>&nbsp;</td>
<td class="v">&nbsp;</td>
<td>&nbsp;</td>
<td class="v">&nbsp;</td>
</tr>
<tr>
<td>物业费</td>
<td class="v"><#if officeDetail.estateCharge??>${officeDetail.estateCharge * 100}%<#else>未知</#if></td>
<td>物业类型</td>
<#--<td>物业类型</td>
<td class="v"><#if officeDetail.estateType2??>${officeDetail.estateType2 * 100}%<#else>未知</#if></td>
<td>周边配套</td>
<td class="v"><#if officeDetail.facilities??>${officeDetail.facilities * 100}%<#else>未知</#if></td>
<td>项目特色</td>
<td class="v"><#if officeDetail.characteristic??>${officeDetail.characteristic * 100}%<#else>未知</#if></td>
-->
</tr>
<tr>
<td>均价</td>
<#--<td>均价</td>
<td class="v"><#if officeDetail.price??>${officeDetail.price * 100}%<#else>未知</#if></td>
<td>租金</td>
<td class="v"><#if officeDetail.rentPrice??>${officeDetail.rentPrice * 100}%<#else>未知</#if></td>
@@ -246,6 +252,7 @@
<td class="v">&nbsp;</td>
<td>&nbsp;</td>
<td class="v">&nbsp;</td>
-->
</tr>
</table>
@@ -0,0 +1,320 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>开发区围栏列表</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}" />
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
<#include "/common_js.ftl" />
<#include "/layout/header.ftl" />
<div class="main-content">
<div class="menuButton">
<a href="../developmentZone/list" class="list">开发区列表</a>&nbsp;&nbsp;
</div>
<div>
<form id="form1">
<#if developmentZone??>
<input id="id" name="id" type="hidden" value="${developmentZone.id!}"/>
</#if>
<table>
<tr>
<td>
<#if developmentZone??>
<@d_city defaultValue="${developmentZone.cityName1!}" callback="changeCity" callbackField="display" name="cityDisplay" />
<#else>
<@d_city defaultValue="上海" callback="changeCity" callbackField="display" name="cityDisplay" />
</#if>
</td>
<td>
<label for="province">所在省份:</label>
<select id="province" name="province" onchange="updateCityAndDistrict()">
<#if province??>
<option value="${province}">${province}</option>
<#else>
<option value="">请选择省份</option>
</#if>
</select>
<label for="cityName1">城市:</label>
<select id="cityName1" name="cityName1" onchange="updateDistrict()">
<!-- Options for cities will be populated by JavaScript -->
</select>
<label for="district">区域:</label>
<select id="district" name="district">
<!-- Options for districts will be populated by JavaScript -->
</select>
<label for="name">开发区名称:</label> <input id="name" name="name" type="text" placeholder="必填" value="<#if developmentZone??>${developmentZone.name!}</#if>"/>
<label for="alias">别名:</label>
<input id="alias" name="alias" type="text" placeholder="多个别名用,隔开" value="<#if developmentZone??><#list (developmentZone.alias)! as alia>${alia + ','}</#list><#else></#if>"/>
<label for="nameEn">开发区名称拼音:</label> <input id="nameEn" name="nameEn" type="text" value="<#if developmentZone??>${developmentZone.nameEn!}</#if>"/>
</br>
<label for="level">级别:</label> <input id="level" name="level" type="text" placeholder="必填" value="<#if developmentZone??>${developmentZone.level!}</#if>"/>
<label for="address">地址:</label> <input id="address" name="address" type="text" value="<#if developmentZone??>${developmentZone.address!}</#if>"/><br>
<label for="area">所在地区:</label> <input id="area" name="area" type="text" value="<#if developmentZone??>${developmentZone.area!}</#if>"/>
<label for="buildDate">建立年代:</label><input id="buildDate" name="buildDate" type="text" value="<#if developmentZone??>${developmentZone.buildDate!}</#if>"/>
<label for="type">类型:</label><input id="type" name="type" type="text" value="<#if developmentZone??>${developmentZone.type!}</#if>"/>
<label for="url">URL:</label><input id="url" name="url" type="text" value="<#if developmentZone??>${developmentZone.url!}</#if>"/><br>
<label for="industry">主导产业:</label><input id="industry" name="industry" type="text" value="<#if developmentZone??>${developmentZone.industry!}</#if>"/>
<label for="block">区块:</label><input id="block" name="block" type="text" value="<#if developmentZone??>${developmentZone.block!}</#if>"/><br/>
<input id="saveOrUpdate" type="button" value="提交"/>
</td>
</tr>
<tr>
<td colspan="2">
<input name="bdShape" id="bdShape" type="hidden"/>
<div id="allmap" style="width:100%;height:900px;"></div>
</td>
</tr>
</table>
</form>
</div>
</div>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script>
$(document).ready(function() {
fetchProvinces();
$('#province').change(function() {
updateCityAndDistrict();
});
$('#cityName1').change(function() {
updateDistrict();
});
});
function fetchProvinces() {
$.ajax({
type: 'GET',
url: '../developmentZone/provinces',
dataType: 'json',
success: function(data) {
let provinceSelect = $('#province');
provinceSelect.empty();
provinceSelect.append('<option value="">请选择省份</option>');
$.each(data, function(index, province) {
provinceSelect.append('<option value="' + province + '">' + province + '</option>');
});
},
error: function() {
// 处理错误
}
});
}
function updateCityAndDistrict() {
let province = $('#province').val();
let citySelect = $('#cityName1');
let districtSelect = $('#district');
citySelect.empty();
districtSelect.empty();
citySelect.append('<option value="">请选择城市</option>');
districtSelect.append('<option value="">请选择区域</option>');
if (province) {
$.ajax({
type: 'GET',
url: '../developmentZone/cities',
data: { province: province },
dataType: 'json',
success: function(data) {
$.each(data, function(index, city) {
citySelect.append('<option value="' + city + '">' + city + '</option>');
});
},
error: function() {
// 处理错误
}
});
}
}
function updateDistrict() {
let cityName1 = $('#cityName1').val();
let districtSelect = $('#district');
districtSelect.empty();
districtSelect.append('<option value="">请选择区域</option>');
if (cityName1) {
$.ajax({
type: 'GET',
url: '../developmentZone/districts',
data: { cityName1: cityName1 },
dataType: 'json',
success: function(data) {
$.each(data, function(index, district) {
districtSelect.append('<option value="' + district + '">' + district + '</option>');
});
},
error: function() {
// 处理错误
}
});
}
}
</script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<!--加载鼠标绘制工具-->
<script type="text/javascript" src="https://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
<link rel="stylesheet" href="https://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
<!--加载检索信息窗口-->
<script type="text/javascript" src="https://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.js"></script>
<link rel="stylesheet" href="https://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.css" />
<script type="application/javascript">
var map = new BMap.Map("allmap"); // 创建Map实例
if($("#cityDisplay").val()) {
map.centerAndZoom($("#cityDisplay").val(), 13);
}else {
map.centerAndZoom('上海', 13);
}
map.enableScrollWheelZoom(true);
function changeCity(display){
clearAll();
map.centerAndZoom(display, 13);
}
var overlays = [];
var overlaycomplete = function(e){
overlays.push(e.overlay);
var points = e.overlay.getPath();
var bdShape = [];
for(var i=0;i<points.length;i++) {
var location = [];
location.push(points[i].lng );
location.push(points[i].lat );
bdShape.push(location);
}
$("#bdShape").val(bdShape.join(";"));
// 在创建多边形后立即启用编辑
e.overlay.enableEditing();
};
var styleOptions = {
strokeColor:"red", //边线颜色。
fillColor:"red", //填充颜色。当参数为空时,圆形将没有填充效果。
strokeWeight: 1, //边线的宽度,以像素为单位。
strokeOpacity: 0.8, //边线透明度,取值范围0 - 1。
fillOpacity: 0.6, //填充的透明度,取值范围0 - 1。
strokeStyle: 'solid' //边线的样式,solid或dashed。
}
//实例化鼠标绘制工具
var drawingManager = new BMapLib.DrawingManager(map, {
isOpen: true, //是否开启绘制模式
enableDrawingTool: true, //是否显示工具栏
drawingToolOptions: {
anchor: BMAP_ANCHOR_TOP_RIGHT, //位置
offset: new BMap.Size(5, 5), //偏离值
},
circleOptions: styleOptions, //圆的样式
polylineOptions: styleOptions, //线的样式
polygonOptions: styleOptions, //多边形的样式
rectangleOptions: styleOptions //矩形的样式
});
//添加鼠标绘制工具监听事件,用于获取绘制结果
drawingManager.addEventListener('overlaycomplete', overlaycomplete);
function clearAll() {
for(var i = 0; i < overlays.length; i++){
map.removeOverlay(overlays[i]);
}
overlays.length = 0;
}
// 添加点击覆盖物事件监听器
map.addEventListener("click", function(e) {
// 判断点击的是否是已存在的覆盖物
if (e.overlay) {
// 如果是多边形或折线,则可以编辑
if (e.overlay instanceof BMap.Polygon || e.overlay instanceof BMap.Polyline) {
// 开启覆盖物编辑功能
e.overlay.enableEditing();
}
// 如果是标记点,则可以拖动
else if (e.overlay instanceof BMap.Marker) {
// 开启标记点拖动功能
e.overlay.enableDragging();
}
}
});
// 添加覆盖物编辑完成事件监听器
map.addEventListener("overlaycomplete", function(e) {
// 判断新增的覆盖物是否是多边形或折线
if (e.overlay instanceof BMap.Polygon || e.overlay instanceof BMap.Polyline) {
// 添加覆盖物编辑完成事件监听器
e.overlay.addEventListener("lineupdate", function() {
// 编辑完成后获取更新后的路径点,并更新表单中的数据
var points = e.overlay.getPath();
var bdShape = [];
for (var i = 0; i < points.length; i++) {
var location = [];
location.push(points[i].lng);
location.push(points[i].lat);
bdShape.push(location);
}
$("#bdShape").val(bdShape.join(";"));
});
}
});
$("#saveOrUpdate").click(function(){
// 更新表单中的点位置数据
updatePolygonPoints();
jQuery.ajax({
type: 'POST',
url: '../developmentZone/saveOrUpdate',
data: $("#form1").serialize(),
dataType: 'json',
timeout: 100000,
success: function(data) {
alert(data.msg);
location.href="list";
},
error : function() {
}
});
});
// 更新表单中的多边形点位置数据
function updatePolygonPoints() {
var polygons = map.getOverlays(BMap.Polygon);
for (var i = 0; i < polygons.length; i++) {
// 确保当前对象是一个多边形对象
if (polygons[i] instanceof BMap.Polygon) {
var points = polygons[i].getPath();
var bdShape = [];
for (var j = 0; j < points.length; j++) {
var location = [];
location.push(points[j].lng);
location.push(points[j].lat);
bdShape.push(location);
}
// 将更新后的点位置数据更新到表单中
$("#bdShape").val(bdShape.join(";"));
}
}
}
fetchProvinces()
</script>
</body>
</html>
</#compress>
@@ -0,0 +1,112 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>开发区围栏列表</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}"/>
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
<#include "/common_js.ftl" />
<#include "/layout/header.ftl" />
<div class="main-content">
<div class="menuButton">
<a href="../developmentZone/edit" target="_blank" class="list">新增开发区</a>&nbsp;&nbsp;
</div>
<form action="../developmentZone/list" id="_search_log_form">
<div>
<label for="province">省份:</label>
<input type="text" name="province" id="province" class="input-medium" style="margin-top:9px;"
value="${province!}"></input>
<label for="name">名称:</label>
<input type="text" name="name" id="name" class="input-medium" style="margin-top:9px;"
value="${name!}"></input>
<label for="name">开发区级别:</label>
<input type="text" name="level" id="level" class="input-medium" style="margin-top:9px;"
value="${level!}"></input>
<input id="queryBtn" class="btn btn-primary" type="submit" value="查询"/>
</div>
</form>
<div class="list" style="margin-top:5px;">
<span style="font-size:12px;">查询到<b style="color:red;">${pager.totalRows!}</b>条记录</span>
<table style="float:left;" name="reginTable" class="regionTab">
<tr>
<th>名称</th>
<th>别名</th>
<th>开发区级别</th>
<th>省份</th>
<th>城市</th>
<th>区域</th>
<th>区块</th>
<th>是否有围栏</th>
<th>操作人员</th>
<th>修改日期</th>
<th style="width: 120px;">操作</th>
</tr>
<#list developmentZoneList as it>
<tr>
<td>${it.name!}</td>
<td>
<#if it.alias??>
<#list it.alias as item>
${item?string}<#if item_has_next>, </#if>
</#list>
</#if>
</td>
<td>${it.level!}</td>
<td>${it.province!}</td>
<td>${it.cityName1!}</td>
<td>${it.district!}</td>
<td>${it.block!}</td>
<td>
<#if it.bdShape?has_content>
已有围栏
</#if>
</td>
<td>${it.operator!}</td>
<td>${it.createTime!?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>
<a href="show?id=${it.id!}" target="_blank">查看</a>
<a href="../developmentZone/edit?id=${it.id!}" target="_blank">新建围栏</a>
<#-- <a name="del${it_index}" href="javascript:;" ref="delete?id=${it.id!}">删除</a>-->
</td>
</tr>
</#list>
</table>
<#if pager??>
<@d_pager controller="developmentZone" action="list" currentPage=pager.currentPage totalPages=pager.totalPages theme="full"/>
</#if>
</div>
</div>
<script type="application/javascript">
$("a[name^='del']").click(function () {
if (!confirm('确认删除?')) {
return false;
}
var href = $(this).attr("ref");
jQuery.ajax({
type: 'get',
url: href,
dataType: 'json',
timeout: 100000,
success: function (data) {
location.reload();
},
error: function () {
}
});
})
</script>
</body>
</html>
</#compress>
@@ -0,0 +1,148 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>开发区围栏列表</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}"/>
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
<#include "/common_js.ftl" />
<#include "/layout/header.ftl" />
<div class="main-content">
<div class="menuButton">
<a href="../developmentZone/list" class="list">开发区列表</a>&nbsp;&nbsp;
</div>
<div>
<form id="form1">
<#if developmentZone??>
<input id="id" name="id" type="hidden" value="${developmentZone.id!}"/>
</#if>
<table>
<tr>
<td></td>
<td></td>
</tr>
<tr>
<td>省份</td>
<td>${developmentZone.province!}</td>
</tr>
<tr>
<td>城市</td>
<td>${developmentZone.cityName1!}</td>
</tr>
<tr>
<td>区域</td>
<td>${developmentZone.district!}</td>
</tr>
<tr>
<td>级别</td>
<td>${developmentZone.level!}</td>
</tr>
<tr>
<td>名称</td>
<td>${developmentZone.name!}</td>
</tr>
<tr>
<td>别名</td>
<td>
<#if developmentZone.alias??>
<#list developmentZone.alias as item>
${item?string}<#if item_has_next>, </#if>
</#list>
</#if>
</td>
</tr>
<tr>
<td>区块</td>
<td>${developmentZone.block!}</td>
</tr>
<tr>
<td colspan="2">
<div id="allmap" style="width:1024px;height:600px;"></div>
</td>
</tr>
<input id="saveOrUpdate" type="button" value="提交"/>
</table>
</form>
</div>
</div>
<script type="text/javascript"
src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<!--加载鼠标绘制工具-->
<script type="text/javascript"
src="https://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
<link rel="stylesheet" href="https://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"/>
<!--加载检索信息窗口-->
<script type="text/javascript"
src="https://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.js"></script>
<link rel="stylesheet" href="https://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.css"/>
<script type="application/javascript">
var map = new BMap.Map("allmap"); // 创建Map实例
map.enableScrollWheelZoom(true);
<#if developmentZone.bdShape??>
var polygon = new BMap.Polygon([
<#list developmentZone.bdShape.coordinates as latlng>
new BMap.Point(${latlng[0]?string("#.######")}, ${latlng[1]?string("#.######")})<#if latlng_index lt developmentZone.bdShape.coordinates?size>, </#if>
</#list>
], {strokeColor: "blue", strokeWeight: 2, strokeOpacity: 0.5});
</#if>
map.centerAndZoom(polygon.getBounds().getCenter(), 13);
map.addOverlay(polygon); //增加多边形
// 添加可编辑功能
polygon.enableEditing();
$("#saveOrUpdate").click(function(){
// 更新表单中的点位置数据
updatePolygonPoints();
jQuery.ajax({
type: 'POST',
url: '../developmentZone/saveOrUpdate',
data: $("#form1").serialize(),
dataType: 'json',
timeout: 100000,
success: function(data) {
alert(data.msg);
location.href="list";
},
error : function() {
}
});
});
// 更新表单中的多边形点位置数据
function updatePolygonPoints() {
var polygons = map.getOverlays(BMap.Polygon);
for (var i = 0; i < polygons.length; i++) {
// 确保当前对象是一个多边形对象
if (polygons[i] instanceof BMap.Polygon) {
var points = polygons[i].getPath();
var bdShape = [];
for (var j = 0; j < points.length; j++) {
var location = [];
location.push(points[j].lng);
location.push(points[j].lat);
bdShape.push(location);
}
// 将更新后的点位置数据更新到表单中
$("#bdShape").val(bdShape.join(";"));
}
}
}
</script>
</body>
</html>
</#compress>
@@ -331,7 +331,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script charset="utf-8" src="http://map.qq.com/api/js?v=2.exp&key=5fc2a1dec61fbd1df575a0967b87aa20"></script>
<script type="text/javascript">
@@ -642,8 +642,8 @@
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<script type="text/javascript">
$(document).ready(function(){
@@ -835,7 +835,20 @@ function add(){
alert('小区名不能为空!');
return false;
}
var estateType = $("#estateType2").val()
if(name.indexOf("商住")>-1){
if(estateType!="商住"){
alert('物业类型有误!');
return false;
}
}else{
if(name.indexOf("别墅")>-1){
if(estateType!="别墅"){
alert('物业类型有误!');
return false;
}
}
}
var alias=$("#alias").val();
if(alias){
var aliasArr=alias.toString().split("\n");
@@ -851,20 +864,20 @@ function add(){
}
}
var mappingAlias = $("#mappingAlias").val();
if(mappingAlias){
var aliasArr=alias.toString().split("\n");
var set=[];
for(var i=0;i<aliasArr.length;i++){
var aliasName=aliasArr[i].trim();
if(aliasName && aliasName!=''){
if(aliasName==name){
alert('小区名和别名不能相同!');
return false;
var mappingAlias = $("#mappingAlias").val();
if(mappingAlias){
var aliasArr=alias.toString().split("\n");
var set=[];
for(var i=0;i<aliasArr.length;i++){
var aliasName=aliasArr[i].trim();
if(aliasName && aliasName!=''){
if(aliasName==name){
alert('小区名和别名不能相同!');
return false;
}
}
}
}
}
var region = $("#region").val();
if (region == '') {
@@ -902,15 +915,35 @@ function add(){
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名已存在")
return false;
alert("小区名已存在");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
jQuery.ajax({
type: 'POST',
async: false,
url: '../district/checkDistrictName',
data: {city:city,region:region,name:name,cat:"district"},
dataType: 'json',
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名是其他小区的别名");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
@@ -930,13 +963,15 @@ function add(){
success: function(model) {
if (model.msg) {
alert('别名中 "' + model.msg + '" 已经是其他小区的小区名,不能作为别名使用!');
return false;
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
var flag = $("#goPic").val()
if(flag=="true"){
$("#lineForm").submit();
@@ -956,7 +991,7 @@ function add(){
});
}
}
@@ -21,7 +21,7 @@
<div id = "save">
<#assign markMap = district.markMap! />
<form id="lineForm" action="../district/save" method = "post">
<input type="hidden" name="district.id" value="${district.id}" />
<input type="hidden" id = "districtId" name="district.id" value="${district.id}" />
<input type="hidden" name="district.category" value="${district.category}" />
<input type="hidden" name="cityDisplay" value="${cityDisplay!}" />
<input type="hidden" name="keyword" value="${keyword!}" />
@@ -1052,8 +1052,8 @@
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<script type="text/javascript">
var flag=false;
$(document).ready(function(){
@@ -1130,26 +1130,38 @@ $(document).ready(function(){
alert('区域不能为空!');
return false;
}
/*
var dLat = $("#dLat").val();
if (dLat == '') {
alert('经纬度不能为空!');
return false;
}
var dLng = $("#dLng").val();
if (dLng == '') {
alert('经纬度不能为空!');
return false;
}
*/
var name = $("#districtName").val();
if (name == '') {
alert('小区名不能为空!');
return false;
}
if(name.indexOf("商住")>-1){
if(estateTypeStr!="商住"){
alert('物业类型有误!');
return false;
}
}else{
if(name.indexOf("别墅")>-1){
if(estateTypeStr!="别墅"){
alert('物业类型有误!');
return false;
}
}
}
var alias=$("#alias").val();
@@ -1183,14 +1195,56 @@ $(document).ready(function(){
}
}
/*
var address = $("#address").val();
if (address == '') {
alert('小区地址不能为空!');
return false;
}
*/
var id = $("#districtId").val();
var flg = false;
jQuery.ajax({
type: 'POST',
async: false,
url: '../district/validateDistrictName',
data: {city:city,region:region,name:name,cat:"district", id:id},
dataType: 'json',
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名已存在");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
jQuery.ajax({
type: 'POST',
async: false,
url: '../district/checkDistrictName',
data: {city:city,region:region,name:name,cat:"district",id:id},
dataType: 'json',
timeout: 100000,
success: function(model) {
if(model.exist){
alert("小区名是其他小区的别名");
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
jQuery.ajax({
type: 'POST',
@@ -1202,15 +1256,15 @@ $(document).ready(function(){
success: function(model) {
if (model.msg) {
alert('别名中 "' + model.msg + '" 已经是其他小区的小区名,不能作为别名使用!');
return false;
} else {
return true;
flg = true;
}
},
error : function() {
}
});
if(flg){
return false;
}
return true;
});
@@ -111,7 +111,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
</script>
</body>
@@ -44,7 +44,7 @@
<input type="text" id="seaAddress2" />
<input type="button" id="btn_sea2" value="查询" />
</div>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<script type="text/javascript" src="http://cache.amap.com/lbs/static/addToolbar.js"></script>
<script>
//debugger;
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>百度MAP</title>
<#include "/common_js.ftl" />
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
</head>
<body>
<form action="latlng">
@@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>百度MAP</title>
<#include "/common_js.ftl" />
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
</head>
<body>
@@ -25,7 +25,7 @@
<#include "/common_js.ftl" />
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script>
var map = new BMap.Map("map");
var point ;
@@ -374,7 +374,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$(document).ready(function(){
KindEditor.ready(function(K) {
@@ -79,14 +79,14 @@
<td class = "t1">
经度(高德)<font color="red">*</font></td>
<td>
<input name="district.lng" type="text" />
<input name="district.lng" type="text" id="dLng2" /> <a href="javascript:void(0);" id="goGaoDeMap">地图选择</a> 注:填入整数,如1213422150000
</td>
</tr>
<tr>
<td class = "t1">
纬度(高德)<font color="red">*</font></td>
<td>
<input name="district.lat" type="text" /> 注:填入整数,如393422150000
<input name="district.lat" type="text" id="dLat2" /> 注:填入整数,如393422150000
</td>
</tr>
<tr>
@@ -121,28 +121,30 @@
<option value="标准写字楼">标准写字楼</option>
<option value="创意园区">创意园区</option>
<option value="商住两用">商住两用</option>
<option value="综合体">综合体</option>
<option value="其他">其他</option>
</select>
</td>
</tr>
<tr>
<td class = "bg" style="color:red;font-size:15px;">建筑类型</td>
<td>
<input type="hidden" id="build_type" name="district.buildType"/>
<div id="standardOffice">
<input type="checkbox" name="build_type_t" value="纯写字楼">纯写字楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商务中心">商务中心&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="酒店写字楼">酒店写字楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商住楼">商住楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商务综合体">商务综合体&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商业综合体">商业综合体&nbsp;&nbsp;
</div>
<div id="garden">
<input type="checkbox" name="build_type_t" value="创意园区" >创意园区&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="创意产业园区" >创意产业园区&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="独栋写字楼">独栋写字楼&nbsp;&nbsp;
</div>
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "bg" style="color:red;font-size:15px;">建筑类型</td>-->
<#-- <td>-->
<#-- <input type="hidden" id="build_type" name="district.buildType"/>-->
<#-- <div id="standardOffice">-->
<#-- <input type="checkbox" name="build_type_t" value="纯写字楼">纯写字楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商务中心">商务中心&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="酒店写字楼">酒店写字楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商住楼">商住楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商务综合体">商务综合体&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商业综合体">商业综合体&nbsp;&nbsp;-->
<#-- </div>-->
<#-- <div id="garden">-->
<#-- <input type="checkbox" name="build_type_t" value="创意园区" >创意园区&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="创意产业园区" >创意产业园区&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="独栋写字楼">独栋写字楼&nbsp;&nbsp;-->
<#-- </div>-->
<#-- </td>-->
<#-- </tr>-->
<tr id="tr_block">
<td class = "t1">板块</td>
<td>
@@ -150,12 +152,12 @@
</select>
</td>
</tr>
<tr>
<td class="bg">商圈</td>
<td>
<input name="district.businessQuarter" type="text" style="width:300px" value="" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class="bg">商圈</td>-->
<#-- <td>-->
<#-- <input name="district.businessQuarter" type="text" style="width:300px" value="" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class="bg">乡镇街道</td>
<td>
@@ -285,12 +287,12 @@
<input name="district.carSiteCount" type="text" style="width:300px" value="" onkeydown="return justPositiveInteger(this,event);"/>个
</td>
</tr>
<tr>
<td class="t1">车位描述</td>
<td>
<input name="district.carSite" type="text" style="width:300px" value="" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class="t1">车位描述</td>-->
<#-- <td>-->
<#-- <input name="district.carSite" type="text" style="width:300px" value="" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class="t1">地上车位数</td>
@@ -335,12 +337,12 @@
<input name="istrict.propertyLife" type="text" style="width:300px" value="" />
</td>
</tr>
<tr>
<td class="bg">楼层情况</td>
<td>
<input name="district.floorInfo" type="text" style="width:300px" value="" onkeydown="return justPositiveInteger(this,event);"/>
</td>
</tr>
<#-- <tr>-->
<#-- <td class="bg">楼层情况</td>-->
<#-- <td>-->
<#-- <input name="district.floorInfo" type="text" style="width:300px" value="" onkeydown="return justPositiveInteger(this,event);"/>-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class="bg">净高</td>
<td>
@@ -456,12 +458,12 @@
<#-- </tr>-->
<tr>
<td class="t1">开盘时间</td>
<td>
<input name="district.openDate" type="text" style="width:300px" value="" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class="t1">开盘时间</td>-->
<#-- <td>-->
<#-- <input name="district.openDate" type="text" style="width:300px" value="" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class="bg">竣工时间</td>
<td>
@@ -583,11 +585,14 @@
</div>
<div id="popMap" style="position:absolute;top:150px;left:50%;margin-left:-400px;border:1px solid #DADADA;padding:8px;z-index:999999;background:#F5F5F5;display:none;"></div>
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<div id="gaoDeMap" style="position:absolute;top:150px;left:50%;margin-left:-400px;border:1px solid #DADADA;padding:8px;z-index:999999;background:#F5F5F5;display:none;"></div>
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.3&key=65d0404c8a96fc2a630d9621c10c25bf"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
function estateTypeChange(){
var estateType2=$("#estateType2").val();
@@ -777,6 +782,18 @@ $(document).ready(function(){
$("#popMap").load(url).show();
});
$("#goGaoDeMap").click(function(){
var url = "../district/gaoDeMap?cityDisplay=" + encodeURI($("#display").val());
if ($("#dLat2").val() != '') {
url += "&dLat=" + (parseInt($("#dLat2").val()) / 10000000000.0);
}
if ($("#dLng2").val() != '') {
url += "&dLng=" + (parseInt($("#dLng2").val()) / 10000000000.0);
}
$("#gaoDeMap").load(url).show();
});
});
function changeCity(display){
@@ -788,7 +788,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$(document).ready(function(){
KindEditor.ready(function(K) {
@@ -203,36 +203,38 @@
<option value="标准写字楼" <#if district.estateType2?? && district.estateType2=="标准写字楼">selected</#if>>标准写字楼</option>
<option value="创意园区" <#if district.estateType2?? && district.estateType2=="创意园区">selected</#if>>创意园区</option>
<option value="商住两用" <#if district.estateType2?? && district.estateType2=="商住两用">selected</#if>>商住两用</option>
<option value="综合体" <#if district.estateType2?? && district.estateType2=="综合体">selected</#if>>综合体</option>
<option value="其他" <#if district.estateType2?? && district.estateType2=="其他">selected</#if>>其他</option>
</select>
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["build_type"]?? && markMap["build_type"] == 1>
<i class="lock" name="build_type"></i>
<#else>
<i class="unlock" name="build_type"></i>
</#if>
<span style="color:red;font-size:15px;">建筑类型</span></td>
<td>
<input type="hidden" id="build_type" name="district.buildType" value="${district.buildType!}"/>
<div id="standardOffice" style="<#if district.estateType2?? && (district.estateType2=='园区')>display:none;</#if>" >
<input type="checkbox" name="build_type_t" value="纯写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("纯写字楼")>checked</#if> >纯写字楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商务中心" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商务中心")>checked</#if>>商务中心&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="酒店写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("酒店写字楼")>checked</#if>>酒店写字楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商住楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商住楼")>checked</#if>>商住楼&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商务综合体" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商务综合体")>checked</#if>>商务综合体&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="商业综合体" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商业综合体")>checked</#if>>商业综合体&nbsp;&nbsp;
</div>
<div id="garden" style="<#if district.estateType2?? && (district.estateType2=='标准写字楼')>display:none;</#if>">
<input type="checkbox" name="build_type_t" value="创意园区" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("创意园区")>checked</#if>>创意园区&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="创意产业园区" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("创意产业园区")>checked</#if>>创意产业园区&nbsp;&nbsp;
<input type="checkbox" name="build_type_t" value="独栋写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("独栋写字楼")>checked</#if>>独栋写字楼&nbsp;&nbsp;
</div>
<div id="businessCenter" style="<#if district.estateType2?? && (district.estateType2=='商务中心')>display:none;</#if>">
</div>
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "t1">-->
<#-- <#if markMap?? && markMap["build_type"]?? && markMap["build_type"] == 1>-->
<#-- <i class="lock" name="build_type"></i>-->
<#-- <#else>-->
<#-- <i class="unlock" name="build_type"></i>-->
<#-- </#if>-->
<#-- <span style="color:red;font-size:15px;">建筑类型</span></td>-->
<#-- <td>-->
<#-- <input type="hidden" id="build_type" name="district.buildType" value="${district.buildType!}"/>-->
<#-- <div id="standardOffice" style="<#if district.estateType2?? && (district.estateType2=='园区')>display:none;</#if>" >-->
<#-- <input type="checkbox" name="build_type_t" value="纯写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("纯写字楼")>checked</#if> >纯写字楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商务中心" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商务中心")>checked</#if>>商务中心&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="酒店写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("酒店写字楼")>checked</#if>>酒店写字楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商住楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商住楼")>checked</#if>>商住楼&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商务综合体" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商务综合体")>checked</#if>>商务综合体&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="商业综合体" <#if district.buildType?? && district.estateType2?? && district.estateType2=='标准写字楼'&& district.buildType?contains("商业综合体")>checked</#if>>商业综合体&nbsp;&nbsp;-->
<#-- </div>-->
<#-- <div id="garden" style="<#if district.estateType2?? && (district.estateType2=='标准写字楼')>display:none;</#if>">-->
<#-- <input type="checkbox" name="build_type_t" value="创意园区" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("创意园区")>checked</#if>>创意园区&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="创意产业园区" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("创意产业园区")>checked</#if>>创意产业园区&nbsp;&nbsp;-->
<#-- <input type="checkbox" name="build_type_t" value="独栋写字楼" <#if district.buildType?? && district.estateType2?? && district.estateType2=='园区'&& district.buildType?contains("独栋写字楼")>checked</#if>>独栋写字楼&nbsp;&nbsp;-->
<#-- </div>-->
<#-- <div id="businessCenter" style="<#if district.estateType2?? && (district.estateType2=='商务中心')>display:none;</#if>">-->
<#-- </div>-->
<#-- </td>-->
<#-- </tr>-->
<tr id="tr_block">
<td class = "t1">
<#if markMap?? && markMap["block"]?? && markMap["block"] == 1>
@@ -242,25 +244,24 @@
</#if>
板块</td>
<td>
<select id="block" name="district.block">
</select>
<input id="block" name="district.block" style="width:300px" value="${district.block!}"/>
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "t1">-->
<#-- <#if markMap?? && markMap["business_quarter"]?? && markMap["business_quarter"] == 1>-->
<#-- <i class="lock" name="business_quarter"></i>-->
<#-- <#else>-->
<#-- <i class="unlock" name="business_quarter"></i>-->
<#-- </#if>-->
<#-- 商圈</td>-->
<#-- <td>-->
<#-- <input name="district.businessQuarter" type="text" style="width:300px" value="${district.businessQuarter!}" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class = "t1">
<#if markMap?? && markMap["business_quarter"]?? && markMap["business_quarter"] == 1>
<i class="lock" name="business_quarter"></i>
<#else>
<i class="unlock" name="business_quarter"></i>
</#if>
商圈</td>
<td>
<input name="district.businessQuarter" type="text" style="width:300px" value="${district.businessQuarter!}" />
</td>
</tr>
<tr>
<td class="t1">
<#if markMap?? && markMap["township"]?? && markMap["township"]?is_number && markMap["township"] == 1>
<#if markMap?? && markMap["township"]?? && markMap["township"] == 1>
<i class="lock" name="township"></i>
<#else>
<i class="unlock" name="township"></i>
@@ -270,7 +271,6 @@
<input name="district.township" type="text" style="width:300px" value="${district.township!}" />
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["loop_line_info"]?? && markMap["loop_line_info"] == 1>
@@ -283,7 +283,6 @@
<input name="district.loopLineInfo" type="text" style="width:300px" value="${district.loopLineInfo!}" />
</td>
</tr>
</table>
<table class = "saveTable">
<tr>
@@ -492,7 +491,7 @@
<#if markMap?? && markMap["estate_charge"]?? && markMap["estate_charge"] == 1>
<i class="lock" name="estate_charge"></i>
<#else>
<i class="unlock" name="estate_charge"></i>
<i class="unlock" name="得房率"></i>
</#if>
物 业 费</td>
<td>
@@ -512,19 +511,19 @@
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["car_site"]?? && markMap["car_site"] == 1>
<i class="lock" name="car_site"></i>
<#else>
<i class="unlock" name="car_site"></i>
</#if>
车位描述
</td>
<td>
<input name="district.carSite" type="text" style="width:300px" value="${district.carSite!}" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "t1">-->
<#-- <#if markMap?? && markMap["car_site"]?? && markMap["car_site"] == 1>-->
<#-- <i class="lock" name="car_site"></i>-->
<#-- <#else>-->
<#-- <i class="unlock" name="car_site"></i>-->
<#-- </#if>-->
<#-- 车位描述-->
<#-- </td>-->
<#-- <td>-->
<#-- <input name="district.carSite" type="text" style="width:300px" value="${district.carSite!}" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class = "t1">
<#if markMap?? && markMap["land_car_site"]?? && markMap["land_car_site"] == 1>
@@ -620,18 +619,18 @@
<input name="district.propertyLife" type="text" style="width:300px" value="${district.propertyLife!}" />
</td>
</tr>
<tr>
<td class = "t1">
<#if markMap?? && markMap["floor_info"]?? && markMap["floor_info"] == 1>
<i class="lock" name="floor_info"></i>
<#else>
<i class="unlock" name="floor_info"></i>
</#if>
楼层情况</td>
<td>
<input name="district.floorInfo" type="text" style="width:300px" value="${district.floorInfo!}" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "t1">-->
<#-- <#if markMap?? && markMap["floor_info"]?? && markMap["floor_info"] == 1>-->
<#-- <i class="lock" name="floor_info"></i>-->
<#-- <#else>-->
<#-- <i class="unlock" name="floor_info"></i>-->
<#-- </#if>-->
<#-- 楼层情况</td>-->
<#-- <td>-->
<#-- <input name="district.floorInfo" type="text" style="width:300px" value="${district.floorInfo!}" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class = "t1">
<#if markMap?? && markMap["clear_height"]?? && markMap["clear_height"] == 1>
@@ -863,18 +862,18 @@
<#-- <textarea alias="richarea" name="district.fitment" style="width:400px;height:100px;">${district.fitment!}</textarea>-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class = "t1">
<#if markMap?? && markMap["open_date"]?? && markMap["open_date"] == 1>
<i class="lock" name="open_date"></i>
<#else>
<i class="unlock" name="open_date"></i>
</#if>
开盘时间</td>
<td>
<input name="district.openDate" type="text" style="width:300px" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd'})" value="${t_util.formatDate(district.openDate!)}" />
</td>
</tr>
<#-- <tr>-->
<#-- <td class = "t1">-->
<#-- <#if markMap?? && markMap["open_date"]?? && markMap["open_date"] == 1>-->
<#-- <i class="lock" name="open_date"></i>-->
<#-- <#else>-->
<#-- <i class="unlock" name="open_date"></i>-->
<#-- </#if>-->
<#-- 开盘时间</td>-->
<#-- <td>-->
<#-- <input name="district.openDate" type="text" style="width:300px" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd'})" value="${t_util.formatDate(district.openDate!)}" />-->
<#-- </td>-->
<#-- </tr>-->
<tr>
<td class = "t1">
<#if markMap?? && markMap["finish_building_date"]?? && markMap["finish_building_date"] == 1>
@@ -1114,7 +1113,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="../js/numValidator.js"></script>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
function estateTypeChange(){
var estateType2=$("#estateType2").val();
@@ -1276,34 +1275,34 @@ $(function(){
return true;
});
$("#region").change(function(){
jQuery.ajax({
type: 'POST',
url: '../district/getBlocks',
data: encodeURI("cityDisplay=" + $("#districtCity").val() + "&region=" + $(this).val()),
dataType: 'json',
timeout: 100000,
success: function(model) {
$("#block option").remove();
if (model.blockList.length > 0) {
$.each(model.blockList, function(i, block){
if ('${district.block!}' == block) {
$("<option value='" + block + "' selected>" + block + "</option>").appendTo($("#block"));
} else {
$("<option value='" + block + "'>" + block + "</option>").appendTo($("#block"));
}
});
$("#tr_block").show();
} else {
$("#block option").remove();
$("#tr_block").hide();
}
},
error : function() {
}
});
});
$("#region").change();
<#--$("#region").change(function(){-->
<#-- jQuery.ajax({-->
<#-- type: 'POST', -->
<#-- url: '../district/getBlocks',-->
<#-- data: encodeURI("cityDisplay=" + $("#districtCity").val() + "&region=" + $(this).val()),-->
<#-- dataType: 'json',-->
<#-- timeout: 100000,-->
<#-- success: function(model) {-->
<#-- $("#block option").remove();-->
<#-- if (model.blockList.length > 0) {-->
<#-- $.each(model.blockList, function(i, block){-->
<#-- if ('${district.block!}' == block) {-->
<#-- $("<option value='" + block + "' selected>" + block + "</option>").appendTo($("#block"));-->
<#-- } else {-->
<#-- $("<option value='" + block + "'>" + block + "</option>").appendTo($("#block"));-->
<#-- }-->
<#-- });-->
<#-- $("#tr_block").show();-->
<#-- } else {-->
<#-- $("#block option").remove();-->
<#-- $("#tr_block").hide();-->
<#-- }-->
<#-- },-->
<#-- error : function() {-->
<#-- }-->
<#-- });-->
<#--});-->
<#--$("#region").change();-->
$("#goPopMap").click(function(){
var url = "../district/map?cityDisplay=" + encodeURI($("#display").val());
@@ -26,7 +26,7 @@
</p>
</div>
<div id="allmap" style="width:1160px;height:700px;margin-top:20px;"></div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<!--加载鼠标绘制工具-->
<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
@@ -42,20 +42,23 @@
<#include "officeHeader.ftl"/>
<div>
<form action="../district2/officelist" id="_search_house_form">
城市:
<@d_city defaultValue="${cityDisplay!}" callback="changeCity" callbackField="display" name="cityDisplay" showCountry = "1" />
区域:
<select id="region" name="region" style="width: 80px;">
<option value="">不限</option>
<#list regionList! as r>
<option value="${r!}"<#if region! == r> selected</#if>>${r!}</option>
</#list>
</select>
类型:
类型:
<select name="estateType2" id="estateType2">
<option value="">不限</option>
<option value="标准写字楼" <#if estateType2?? & estateType2 == '标准写字楼'!>selected</#if>>标准写字楼</option>
<option value="创意园区" <#if estateType2?? & estateType2 == '创意园区'!>selected</#if>>创意园区</option>
<option value="商住两用" <#if estateType2?? & estateType2 == '商住两用'!>selected</#if>>商住两用</option>
<option value="综合体" <#if estateType2?? & estateType2 == '综合体'!>selected</#if>>综合体</option>
<option value="其他" <#if estateType2?? & estateType2 == '其他'!>selected</#if>>其他</option>
</select>
<input type="text" name="keyword" value="${keyword!}" placeholder="输入关键词搜索" />
@@ -345,6 +348,8 @@
<option value="标准写字楼" <#if district.estateType2?? && district.estateType2=='标准写字楼'>selected</#if>>标准写字楼</option>
<option value="创意园区" <#if district.estateType2?? && district.estateType2=='创意园区'>selected</#if>>创意园区</option>
<option value="商住两用" <#if district.estateType2?? && district.estateType2=='商住两用'>selected</#if>>商住两用</option>
<option value="综合体" <#if district.estateType2?? && district.estateType2=='综合体'>selected</#if>>综合体</option>
<option value="其他" <#if district.estateType2?? && district.estateType2=='其他'>selected</#if>>其他</option>
</select>
</td>
<td align="center" name="col19a" class="<#if columnIds?index_of('col19a')==-1>dn</#if>">
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

@@ -54,7 +54,7 @@
</div>
</div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<!--加载鼠标绘制工具-->
<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
@@ -48,7 +48,7 @@
</div>
</div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<!--加载鼠标绘制工具-->
<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
@@ -48,6 +48,8 @@
<@menuitem uri='/developer/list' text="开发商" />
<@menuitem uri='/agentMaster/listMaster' text="中介公司" />
<@menuitem uri='/mortgageInfo/list' text="抵押品" />
<@menuitem uri='/developmentZone/list' text="开发区" />
<@menuitem uri='/township/list' text="乡镇街道" />
</ul>
</li>
<li class="menu">
@@ -90,6 +92,7 @@
<ul>
<@menuitem uri='/avgPriceUpdate/doCreatTask' text="住宅均价管理" />
<@menuitem uri='/averagerConfig/list' text="住宅系数管理" />
<@menuitem uri='/buildingRatio/list' text="楼栋系数管理" />
<@menuitem uri='/avgPriceUpdate/listQR' text="价格质量跟踪" />
<@menuitem uri='/avgPriceUpdate/listSQR' text="样本质量跟踪" />
<@menuitem uri='/comparePrice/listQR' text="调查数据跟踪" />
@@ -291,6 +294,7 @@
<@menuitem uri='/openUriLog/evaluateManages' text="估价可信度管理"/>
<@menuitem uri='/creditRate/list' text="价格可信度与匹配率关系" />
<@menuitem uri='/czBank/sampleLogs' text="浙商银行" />
<@menuitem uri='/villageIdentify/importResult' text="涉农结果导入" />
</ul>
</li>
@@ -274,7 +274,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script charset="utf-8" src="http://map.qq.com/api/js?v=2.exp&key=5fc2a1dec61fbd1df575a0967b87aa20"></script>
<script type="text/javascript">
$(document).ready(function(){
@@ -28,8 +28,8 @@ table{text-align: left;}
<tr><td><strong>说明</strong></td><td colspan="2"><input size="40" id="description" name="description" value="${description!}"/></td></tr>
<tr><td><strong>是否监控结果</strong></td>
<td colspan="2">
<label><input name="save_result" type="radio" value="false" checked/>不监控 </label>
<label><input name="save_result" type="radio" value="true" />监控 </label>
<label><input name="save_result" type="radio" value="true" />不监控 </label>
<label><input name="save_result" type="radio" value="true" checked/>监控 </label>
</td>
</tr>
<tr><td clospan="2"><input type="button" id="_sub" value="创建"/></td></tr>
@@ -8,6 +8,25 @@
.up {color: green;}
#spinner{width:500px;height:100px;margin:30px 0 0 100px;text-align:center;padding-top:50px;border:2px solid #CCC;}
#checkMsg{width:500px;margin:30px 0 0 100px;padding:10px 0 10px 50px;text-align:left;border:2px solid #CCC;}
<#-- 将表头固定-->
table {
width: 100%;
border-collapse: collapse;
table-layout: fixed;
}
th, td {
border: 1px solid #dddddd;
text-align: left;
padding: 8px;
}
th {
position: sticky;
top: 0;
background-color: #f2f2f2;
}
</style>
</head>
<body>
@@ -162,7 +162,7 @@
<div id="popMap" style="position:absolute;top:150px;left:50%;margin-left:-400px;border:1px solid #DADADA;padding:8px;z-index:999999;background:#F5F5F5;display:none;"></div>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$(document).ready(function(){
$("#lineForm").submit(function(){
@@ -193,7 +193,7 @@
<div id="popMap" style="position:absolute;top:150px;left:50%;margin-left:-400px;border:1px solid #DADADA;padding:8px;z-index:999999;background:#F5F5F5;display:none;"></div>
<#--<script language="javascript" src="http://app.mapabc.com/apis?t=javascriptmap&v=3.1.1&key=b0a7db0b3a30f944a21c3682064dc70ef5b738b062f6479a5eca39725798b1ee300bd8d5de3a4ae3"></script>-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$(document).ready(function(){
$("#lineForm").submit(function(){
@@ -178,7 +178,7 @@
<div id="popMap" style="position:fixed;bottom:150px;right:10px;border:1px solid #DADADA;padding:8px;z-index:999999;background:#F5F5F5;display:none;"></div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="${staticUrl}/js/fangjia/jquery.editable.js?v=${version}"></script>
<script type="text/javascript">
var regionData = {}
@@ -68,7 +68,7 @@
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/lang/zh_CN.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script charset="utf-8" src="http://map.qq.com/api/js?v=2.exp&key=5fc2a1dec61fbd1df575a0967b87aa20"></script>
<script type="text/javascript">
@@ -0,0 +1,88 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>乡镇编辑</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}"/>
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
<#include "/common_js.ftl" />
<#include "/layout/header.ftl" />
<div class="main-content">
<div class="menuButton">
<a href="../township/list" class="list">乡镇街道列表</a>&nbsp;&nbsp;
</div>
<div class="list">
<form id="form1">
<#if township??>
<input id="id" name="id" type="hidden" value="${township.id!}"/>
</#if>
<table width="100px">
<tr>
<td>省份:</td>
<td><label for="province">${township.province!}</label></td>
</tr>
<tr>
<td>城市:</td>
<td><label for="city1">${township.city1!}</label></td>
</tr>
<tr>
<td>区域:</td>
<td><label for="district">${township.district!}</label></td>
</tr>
<tr>
<td>民政部区域:</td>
<td><label for="mzbDistrictName">${township.mzbDistrictName!}</label></td>
</tr>
<tr>
<td>乡镇街道:</td>
<td><label for="street">${township.street!}</label></td>
</tr>
<tr>
<td>别名:</td>
<td><textarea id="alias" name="alias" rows="5" cols="12"
style="height: 120px;width: 250px;"><#if township??><#list (township.alias)! as alia>${alia + ','}</#list><#else></#if></textarea>(别名用,隔开)
</td>
</tr>
<tr>
<td>
<input id="update" type="button" style="text-align:center" value="提交"/>
</td>
</tr>
</table>
</form>
</div>
</div>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script type="application/javascript">
$("#update").click(function () {
jQuery.ajax({
type: 'POST',
url: '../township/update',
data: $("#form1").serialize(),
dataType: 'json',
timeout: 100000,
success: function (data) {
alert(data.msg);
location.href = "list";
},
error: function () {
alert("请求失败")
}
});
});
</script>
</body>
</html>
</#compress>
@@ -0,0 +1,71 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>乡镇街道列表</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}"/>
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
</head>
<body>
<#include "/common_js.ftl" />
<#include "/layout/header.ftl" />
<div class="main-content">
<form action="../township/list" id="_search_log_form">
<div>
<label for="province">省份:</label>
<input type="text" name="province" id="province" class="input-medium" style="margin-top:9px;"
value="${province!}"></input>
<label for="name">城市:</label>
<input type="text" name="city1" id="city1" class="input-medium" style="margin-top:9px;"
value="${city1!}"></input>
<label for="name">区域:</label>
<input type="text" name="district" id="district" class="input-medium" style="margin-top:9px;"
value="${district!}"></input>
<label for="name">乡镇:</label>
<input type="text" name="street" id="street" class="input-medium" style="margin-top:9px;"
placeholder="乡镇或其别名"
value="${street!}"></input>
<input id="queryBtn" class="btn btn-primary" type="submit" value="查询"/>
</div>
</form>
<div class="list" style="margin-top:5px;">
<span style="font-size:12px;">查询到<b style="color:red;">${pager.totalRows!}</b>条记录</span>
<table style="float:left;" name="reginTable" class="regionTab">
<tr>
<th>省份</th>
<th>城市</th>
<th>区域</th>
<th>乡镇</th>
<th>乡镇别名</th>
<th>修改日期</th>
<th>操作人</th>
</tr>
<#list townshipList as it>
<tr>
<td>${it.province!}</td>
<td>${it.city1!}</td>
<td>${it.district!}</td>
<td><a href="../township/edit?id=${it.id!}"> ${it.street!}</a></td>
<td> <#if it.alias??>
<#list it.alias as item>
${item?string}<#if item_has_next>, </#if>
</#list>
</#if>
</td>
<td>${it.updateTime!?string("yyyy-MM-dd HH:mm:ss")}</td>
<td>${it.operator!}</td>
</tr>
</#list>
</table>
<#if pager??>
<@d_pager controller="township" action="list" currentPage=pager.currentPage totalPages=pager.totalPages theme="full"/>
</#if>
</div>
</div>
</body>
</html>
</#compress>
@@ -0,0 +1,221 @@
<#ftl attributes={"content_type":"text/html; charset=UTF-8"}>
<#compress>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>涉农结果导入</title>
<link rel="stylesheet" type="text/css" href="../style/main.css?v=${version}"/>
<script type="text/javascript" src="../js/My97DatePicker/WdatePicker.js"></script>
<#include "/common_js.ftl"/>
<style>
thead tr th {
text-align: center;
}
.hidden {
display: none;
}
.show {
display: inner-block;
}
</style>
</head>
<body>
<#include "/layout/header.ftl"/>
<div class="main-content">
<div style="height:50px;background: #efefef;">
<br/>
<form name="file" id="file" method="post" enctype="multipart/form-data">
<input id="files" type="file" name="file" accept="xls"/>
<input id="batch" type="submit" value="批量导入"/>
<a class="btn common_btn" href="expect">下载模板</a>
</form>
</div>
<form action="../villageIdentify/importResult" id="_search_log_form">
涉农类型:
<select id="type" name="villageType" class="span4">
<option value="对公">对公</option>
<option value="对私">对私</option>
</select>
城市:
<input style="width:80px;" name="city1" value="${city1!}" autocomplete="off"/>
地址:
<input style="width:200px;" name="address" value="${address!}" autocomplete="off"/>
<input id="queryBtn" type="submit" value="查询"/>
</form>
<div class="list">
<#if villageIdentifyList??>
<table>
<thead>
<tr>
<th>涉农类型</th>
<th>城市(参数)</th>
<th>地址</th>
<th>省份</th>
<th>省份编码</th>
<th>城市</th>
<th>城市编码</th>
<th>区县</th>
<th>区县编码</th>
<th>乡镇街道</th>
<th>乡镇街道编码</th>
<th>居委</th>
<th>居委编码</th>
<th>城乡编码</th>
<th>城乡分类</th>
<th>涉农标识</th>
<th>地址验证</th>
<th>是否县级市</th>
<th>是否市辖建制镇</th>
<th>是否开发区</th>
<th>开发区名称</th>
<th>开发区级别</th>
<th>是否县政府</th>
<th>所属区域</th>
<th>时间</th>
</tr>
</thead>
<tbody>
<#if (villageIdentifyList??&&villageIdentifyList?size>0)>
<#list villageIdentifyList as it>
<tr>
<td>${it.villageType!}</td>
<td>${it.cityParam!}</td>
<td>${it.address!}</td>
<td>${it.province!}</td>
<td>${it.provinceCode!}</td>
<td>${it.city1!}</td>
<td>${it.cityCode!}</td>
<td>${it.district!}</td>
<td>${it.districtCode!}</td>
<td>${it.town!}</td>
<td>${it.townCode!}</td>
<td>${it.committee!}</td>
<td>${it.committeeCode!}</td>
<td>${it.typeCode!}</td>
<td>${it.typeName!}</td>
<td>${it.verifyFlag!}</td>
<td>${it.addrVerify!}</td>
<td>${it.countyLevelCity!}</td>
<td>${it.administrativeTowns!}</td>
<td>${it.devDistrict!}</td>
<td>${it.devDistrictName!}</td>
<td>${it.devLevel!}</td>
<td>${it.countyGov!}</td>
<td>${it.addrArea!}</td>
<td>${it.createTime?string("yyyy-MM-dd")}</td>
</tr>
</#list>
</#if>
</tbody>
</table>
</#if>
<#if pager??>
<@d_pager action = "base" currentPage = pager.currentPage controller = "villageIdentify" totalPages = pager.totalPages/>
</#if>
</div>
</div>
<script type="text/javascript">
$('#batch').click(function () {
var filename = $('#files').val();
if (filename == undefined || filename == "") {
alert("未选择文件");
return;
} else {
var x = filename.split(".");
if (x[1] != "xlsx" && x[1] != "xls") {
alert("文件名后缀非法");
return;
}
}
var file = new FormData($("#file")[0]);
debugger
$.ajax({
url: '../villageIdentify/upload',
type: 'POST',
data: file,
cache: false,
contentType: false,
processData: false,
success: function (data) {
alert(JSON.parse(data).msg);
// window.location.reload();
},
error: function (returndata) {
alert("上传失败!");
}
});
});
var selectRegion = '${region!}'
function changeCity(display) {
if (display) {
$("#display").val(display);
}
jQuery.ajax({
type: 'POST',
url: '../district/getRegions',
data: encodeURI("cityDisplay=" + display),
dataType: 'json',
timeout: 100000,
success: function (model) {
$("#region").empty();
if (model.regionList.length > 0) {
$("<option value=''>不限</option>").appendTo($("#region"));
$.each(model.regionList, function (i, region) {
var orgRegion = model.regionMap[region];
if (selectRegion == region) {
$("<option value='" + region + "' selected>" + orgRegion + "</option>").appendTo($("#region"));
} else {
$("<option value='" + region + "' >" + orgRegion + "</option>").appendTo($("#region"));
}
});
}
},
error: function () {
}
});
}
$("th[order-field]").click(function () {
$("#orderby").val($(this).attr("order-field"));
var asc = $("#asc").val();
if (asc === "true" || asc === "") {
$("#asc").val(false)
} else {
$("#asc").val(true)
}
$("#queryBtn").trigger('click');
});
$("#_search_house_form").submit(function () {
var colIds = []
$("input[name='chkCol']").each(function () {
if ($(this).prop("checked")) {
colIds.push($(this).attr('id'));
}
});
$("#columnIds").val(colIds.join("_"));
});
$("input[name='chkCol']").click(function () {
if (!$(this).prop("checked")) {
$("[name='" + $(this).attr('id') + "']").hide();
} else {
$("[name='" + $(this).attr('id') + "']").show();
}
});
changeCity('${cityDisplay!}');
</script>
</body>
</html>
</#compress>
@@ -1085,7 +1085,7 @@ html {
<script type="text/javascript" src="../js/numValidator.js"></script>
<script type="text/javascript" src="../js/kindeditor-4.0/kindeditor.js"></script>
<script type="text/javascript" src="../js/jquery.MultiFile.pack.js"></script>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
var selectRegion = '${region!}';
var city = '${cityDisplay!}';
@@ -25,6 +25,7 @@ public class RegionData implements PriorityOrdered {
private final static Logger LOGGER = LoggerFactory.getLogger(RegionData.class);
private final static long REGION_RELOAD_INTERVAL = 1000;
private static DBCollection REGION_CONN = null;
private static DBCollection TOWN_CONN = null;
private static Set<String> ALL_CITY = new HashSet<String>();
private static Map<String,List<String>> cityAndAliasMap = new HashMap<String,List<String>>();
@@ -32,12 +33,15 @@ public class RegionData implements PriorityOrdered {
* ³ÇÊÐÔÓ¦¼±ðMap
*/
private static Map<String, Integer> cityGradeMap = new HashMap<String, Integer>();
protected final static Map<String, Map<String, Map<String, Map<String, List<String>>>>> townDataMap = new HashMap<String, Map<String, Map<String, Map<String, List<String>>>>>();
private static void init() {
try {
REGION_CONN = MongoUtils.getCollectionByName("fangjia", "region_block", MongoUtils.MongoDB_Domain_mongo, MongoUtils.MongoDB_Port_28017);
DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", MongoUtils.MongoDB_Domain_mongo, MongoUtils.MongoDB_Port_28017);
TOWN_CONN = MongoUtils.getCollectionByName("fangjia", "township", MongoUtils.MongoDB_Domain_mongo, MongoUtils.MongoDB_Port_28017);
DBCollection SERVER_AREA = MongoUtils.getCollectionByName("fangjia", "server_area", MongoUtils.MongoDB_Domain_mongo, MongoUtils.MongoDB_Port_28017);
DBCursor cursor = SERVER_AREA.find(new BasicDBObject(), new BasicDBObject("display", 1).append("city_grade", 1).append("alias", 1));
BasicDBObject dbo;
while(cursor.hasNext()){
@@ -58,6 +62,7 @@ public class RegionData implements PriorityOrdered {
start(REGION_RELOAD_INTERVAL);
reload();
// reloadTown();
}
private static void start(long time) {
@@ -114,6 +119,66 @@ public class RegionData implements PriorityOrdered {
LOGGER.info("RegionData reload() size [" + regionDataMap.size() + "]");
}
public static void reloadTown(){
DBObject query = new BasicDBObject();
query.put("year", 2022);
DBObject fields = new BasicDBObject();
fields.put("fangjia_city", 1);
fields.put("fangjia_area", 1);
fields.put("street_name", 1);
fields.put("alias", 1);
DBCursor cursor = TOWN_CONN.find(query, fields);
while (cursor.hasNext()) {
DBObject dbo = cursor.next();
String city = (String) dbo.get("fangjia_city");
String region = (String) dbo.get("fangjia_area");
String street = (String) dbo.get("street_name");
List<String> ps = (List<String>) dbo.get("alias");
if(!ALL_CITY.contains(city)){
continue;
}
Map<String, Map<String, Map<String, List<String>>>> cityRegionMap = townDataMap.get(city);
if(cityRegionMap == null){
cityRegionMap = new HashMap<String, Map<String, Map<String, List<String>>>>();
townDataMap.put(city, cityRegionMap);
}
Map<String, Map<String, List<String>>> regoinMap = cityRegionMap.get(region);
if(regoinMap == null){
regoinMap = new HashMap<String, Map<String, List<String>>>();
cityRegionMap.put(region, regoinMap);
}
Map<String, List<String>> townMap = regoinMap.get("street");
if(townMap == null){
townMap = new HashMap<String, List<String>>();
regoinMap.put(street, townMap);
}
if (CollectionUtils.isNotEmpty(ps) && ps.size() > 1) {
Collections.sort(ps, new Comparator<String>() {
public int compare(String arg0, String arg1) {
if (StringUtils.isBlank(arg0)) {
return 1;
}
if (StringUtils.isBlank(arg1)) {
return -1;
}
return arg1.length() - arg0.length();
}
});
}
if(null != ps && !ps.contains(street)){
ps.add(street);
}
townMap.put(street, ps);
}
LOGGER.info("TownData reload() size [" + townDataMap.size() + "]");
}
static class ScheduleRunTask extends TimerTask {
private int nextScheduleHour;
@@ -174,6 +239,28 @@ public class RegionData implements PriorityOrdered {
return ret;
}
public static String formatStreet(String city, String region, String street) {
if (StringUtils.isBlank(region) || StringUtils.isBlank(city) || StringUtils.isBlank(street)) {
return null;
}
String ret = null;
Map<String, Map<String, Map<String, List<String>>>> cityRegionMap = townDataMap.get(city);
if(MapUtils.isNotEmpty(cityRegionMap)){
Map<String, Map<String, List<String>>> streetMap = cityRegionMap.get(region);
if (MapUtils.isNotEmpty(streetMap)) {
for (Map<String, List<String>> crm : streetMap.values()) {
if (null != ret) {
break;
}
ret = format(crm, street);
}
}
}
return ret;
}
public static String parseRegionFormAddress(String city, String address){
if(StringUtils.isBlank(address)){
return null;
@@ -69,6 +69,7 @@ public class DataUtil {
private static final String hanziReg = "[\\u4e00-\\u9fa5]";
private static final String englishReg = "[A-Za-z]";
public static String[] TAGS =new String[]{"独栋", "联排", "叠加", "双拼", "花园面积", "泳池", "别墅", "带花园", "洋房", "叠拼", "独院", "联体", "微墅", "大平墅"};
public static String replaceAll(String original, String with, Pattern... pattern) {
if (StringUtils.isNotBlank(original)) {
@@ -1463,6 +1464,13 @@ public class DataUtil {
return false;
}
public static boolean isNumber(String s) {
if (s != null && !"".equals(s.trim()))
return s.matches("^[0-9]*$");
else
return false;
}
public static double roundDouble(double d, int scale) {
try {
double ret = new BigDecimal(String.valueOf(d)).setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue();
@@ -1834,6 +1842,44 @@ public class DataUtil {
return false;
}
/**
* 是否是别墅
* @return
*/
public static boolean isVilla(Double area, String name, Integer height, Integer room) {
if (area == null) {
return false;
}
if (area >= 150 && StringUtils.indexOfAny(name, TAGS) > -1) {
return true;
}
boolean ret = false;
if (height != null && room != null) {
if (height <= 3) {
if (area > 200 && room >= 5) {
ret = true;
}
}
}else if(height != null){
if (height <= 3) {
if (area > 200){
ret = true;
}
}
} else if (height == null && room != null) {
if (area > 360 && room >= 6) {
ret = true;
}
} else if (height == null && room == null) {
if (area > 500) {
ret = true;
}
}
return ret;
}
@@ -929,7 +929,7 @@
</div><!-- /container -->
<div style="bottom: 1px;left: 45%;position: fixed;"><button type="button" id="editDist" class="btn btn-default btn-info form-control" style="width:200px;"> 保 存 </button></div>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$("#region").change(function(){
@@ -12,7 +12,7 @@
</style>
<#include "/common_js.ftl" />
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$(document).ready(function(){
$("#queryBtn").click(function(){
@@ -12,7 +12,7 @@
</style>
<#include "/common_js.ftl" />
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
<script type="text/javascript">
$(document).ready(function(){
$("#queryBtn").click(function(){
@@ -534,7 +534,7 @@ public class SaleLeadsController {
try {
String ip = AnalyticsUtil.getIpAddress(request);
Long ipVisitCount = (Long) CacheUtils.getValue(FangJiaUserService.class, ip);
if(ipVisitCount != null && ipVisitCount > 30){
if(ipVisitCount != null && ipVisitCount > 3){
resultModel.setResult(Message.RESULT_FAIL);
resultModel.setMsg("该IP短信发送频繁");
return resultModel;
@@ -509,7 +509,7 @@ public class UserController {
try {
Long ipVisitCount = (Long) CacheUtils.getValue(FangJiaUserService.class, ip);
if(ipVisitCount != null && ipVisitCount > 20){
if(ipVisitCount != null && ipVisitCount > 2){
resultModel.setResult(Message.RESULT_FAIL);
resultModel.setMsg("该IP短信发送频繁");
return resultModel;
@@ -19,14 +19,11 @@
<script>
if((navigator.userAgent.match(/(iPad|iPhone|iPod|Android|ios)/i))){
<#--document.write("<link href='${staticUrl}/style/fangjia/v5/sm.css?v=${version}' rel='stylesheet'>");-->
document.write("<link href='${staticUrl}/style/fangjia/v5/light7-swiper.min.css?v=${version}' rel='stylesheet'>");
<#--document.write("<link href='${staticUrl}/style/fangjia/v5/main-m.css?v=${version}' rel='stylesheet'>");-->
<#--document.write("<link href='${staticUrl}/style/fangjia/v5/city-m.css?v=${version}' rel='stylesheet'>");-->
<#--document.write("<link href='${staticUrl}/style/fangjia/v5/theme-orange.css?v=${version}' rel='stylesheet'>");-->
document.write("<link href='${staticUrl}/style/fangjia/v6/mobile.css?v=${version}' rel='stylesheet'>");
}
</script>
</head>
@@ -50,7 +47,14 @@
<#-- </div>-->
<#--</div>-->
<<<<<<< HEAD
<#--fixedNav01-->
=======
<#--<div class="advert mobile01">-->
<#-- <a id="close">关闭</a>-->
<#-- <div class="left-ad"></div>-->
<#--</div>-->
>>>>>>> c7c2bae298951f01848f2b654c4c5e7fdba454c0
<div class="bannerIndex mobile01">
<div class="imgBoxIndex">
@@ -991,8 +995,6 @@
</script>
<script src="${staticUrl}/js/fangjia/v5/light7-swiper.min.js?v=${version}"></script>
<script>
/* 悬浮导航 */
$(".scroll-icon023").hover(function(){
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.mongo.dao.AdministrativeMappingDao;
import com.fangjia.dal.mongo.model.AdministrativeMapping;
public class AdministrativeMappingDaoImpl extends MongoDaoImpl<AdministrativeMapping> implements AdministrativeMappingDao {
}
@@ -0,0 +1,8 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.mongo.model.AdministrativeDivision;
import com.fangjia.dal.MongoDao;
public interface AdministrativeDivisionDao extends MongoDao<AdministrativeDivision> {
AdministrativeDivision findcityByCode(String code);
}
@@ -0,0 +1,23 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.mongo.model.AdministrativeDivision;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.QueryParam;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.List;
public class AdministrativeDivisionDaoImpl extends MongoDaoImpl<AdministrativeDivision> implements AdministrativeDivisionDao {
@Override
public AdministrativeDivision findcityByCode(String code) {
if (StringUtils.isBlank(code)) {
return new AdministrativeDivision();
}
List<QueryParam> params = new ArrayList<QueryParam>();
params.add(new QueryParam("mcaCityCode", QueryParam.EQUAL_OPERATOR, code));
params.add(new QueryParam("level", QueryParam.EQUAL_OPERATOR, "³ÇÊÐ"));
return (AdministrativeDivision) findFirstByParams(params);
}
}
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.AdministrativeMapping;
public interface AdministrativeMappingDao extends MongoDao<AdministrativeMapping> {
}
@@ -0,0 +1,16 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.AliasFang;
import java.util.List;
import java.util.Set;
/**
* @author shenjian
* @since 2024/6/11
*/
public interface AliasFangDao extends MongoDao<AliasFang> {
List<AliasFang> findFangByNameAndAlias(String city, String region, Set<String> names);
}
@@ -0,0 +1,40 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.QueryParam;
import com.fangjia.dal.mongo.model.AliasFang;
import com.fangjia.dal.mongo.model.ConsumerAddress;
import com.mongodb.BasicDBList;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import org.apache.commons.lang.StringUtils;
import org.sothis.core.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
public class AliasFangDaoImpl extends MongoDaoImpl<AliasFang> implements AliasFangDao{
@Override
public List<AliasFang> findFangByNameAndAlias(String city, String region, Set<String> names) {
DBObject query = new BasicDBObject();
if (StringUtils.isNotBlank(city)) {
query.put("city", city);
}
if (StringUtils.isNotBlank(region)) {
query.put("region", region);
}
// db.alias_fang.find({'city': 'ÖØÇì', 'region': 'Óå±±', $or: [{'name': 'ÖйúĦ'}, {'alias': 'ÖйúĦ'}]})
if(CollectionUtils.isNotEmpty(names)) {
BasicDBList dbList = new BasicDBList();
dbList.add(new BasicDBObject("name", new BasicDBObject("$in", names)));
dbList.add(new BasicDBObject("alias", new BasicDBObject("$in", names)));
query.put("$or", dbList);
}
List<AliasFang> objs = find(query, null, null, 0, Integer.MAX_VALUE);
return objs;
}
}
@@ -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.LatlngPolygon;
public interface DevelopmentZoneDao extends MongoDao<DevelopmentZone> {
}
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.mongo.model.DevelopmentZone;
import com.fangjia.dal.mongo.model.LatlngPolygon;
public class DevelopmentZoneDaoImpl extends MongoDaoImpl<DevelopmentZone> implements DevelopmentZoneDao {
}
@@ -22,6 +22,6 @@ public interface DistrictUpdateTaskDao extends MongoDao<DistrictUpdateTask> {
void createTask(District district);
void createTask(District district, int status);
void createTask(District district, int status, Integer type);
}
@@ -87,7 +87,7 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl<DistrictUpdateTask>
}
@Override
public void createTask(District district, int status) {
public void createTask(District district, int status, Integer type) {
DistrictUpdateTask task = new DistrictUpdateTask();
task.setCity(district.getCity());
task.setRegion(district.getRegion());
@@ -99,6 +99,12 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl<DistrictUpdateTask>
}else{
task.setEstateType("district");
}
if(null != type){
task.setType(type);
}
if(StringUtils.isNotBlank(district.getId())){
task.setCommId(district.getId());
}
this.save(task);
}
@@ -0,0 +1,8 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.Township;
public interface TownshipDao extends MongoDao<Township> {
}
@@ -0,0 +1,8 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.mongo.model.Township;
public class TownshipDaoImpl extends MongoDaoImpl<Township> implements TownshipDao {
}
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.Township;
import com.fangjia.dal.mongo.model.VillageIdentify;
public interface VillageIdentifyDao extends MongoDao<VillageIdentify> {
}
@@ -0,0 +1,9 @@
package com.fangjia.dal.mongo.dao;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.mongo.model.Township;
import com.fangjia.dal.mongo.model.VillageIdentify;
public class VillageIdentifyDaoImpl extends MongoDaoImpl<VillageIdentify> implements VillageIdentifyDao {
}
@@ -0,0 +1,12 @@
package com.fangjia.dal.mongo.dao.bkoff;
import com.fangjia.dal.MongoDao;
import com.fangjia.dal.mongo.model.bkoff.AveragerConfig;
import com.fangjia.dal.mongo.model.bkoff.BuildingRatio;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
public interface BuildingRatioDao extends MongoDao<BuildingRatio> {
}
@@ -0,0 +1,12 @@
package com.fangjia.dal.mongo.dao.bkoff;
import com.fangjia.dal.MongoDaoImpl;
import com.fangjia.dal.mongo.model.bkoff.AveragerConfig;
import com.fangjia.dal.mongo.model.bkoff.BuildingRatio;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
public class BuildingRatioDaoImpl extends MongoDaoImpl<BuildingRatio> implements BuildingRatioDao {
}
@@ -0,0 +1,148 @@
package com.fangjia.dal.mongo.model;
import com.fangjia.dal.DatastoreCategory;
import com.fangjia.dal.MongoEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
@Entity
@Table(name = "fangjia.administrative_division")
public class AdministrativeDivision implements MongoEntity {
private static final long serialVersionUID = -8379446820760559477L;
private String id;
private String province;
private String city;
private String district;
private String mcaProvinceCode;
private String mcaDistrictCode;
private String mcaCityCode;
private String level;
private String cityShort;
private String distShort;
private String provShort;
private String code;
private String administer;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "_id")
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "mca_province_code")
public String getMcaProvinceCode() {
return mcaProvinceCode;
}
public void setMcaProvinceCode(String mcaProvinceCode) {
this.mcaProvinceCode = mcaProvinceCode;
}
@Column(name = "mca_district_code")
public String getMcaDistrictCode() {
return mcaDistrictCode;
}
public void setMcaDistrictCode(String mcaDistrictCode) {
this.mcaDistrictCode = mcaDistrictCode;
}
@Column(name = "mca_city_code")
public String getMcaCityCode() {
return mcaCityCode;
}
public void setMcaCityCode(String mcaCityCode) {
this.mcaCityCode = mcaCityCode;
}
@Column(name = "level")
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
@Column(name = "city_short")
public String getCityShort() {
return cityShort;
}
public void setCityShort(String cityShort) {
this.cityShort = cityShort;
}
@Column(name = "dist_short")
public String getDistShort() {
return distShort;
}
public void setDistShort(String distShort) {
this.distShort = distShort;
}
@Column(name = "prov_short")
public String getProvShort() {
return provShort;
}
public void setProvShort(String provShort) {
this.provShort = provShort;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getAdminister() {
return administer;
}
public void setAdminister(String administer) {
this.administer = administer;
}
}
@@ -0,0 +1,255 @@
package com.fangjia.dal.mongo.model;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
import java.util.List;
@Entity
@Table(name = "business.administrative_mapping")
public class AdministrativeMapping implements MongoEntity {
private String id;
private String province;
private String city;
private String district;
private String street;
private String tjjStreetCode;
private String streetPinyin;
private String pid;
private String tjjProvinceCode;
private String tjjCityCode;
private String tjjDistrictCode;
private Integer tjjSourceYear;
private String mzbProvinceCode;
private String mzbCityCode;
private String mzbDistrictCode;
private String mzbDistrictName;
private String mzbStreetCode;
private Integer mzbSourceYear;
private String type;
private String districtShort;
private String cityShort;
private String provinceShort;
private List<String> alias;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "_id")
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
@Column(name = "province")
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
@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 = "street")
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
@Column(name = "pid")
public String getPid() {
return pid;
}
public void setPid(String pid) {
this.pid = pid;
}
@Column(name = "tjj_province_code")
public String getTjjProvinceCode() {
return tjjProvinceCode;
}
public void setTjjProvinceCode(String tjjProvinceCode) {
this.tjjProvinceCode = tjjProvinceCode;
}
@Column(name = "tjj_city_code")
public String getTjjCityCode() {
return tjjCityCode;
}
public void setTjjCityCode(String tjjCityCode) {
this.tjjCityCode = tjjCityCode;
}
@Column(name = "tjj_district_code")
public String getTjjDistrictCode() {
return tjjDistrictCode;
}
public void setTjjDistrictCode(String tjjDistrictCode) {
this.tjjDistrictCode = tjjDistrictCode;
}
@Column(name = "tjj_street_code")
public String getTjjStreetCode() {
return tjjStreetCode;
}
public void setTjjStreetCode(String tjjStreetCode) {
this.tjjStreetCode = tjjStreetCode;
}
@Column(name = "tjj_source_year")
public Integer getTjjSourceYear() {
return tjjSourceYear;
}
public void setTjjSourceYear(Integer tjjSourceYear) {
this.tjjSourceYear = tjjSourceYear;
}
@Column(name = "mzb_province_code")
public String getMzbProvinceCode() {
return mzbProvinceCode;
}
public void setMzbProvinceCode(String mzbProvinceCode) {
this.mzbProvinceCode = mzbProvinceCode;
}
@Column(name = "mzb_city_code")
public String getMzbCityCode() {
return mzbCityCode;
}
public void setMzbCityCode(String mzbCityCode) {
this.mzbCityCode = mzbCityCode;
}
@Column(name = "mzb_district_code")
public String getMzbDistrictCode() {
return mzbDistrictCode;
}
public void setMzbDistrictCode(String mzbDistrictCode) {
this.mzbDistrictCode = mzbDistrictCode;
}
@Column(name = "mzb_district_name")
public String getMzbDistrictName() {
return mzbDistrictName;
}
public void setMzbDistrictName(String mzbDistrictName) {
this.mzbDistrictName = mzbDistrictName;
}
@Column(name = "mzb_street_code")
public String getMzbStreetCode() {
return mzbStreetCode;
}
public void setMzbStreetCode(String mzbStreetCode) {
this.mzbStreetCode = mzbStreetCode;
}
@Column(name = "mzb_source_year")
public Integer getMzbSourceYear() {
return mzbSourceYear;
}
public void setMzbSourceYear(Integer mzbSourceYear) {
this.mzbSourceYear = mzbSourceYear;
}
@Column(name = "type")
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Column(name = "district_short")
public String getDistrictShort() {
return districtShort;
}
public void setDistrictShort(String districtShort) {
this.districtShort = districtShort;
}
@Column(name = "city_short")
public String getCityShort() {
return cityShort;
}
public void setCityShort(String cityShort) {
this.cityShort = cityShort;
}
@Column(name = "province_short")
public String getProvinceShort() {
return provinceShort;
}
public void setProvinceShort(String provinceShort) {
this.provinceShort = provinceShort;
}
@Column(name = "alias")
public List<String> getAlias() {
return alias;
}
public void setAlias(List<String> alias) {
this.alias = alias;
}
@Column(name = "street_pinyin")
public String getStreetPinyin() {
return streetPinyin;
}
public void setStreetPinyin(String streetPinyin) {
this.streetPinyin = streetPinyin;
}
}
@@ -0,0 +1,68 @@
package com.fangjia.dal.mongo.model;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
/**
* ËÑ·¿Ãû³ÆÓë±ðÃû¹ØÏµ
*/
@Entity
@Table(name = "business.alias_fang")
public class AliasFang implements MongoEntity {
private String id;
private String city;
private String region;
private String name;
private String alias;
@Override
@Id
@GeneratedValue
@Column(name = "_id", unique = true, nullable = false)
public String getId() {
return id;
}
@Override
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 = "region")
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
@Column(name = "name")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Column(name = "alias")
public String getAlias() {
return alias;
}
public void setAlias(String alias) {
this.alias = alias;
}
}
@@ -0,0 +1,219 @@
package com.fangjia.dal.mongo.model;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Entity
@Table(name = "fangjia_base.development_zone")
public class DevelopmentZone implements MongoEntity {
private String id;
private String address;
private String buildDate;
private Date createTime;
private String industry;
private String area;
private String level;
private String name;
private String nameEn;
private String province;
private String type;
private String url;
// 高德经纬度
private Map<String, Object> shape;
// 百度经纬度
private Map<String, Object> bdShape;
private String block;
private String operator;
private String cityName1;
private String district;
//增加别名字段
private List<String> alias;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "_id")
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
@Column(name = "address")
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
@Column(name = "build_date")
public String getBuildDate() {
return buildDate;
}
public void setBuildDate(String buildDate) {
this.buildDate = buildDate;
}
@Column(name = "create_time")
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Column(name = "industry")
public String getIndustry() {
return industry;
}
public void setIndustry(String industry) {
this.industry = industry;
}
@Column(name = "level")
public String getLevel() {
return level;
}
public void setLevel(String level) {
this.level = level;
}
@Column(name = "name")
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Column(name = "name_en")
public String getNameEn() {
return nameEn;
}
public void setNameEn(String nameEn) {
this.nameEn = nameEn;
}
@Column(name = "province")
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
@Column(name = "type")
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Column(name = "url")
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
@Column(name = "shape")
public Map<String, Object> getShape() {
return shape;
}
public void setShape(Map<String, Object> shape) {
this.shape = shape;
}
@Column(name = "bd_shape")
public Map<String, Object> getBdShape() {
return bdShape;
}
public void setBdShape(Map<String, Object> bdShape) {
this.bdShape = bdShape;
}
@Column(name = "area")
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
@Column(name = "block")
public String getBlock() {
return block;
}
public void setBlock(String block) {
this.block = block;
}
@Column(name = "operator")
public String getOperator() {
return operator;
}
public void setOperator(String operator) {
this.operator = operator;
}
@Column(name = "city")
public String getCityName1() {
return cityName1;
}
public void setCityName1(String cityName1) {
this.cityName1 = cityName1;
}
@Column(name = "district")
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "alias")
public List<String> getAlias() {
return alias;
}
public void setAlias(List<String> alias) {
this.alias = alias;
}
}
@@ -184,7 +184,7 @@ public class DistrictFacilitys implements MongoEntity {
this.bus = bus;
}
@Column(name = "metro")
@Column(name = "subway")
public List<String> getMetro() {
return metro;
}
@@ -27,6 +27,7 @@ public class DistrictUpdateTask implements MongoEntity {
private Integer status; // 1:删除 2:区域,各称修改 3.关联删除 4.物业类型修改 5:新增小区
private String msg;
private String estateType;
private String commId;
@Id
@GeneratedValue
@@ -121,4 +122,12 @@ public class DistrictUpdateTask implements MongoEntity {
public void setNewCity(String newCity) {
this.newCity = newCity;
}
@Column(name="comm_id")
public String getCommId() {
return commId;
}
public void setCommId(String commId) {
this.commId = commId;
}
}
@@ -0,0 +1,328 @@
package com.fangjia.dal.mongo.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
@Entity
@Table(name = "business.administrative_mapping")
public class Township implements MongoEntity {
private String province;
private String city1;
private String district;
private String street;
private String pid;
private String id;
@JSONField(name = "tjj_province_code")
private String tjjProvinceCode;
@JSONField(name = "tjj_city_code")
private String tjjCityCode;
@JSONField(name = "tjj_district_code")
private String tjjDistrictCode;
@JSONField(name = "tjj_street_code")
private String tjjStreetCode;
@JSONField(name = "tjj_source_year")
private Integer tjjSourceYear;
@JSONField(name = "mzb_province_code")
private String mzbProvinceCode;
@JSONField(name = "mzb_city_code")
private String mzbCityCode;
@JSONField(name = "mzb_district_code")
private String mzbDistrictCode;
@JSONField(name = "mzb_district_name")
private String mzbDistrictName;
@JSONField(name = "mzb_street_code")
private String mzbStreetCode;
private String type;
private List<String> alias;
@JSONField(name = "street_pinyin")
private String streetPinyin;
//民政部区域和统计局区域是否相同,1为相同,0为不同,为了解决2条的问题
@JSONField(name = "district_diff")
private Integer districtDiff;
//乡镇街道是否输出 0:不输出 1:输出
@JSONField(name = "street_output")
private Integer streetOutput;
@JSONField(name = "province_short")
private String provinceShort;
@JSONField(name = "city_short")
private String cityShort;
@JSONField(name = "district_short")
private String districtShort;
private String operator;
private Date createTime;
private Date updateTime;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "_id")
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
@Column(name = "province")
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
@Column(name = "city")
public String getCity1() {
return city1;
}
public void setCity1(String city1) {
this.city1 = city1;
}
@Column(name = "district")
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "street")
public String getStreet() {
return street;
}
public void setStreet(String street) {
this.street = street;
}
@Column(name = "pid")
public String getPid() {
return pid;
}
public void setPid(String pid) {
this.pid = pid;
}
@Column(name = "tjj_province_code")
public String getTjjProvinceCode() {
return tjjProvinceCode;
}
public void setTjjProvinceCode(String tjjProvinceCode) {
this.tjjProvinceCode = tjjProvinceCode;
}
@Column(name = "tjj_city_code")
public String getTjjCityCode() {
return tjjCityCode;
}
public void setTjjCityCode(String tjjCityCode) {
this.tjjCityCode = tjjCityCode;
}
@Column(name = "tjj_district_code")
public String getTjjDistrictCode() {
return tjjDistrictCode;
}
public void setTjjDistrictCode(String tjjDistrictCode) {
this.tjjDistrictCode = tjjDistrictCode;
}
@Column(name = "tjj_street_code")
public String getTjjStreetCode() {
return tjjStreetCode;
}
public void setTjjStreetCode(String tjjStreetCode) {
this.tjjStreetCode = tjjStreetCode;
}
@Column(name = "tjj_source_year")
public Integer getTjjSourceYear() {
return tjjSourceYear;
}
public void setTjjSourceYear(Integer tjjSourceYear) {
this.tjjSourceYear = tjjSourceYear;
}
@Column(name = "mzb_province_code")
public String getMzbProvinceCode() {
return mzbProvinceCode;
}
public void setMzbProvinceCode(String mzbProvinceCode) {
this.mzbProvinceCode = mzbProvinceCode;
}
@Column(name = "mzb_city_code")
public String getMzbCityCode() {
return mzbCityCode;
}
public void setMzbCityCode(String mzbCityCode) {
this.mzbCityCode = mzbCityCode;
}
@Column(name = "mzb_district_code")
public String getMzbDistrictCode() {
return mzbDistrictCode;
}
public void setMzbDistrictCode(String mzbDistrictCode) {
this.mzbDistrictCode = mzbDistrictCode;
}
@Column(name = "mzb_district_name")
public String getMzbDistrictName() {
return mzbDistrictName;
}
public void setMzbDistrictName(String mzbDistrictName) {
this.mzbDistrictName = mzbDistrictName;
}
@Column(name = "mzb_street_code")
public String getMzbStreetCode() {
return mzbStreetCode;
}
public void setMzbStreetCode(String mzbStreetCode) {
this.mzbStreetCode = mzbStreetCode;
}
@Column(name = "type")
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Column(name = "alias")
public List<String> getAlias() {
return alias;
}
public void setAlias(List<String> alias) {
this.alias = alias;
}
@Column(name = "street_pinyin")
public String getStreetPinyin() {
return streetPinyin;
}
public void setStreetPinyin(String streetPinyin) {
this.streetPinyin = streetPinyin;
}
@Column(name = "district_diff")
public Integer getDistrictDiff() {
return districtDiff;
}
public void setDistrictDiff(Integer districtDiff) {
this.districtDiff = districtDiff;
}
@Column(name = "street_output")
public Integer getStreetOutput() {
return streetOutput;
}
public void setStreetOutput(Integer streetOutput) {
this.streetOutput = streetOutput;
}
@Column(name = "province_short")
public String getProvinceShort() {
return provinceShort;
}
public void setProvinceShort(String provinceShort) {
this.provinceShort = provinceShort;
}
@Column(name = "city_short")
public String getCityShort() {
return cityShort;
}
public void setCityShort(String cityShort) {
this.cityShort = cityShort;
}
@Column(name = "district_short")
public String getDistrictShort() {
return districtShort;
}
public void setDistrictShort(String districtShort) {
this.districtShort = districtShort;
}
@Column(name = "operator")
public String getOperator() {
return operator;
}
public void setOperator(String operator) {
this.operator = operator;
}
@Column(name = "c_date")
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Column(name = "m_date")
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}
@@ -0,0 +1,442 @@
package com.fangjia.dal.mongo.model;
import com.alibaba.fastjson.annotation.JSONField;
import com.fangjia.dal.MongoEntity;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
@Entity
@Table(name = "fangjia.village_identify_result")
public class VillageIdentify implements MongoEntity {
@Id
@JSONField(name = "_id")
private String id;
@JSONField(name = "address")
private String address;
@JSONField(name = "province")
private String province;
@JSONField(name = "city")
private String city1;
@JSONField(name = "city_param")
private String cityParam;
@JSONField(name = "district")
private String district;
@JSONField(name = "town")
private String town;
@JSONField(name = "committee")
private String committee;
@JSONField(name = "type")
private String type;
@JSONField(name = "province_code")
private String provinceCode;
@JSONField(name = "city_code")
private String cityCode;
@JSONField(name = "district_code")
private String districtCode;
@JSONField(name = "town_code")
private String townCode;
@JSONField(name = "committee_code")
private String committeeCode;
@JSONField(name = "type_code")
private String typeCode;
@JSONField(name = "type_name")
private String typeName;
@JSONField(name = "verify_flag")
private String verifyFlag;//涉农标识
@JSONField(name = "addr_verify")
private String addrVerify;//地址是否有效信息
@JSONField(name = "county_level_city")
private String countyLevelCity;//是否为县级市
@JSONField(name = "administrative_towns")
private String administrativeTowns;//是否市辖建制镇
@JSONField(name = "county_gov")
private String countyGov;//是否为县政府
@JSONField(name = "dev_district")
private String devDistrict;//是否为开发区
@JSONField(name = "dev_district_name")
private String devDistrictName;//开发区
@JSONField(name = "dev_level")
private String devLevel;//开发区等级
@JSONField(name = "lat")
private Double lat;
@JSONField(name = "lng")
private Double lng;
@JSONField(name = "addr_area")
private String addrArea;
//测试时使用
@JSONField(name = "split_committee")
private String splitCommittee;
@JSONField(name = "split_street")
private String splitStreet;
@JSONField(name = "poi_name")
private String poiName;
@JSONField(name = "split_street_num")
private String splitStreetNum;
@JSONField(name = "dev")
private String dev;
@JSONField(name = "community_source")
private String communitySource;//居委来源
@JSONField(name = "match_poi_name")
private String matchPoiName;//匹配poi的名称
@JSONField(name = "region_info")
private String regionInfo;//围栏区域信息
@JSONField(name = "tjj_district_name")
private String tjjDistrictName;
@JSONField(name = "village_type")
private String villageType;
@JSONField(name = "c_date")
private Date createTime;
@Column(name = "address")
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
@Column(name = "province")
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
@Column(name = "city")
public String getCity1() {
return city1;
}
public void setCity1(String city1) {
this.city1 = city1;
}
@Column(name = "district")
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "town")
public String getTown() {
return town;
}
public void setTown(String town) {
this.town = town;
}
@Column(name = "committee")
public String getCommittee() {
return committee;
}
public void setCommittee(String committee) {
this.committee = committee;
}
@Column(name = "type")
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
@Column(name = "province_code")
public String getProvinceCode() {
return provinceCode;
}
public void setProvinceCode(String provinceCode) {
this.provinceCode = provinceCode;
}
@Column(name = "city_code")
public String getCityCode() {
return cityCode;
}
public void setCityCode(String cityCode) {
this.cityCode = cityCode;
}
@Column(name = "district_code")
public String getDistrictCode() {
return districtCode;
}
public void setDistrictCode(String districtCode) {
this.districtCode = districtCode;
}
@Column(name = "town_code")
public String getTownCode() {
return townCode;
}
public void setTownCode(String townCode) {
this.townCode = townCode;
}
@Column(name = "committee_code")
public String getCommitteeCode() {
return committeeCode;
}
public void setCommitteeCode(String committeeCode) {
this.committeeCode = committeeCode;
}
@Column(name = "type_code")
public String getTypeCode() {
return typeCode;
}
public void setTypeCode(String typeCode) {
this.typeCode = typeCode;
}
@Column(name = "type_name")
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
@Column(name = "verify_flag")
public String getVerifyFlag() {
return verifyFlag;
}
public void setVerifyFlag(String verifyFlag) {
this.verifyFlag = verifyFlag;
}
@Column(name = "addr_verify")
public String getAddrVerify() {
return addrVerify;
}
public void setAddrVerify(String addrVerify) {
this.addrVerify = addrVerify;
}
@Column(name = "county_level_city")
public String getCountyLevelCity() {
return countyLevelCity;
}
public void setCountyLevelCity(String countyLevelCity) {
this.countyLevelCity = countyLevelCity;
}
@Column(name = "administrative_town")
public String getAdministrativeTowns() {
return administrativeTowns;
}
public void setAdministrativeTowns(String administrativeTowns) {
this.administrativeTowns = administrativeTowns;
}
@Column(name = "county_gov")
public String getCountyGov() {
return countyGov;
}
public void setCountyGov(String countyGov) {
this.countyGov = countyGov;
}
@Column(name = "dev_district")
public String getDevDistrict() {
return devDistrict;
}
public void setDevDistrict(String devDistrict) {
this.devDistrict = devDistrict;
}
@Column(name = "dev_district_name")
public String getDevDistrictName() {
return devDistrictName;
}
public void setDevDistrictName(String devDistrictName) {
this.devDistrictName = devDistrictName;
}
@Column(name = "dev_level")
public String getDevLevel() {
return devLevel;
}
public void setDevLevel(String devLevel) {
this.devLevel = devLevel;
}
@Column(name = "lat")
public Double getLat() {
return lat;
}
public void setLat(Double lat) {
this.lat = lat;
}
@Column(name = "lng")
public Double getLng() {
return lng;
}
public void setLng(Double lng) {
this.lng = lng;
}
@Column(name = "addr_area")
public String getAddrArea() {
return addrArea;
}
public void setAddrArea(String addrArea) {
this.addrArea = addrArea;
}
@Column(name = "split_committee")
public String getSplitCommittee() {
return splitCommittee;
}
public void setSplitCommittee(String splitCommittee) {
this.splitCommittee = splitCommittee;
}
@Column(name = "split_street")
public String getSplitStreet() {
return splitStreet;
}
public void setSplitStreet(String splitStreet) {
this.splitStreet = splitStreet;
}
@Column(name = "poi_name")
public String getPoiName() {
return poiName;
}
public void setPoiName(String poiName) {
this.poiName = poiName;
}
@Column(name = "split_street_num")
public String getSplitStreetNum() {
return splitStreetNum;
}
public void setSplitStreetNum(String splitStreetNum) {
this.splitStreetNum = splitStreetNum;
}
@Column(name = "dev")
public String getDev() {
return dev;
}
public void setDev(String dev) {
this.dev = dev;
}
@Column(name = "community_source")
public String getCommunitySource() {
return communitySource;
}
public void setCommunitySource(String communitySource) {
this.communitySource = communitySource;
}
@Column(name = "match_poi_name")
public String getMatchPoiName() {
return matchPoiName;
}
public void setMatchPoiName(String matchPoiName) {
this.matchPoiName = matchPoiName;
}
@Column(name = "region_info")
public String getRegionInfo() {
return regionInfo;
}
public void setRegionInfo(String regionInfo) {
this.regionInfo = regionInfo;
}
@Column(name = "tjj_district_name")
public String getTjjDistrictName() {
return tjjDistrictName;
}
public void setTjjDistrictName(String tjjDistrictName) {
this.tjjDistrictName = tjjDistrictName;
}
@Column(name = "c_date")
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
@Column(name = "_id")
public String getId() {
return id;
}
@Override
public void setId(String id) {
this.id = id;
}
@Column(name = "village_type")
public String getVillageType() {
return villageType;
}
public void setVillageType(String villageType) {
this.villageType = villageType;
}
@Column(name = "city_param")
public String getCityParam() {
return cityParam;
}
public void setCityParam(String cityParam) {
this.cityParam = cityParam;
}
}
@@ -0,0 +1,130 @@
package com.fangjia.dal.mongo.model.bkoff;
import com.fangjia.dal.MongoEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author zhaojixiang
* @since 2023/7/5
*/
@Entity
@Table(name = "business.building_ratio")
public class BuildingRatio implements MongoEntity {
private String id;
private String city;
private String region;
private String district;
private String building_name;
private String building_avg_price;
private String avg_price;
private Double ratio;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date c_date;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date m_date;
private String create_user;
private String note;
@Id
@GeneratedValue
@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 = "region")
public String getRegion() {
return region;
}
public void setRegion(String region) {
this.region = region;
}
@Column(name = "district")
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
@Column(name = "building_name")
public String getBuilding_name() {
return building_name;
}
public void setBuilding_name(String building_name) {
this.building_name = building_name;
}
@Column(name = "ratio")
public Double getRatio() {
return ratio;
}
public void setRatio(Double ratio) {
this.ratio = ratio;
}
@Column(name = "c_date")
public Date getC_date() {
return c_date;
}
public void setC_date(Date c_date) {
this.c_date = c_date;
}
@Column(name = "m_date")
public Date getM_date() {
return m_date;
}
public void setM_date(Date m_date) {
this.m_date = m_date;
}
@Column(name = "create_user")
public String getCreate_user() {
return create_user;
}
public void setCreate_user(String create_user) {
this.create_user = create_user;
}
@Column(name = "note")
public String getNote() {
return note;
}
public void setNote(String note) {
this.note = note;
}
@Column(name = "building_avg_price")
public String getBuilding_avg_price() {
return building_avg_price;
}
public void setBuilding_avg_price(String building_avg_price) {
this.building_avg_price = building_avg_price;
}
@Column(name = "avg_price")
public String getAvg_price() {
return avg_price;
}
public void setAvg_price(String avg_price) {
this.avg_price = avg_price;
}
}
@@ -187,7 +187,7 @@ public class District implements SeaweedEntity {
private double score;
// 小区性质
private String landProperty;
private String masterDistrictNname;
private String masterDistrictName;
private String ip;
private String addrType;
private boolean selected;
@@ -309,12 +309,12 @@ public class District implements SeaweedEntity {
}
@Column(name = "master_district_name")
public String getMasterDistrictNname() {
return masterDistrictNname;
public String getMasterDistrictName() {
return masterDistrictName;
}
public void setMasterDistrictNname(String masterDistrictNname) {
this.masterDistrictNname = masterDistrictNname;
public void setMasterDistrictName(String masterDistrictName) {
this.masterDistrictName = masterDistrictName;
}
public void setCategory(String category) {

Some files were not shown because too many files have changed in this diff Show More