diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java index 3a14b2f41..278f45d4a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java @@ -33,7 +33,9 @@ public class DevelopmentZoneController { if (pager.getCurrentPage() > 100) { pager.setCurrentPage(1); } - List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getName(), pager); + long countDev = developmentZoneService.countDev(model.getProvince(), model.getName(), model.getLevel()); + pager.setTotalRows((int) countDev); + List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getName(), model.getLevel(), pager); model.setDevelopmentZoneList(developmentZones); model.setPager(pager); return model; @@ -72,18 +74,17 @@ public class DevelopmentZoneController { JsonModel ret = new JsonModel(); Map data = new HashMap(); ret.setJsonModel(data); - // name province bdLocation level 不能为空 - if (StringUtils.isBlank(model.getProvince()) || StringUtils.isBlank(model.getName()) || model.getBdShape() == null || model.getBdShape().toString().equals("[]") || StringUtils.isBlank(model.getLevel())) { - data.put("msg", "保存失败(开发区名称,所在省份,级别,围栏不能为空)"); - return ret; - } - if (model.getId() == null) { + // name province bdLocation level 不能为空 + if (StringUtils.isBlank(model.getProvince()) || StringUtils.isBlank(model.getName()) || model.getBdShape() == null || model.getBdShape().toString().equals("[]") || 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()); - String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", ""); + String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", ""); List> bdLocationList = new ArrayList>(); String[] splitStr = locationStr.split(";"); for (int i = 0; i < splitStr.length; i++) { @@ -116,54 +117,80 @@ public class DevelopmentZoneController { 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.setCityName(StringUtils.isBlank(model.getCityName()) ? "" : model.getCityName()); //记录操作人员 entity.setOperator(user.getRealName()); developmentZoneService.saveDevelopmentZone(entity); data.put("msg", "保存成功"); } else { - DevelopmentZone entity = developmentZoneService.findDevelopmentZone(model.getId()); -// Map udata = new HashMap(); - - // name province bdLocation level 不能为空 - entity.setName(model.getName()); - entity.setProvince(model.getProvince()); - String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", ""); - List> bdLocationList = new ArrayList>(); - String[] splitStr = locationStr.split(";"); - for (int i = 0; i < splitStr.length; i++) { - String[] splitStr2 = splitStr[i].split(","); - List location = new ArrayList(); - location.add(Double.parseDouble(splitStr2[0])); - location.add(Double.parseDouble(splitStr2[1])); - bdLocationList.add(location); +// DevelopmentZone entity = developmentZoneService.findDevelopmentZone(model.getId()); + Map udata = new HashMap(); + 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> bdLocationList = new ArrayList>(); + String[] splitStr = locationStr.split(";"); + for (int i = 0; i < splitStr.length; i++) { + String[] splitStr2 = splitStr[i].split(","); + List location = new ArrayList(); + location.add(Double.parseDouble(splitStr2[0])); + location.add(Double.parseDouble(splitStr2[1])); + bdLocationList.add(location); + } + model.setBdShape(bdLocationList); + // 百度经纬度 + Map bdShape = new HashMap(); + bdShape.put("type", "polygon"); + bdShape.put("coordinates", model.getBdShape()); + udata.put("bdShape", bdShape); + // 高德经纬度 + Map shape = new HashMap(); + shape.put("type", "polygon"); + Object coordinates = convertGeoList(model.getBdShape()); + shape.put("coordinates", coordinates); + udata.put("shape", shape); } - model.setBdShape(bdLocationList); - // 百度经纬度 - Map bdShape = new HashMap(); - bdShape.put("type", "polygon"); - bdShape.put("coordinates", model.getBdShape()); - entity.setBdShape(bdShape); - // 高德经纬度 - Map shape = new HashMap(); - shape.put("type", "polygon"); - Object coordinates = convertGeoList(model.getBdShape()); - shape.put("coordinates", coordinates); - entity.setShape(shape); - entity.setLevel(model.getLevel()); - 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()); + 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.getCityName())) { + udata.put("cityName", model.getCityName()); + } + udata.put("createTime", new Date()); //记录操作人员 - entity.setOperator(user.getRealName()); - developmentZoneService.updateDevelopmentZone(entity); - data.put("msg", "保存成功"); + udata.put("operator", user.getRealName()); + developmentZoneService.updateDevelopmentZone(udata, model.getId()); + data.put("msg", "修改成功"); } return ret; diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl index c10db896a..da467044c 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl @@ -35,6 +35,7 @@ + diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl index ba7325688..9f895e23c 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl @@ -24,17 +24,22 @@ + +
+ 鏌ヨ鍒�${pager.totalRows!}鏉¤褰� - + + @@ -43,6 +48,7 @@ + diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java index 8798dcb19..5e54b5eb6 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java @@ -32,6 +32,8 @@ public class DevelopmentZone implements MongoEntity { private String block; private String operator; + private String cityName; + private String district; @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -180,4 +182,25 @@ public class DevelopmentZone implements MongoEntity { public void setOperator(String operator) { this.operator = operator; } + + @Column(name = "city") + public String getCityName() { + return cityName; + } + + public void setCityName(String cityName) { + this.cityName = cityName; + } + + + + + @Column(name = "district") + public String getDistrict() { + return district; + } + + public void setDistrict(String district) { + this.district = district; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneService.java index fe9313f52..3b3209dad 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneService.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneService.java @@ -33,7 +33,7 @@ public interface DevelopmentZoneService { * @param id * @param udata */ - public void updateDevelopmentZone(DevelopmentZone developmentZone); + public void updateDevelopmentZone(Map udata, String id); /** * 根据ID查询 @@ -51,7 +51,9 @@ public interface DevelopmentZoneService { * @param pager * @return */ - public List findDevelopmentZone(String province,String name, Pager pager); + public List findDevelopmentZone(String province,String name,String level, Pager pager); + + public long countDev(String province,String name,String level); } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneServiceImpl.java index a35b49f5f..7c8e5f4a7 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/DevelopmentZoneServiceImpl.java @@ -10,6 +10,7 @@ import org.sothis.core.util.Pager; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { private DevelopmentZoneDao developmentZoneDao; @@ -26,8 +27,8 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { } @Override - public void updateDevelopmentZone(DevelopmentZone developmentZone) { - developmentZoneDao.update(developmentZone); + public void updateDevelopmentZone(Map map,String id) { + developmentZoneDao.updateById(map,id); } @Override @@ -37,19 +38,44 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { @Override - public List findDevelopmentZone(String province, String name, Pager pager) { + public List findDevelopmentZone(String province, String name,String level, Pager pager) { List params = new ArrayList(); if (StringUtils.isNotBlank(province)) { - params.add(new QueryParam("province", province)); + Pattern pattern = Pattern.compile(".*" + province + ".*"); + params.add(new QueryParam("province", pattern)); } if (StringUtils.isNotBlank(name)) { - params.add(new QueryParam("name", name)); + Pattern pattern = Pattern.compile(".*" + name + ".*"); + params.add(new QueryParam("name", pattern)); + } + if (StringUtils.isNotBlank(level)) { + Pattern pattern = Pattern.compile(".*" + level + ".*"); + params.add(new QueryParam("level", pattern)); } return developmentZoneDao.findAllByParams(params, pager.getStartRow(), pager.getPageSize()); } + @Override + public long countDev(String province, String name,String level) { + List params = new ArrayList(); + if (StringUtils.isNotBlank(province)) { + Pattern pattern = Pattern.compile(".*" + province + ".*"); + params.add(new QueryParam("province", pattern)); + } + + if (StringUtils.isNotBlank(name)) { + Pattern pattern = Pattern.compile(".*" + name + ".*"); + params.add(new QueryParam("name", pattern)); + } + if (StringUtils.isNotBlank(level)) { + Pattern pattern = Pattern.compile(".*" + level + ".*"); + params.add(new QueryParam("level", pattern)); + } + return developmentZoneDao.findCountByParams(params); + } + public void setDevelopmentZoneDao(DevelopmentZoneDao developmentZoneDao) { this.developmentZoneDao = developmentZoneDao;
鍚嶇О绾у埆寮�鍙戝尯绾у埆 鐪佷唤鍖哄潡 鎿嶄綔浜哄憳 鎿嶄綔
${it.name!} ${it.level!} ${it.province!}${it.block!} ${it.operator!}