From 268eda7e23d270fc57a6666f86392a57c11a4dae Mon Sep 17 00:00:00 2001 From: majintao Date: Mon, 14 Oct 2024 11:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=8C=BA=E5=8A=A0=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevelopmentZoneController.java | 10 +++++++-- .../bkoff/model/DevelopmentZoneModel.java | 11 ++++++++++ .../src/main/webapp/developmentZone/edit.ftl | 22 ++++++++++++++----- .../src/main/webapp/developmentZone/list.ftl | 8 +++++++ .../dal/mongo/model/DevelopmentZone.java | 11 ++++++++++ .../mongo/fangjia/DevelopmentZoneService.java | 4 ++-- .../fangjia/DevelopmentZoneServiceImpl.java | 22 +++++++++++++------ 7 files changed, 72 insertions(+), 16 deletions(-) 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 b837cd5cd..036ffc89d 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 @@ -45,9 +45,9 @@ public class DevelopmentZoneController { if (pager.getCurrentPage() > 100) { pager.setCurrentPage(1); } - long countDev = developmentZoneService.countDev(model.getProvince(), model.getCityName1(), model.getName(), model.getLevel()); + long countDev = developmentZoneService.countDev(model.getProvince(), model.getCityName1(), model.getName(), model.getLevel(), model.getOperateResult()); pager.setTotalRows((int) countDev); - List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getCityName1(), model.getName(), model.getLevel(), pager); + List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getCityName1(), model.getName(), model.getLevel(), model.getOperateResult(), pager); model.setDevelopmentZoneList(developmentZones); model.setPager(pager); return model; @@ -131,6 +131,7 @@ public class DevelopmentZoneController { Object coordinates = convertGeoList(model.getBdShape()); shape.put("coordinates", coordinates); entity.setShape(shape); + entity.setOperateResult("ÒѴ¦Àí"); } entity.setLevel(model.getLevel()); @@ -149,6 +150,7 @@ public class DevelopmentZoneController { entity.setCityName1(StringUtils.isBlank(model.getCityName1()) ? "" : model.getCityName1()); entity.setDistrict(StringUtils.isBlank(model.getDistrict()) ? "" : model.getDistrict()); entity.setImgUrl(StringUtils.isBlank(model.getImgUrl()) ? "" : model.getImgUrl()); + entity.setOperateResult(StringUtils.isBlank(model.getOperateResult()) ? "" : model.getOperateResult()); //¼Ç¼²Ù×÷ÈËԱ entity.setOperator(user.getRealName()); developmentZoneService.saveDevelopmentZone(entity); @@ -190,6 +192,7 @@ public class DevelopmentZoneController { Object coordinates = convertGeoList(model.getBdShape()); shape.put("coordinates", coordinates); udata.put("shape", shape); + udata.put("operateResult", "ÒѴ¦Àí"); } if (StringUtils.isNotBlank(model.getAlias())) { String aliasString = model.getAlias().replaceAll(",", "£¬"); @@ -229,6 +232,9 @@ public class DevelopmentZoneController { if (StringUtils.isNotBlank(model.getImgUrl())) { udata.put("imgUrl", model.getImgUrl()); } + if (StringUtils.isNotBlank(model.getOperateResult())){ + udata.put("operateResult", model.getOperateResult()); + } udata.put("createTime", new Date()); //¼Ç¼²Ù×÷ÈËԱ udata.put("operator", user.getRealName()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java index 25ddafe94..89565d57a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java @@ -40,6 +40,8 @@ public class DevelopmentZoneModel extends BaseModel { private File file; + private String operateResult; + public String getAlias() { return alias; } @@ -215,4 +217,13 @@ public class DevelopmentZoneModel extends BaseModel { public void setFile(File file) { this.file = file; } + + + public String getOperateResult() { + return operateResult; + } + + public void setOperateResult(String operateResult) { + this.operateResult = operateResult; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl index 3a6ee785c..87f03a8be 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl @@ -30,11 +30,11 @@ @@ -172,6 +172,18 @@ value="<#if developmentZone??>${developmentZone.block!}"/>
+ + + + + + + + diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl index 171ceaf7a..0b1f4c6d7 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl @@ -30,6 +30,12 @@ + 操作结果: + @@ -46,6 +52,7 @@ 城市 区域 区块 + 操作结果 是否有围栏 操作人员 修改日期 @@ -68,6 +75,7 @@ ${it.cityName1!} ${it.district!} ${it.block!} + ${it.operateResult!} <#if it.bdShape?has_content> 已有围栏 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 0d6f58d38..b548c6c0f 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 @@ -40,6 +40,8 @@ public class DevelopmentZone implements MongoEntity { private String imgUrl; + private String operateResult; + @Id @GeneratedValue(strategy = GenerationType.AUTO) @Column(name = "_id") @@ -227,4 +229,13 @@ public class DevelopmentZone implements MongoEntity { public void setImgUrl(String imgUrl) { this.imgUrl = imgUrl; } + + @Column(name = "operate_result") + public String getOperateResult() { + return operateResult; + } + + public void setOperateResult(String operateResult) { + this.operateResult = operateResult; + } } 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 5c04089ea..4094aa813 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 @@ -51,9 +51,9 @@ public interface DevelopmentZoneService { * @param pager * @return */ - public List findDevelopmentZone(String province,String city,String name,String level, Pager pager); + public List findDevelopmentZone(String province,String city,String name,String level,String operateResult, Pager pager); - public long countDev(String province,String city ,String name,String level); + public long countDev(String province,String city ,String name,String level,String operateResult); public List findProvinces(); public List findCities(String province); 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 423dbbedc..778587a4c 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 @@ -30,8 +30,8 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { } @Override - public void updateDevelopmentZone(Map map,String id) { - developmentZoneDao.updateById(map,id); + public void updateDevelopmentZone(Map map, String id) { + developmentZoneDao.updateById(map, id); } @Override @@ -41,7 +41,7 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { @Override - public List findDevelopmentZone(String province,String city ,String name,String level, Pager pager) { + public List findDevelopmentZone(String province, String city, String name, String level, String operateResult, Pager pager) { List params = new ArrayList(); if (StringUtils.isNotBlank(province)) { Pattern pattern = Pattern.compile(".*" + province + ".*"); @@ -60,12 +60,16 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { Pattern pattern = Pattern.compile(".*" + level + ".*"); params.add(new QueryParam("level", pattern)); } + if (StringUtils.isNotBlank(operateResult)) { + Pattern pattern = Pattern.compile(".*" + operateResult + ".*"); + params.add(new QueryParam("operateResult", pattern)); + } return developmentZoneDao.findAllByParams(params, pager.getStartRow(), pager.getPageSize()); } @Override - public long countDev(String province,String city, String name,String level) { + public long countDev(String province, String city, String name, String level, String operateResult) { List params = new ArrayList(); if (StringUtils.isNotBlank(province)) { Pattern pattern = Pattern.compile(".*" + province + ".*"); @@ -84,6 +88,10 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { Pattern pattern = Pattern.compile(".*" + level + ".*"); params.add(new QueryParam("level", pattern)); } + if (StringUtils.isNotBlank(operateResult)) { + Pattern pattern = Pattern.compile(".*" + operateResult + ".*"); + params.add(new QueryParam("operateResult", pattern)); + } return developmentZoneDao.findCountByParams(params); } @@ -91,7 +99,7 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { public List findProvinces() { List queryParams = new ArrayList(); queryParams.add(new QueryParam("type", "ʡ·Ý")); - List allProvince = administrativeMappingDao.findAllByParams(queryParams,null,0,100,new String[]{"province"}); + List allProvince = administrativeMappingDao.findAllByParams(queryParams, null, 0, 100, new String[]{"province"}); List provinces = new ArrayList(); for (AdministrativeMapping mapping : allProvince) { provinces.add(mapping.getProvince()); @@ -104,7 +112,7 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { List queryParams = new ArrayList(); queryParams.add(new QueryParam("type", "³ÇÊÐ")); queryParams.add(new QueryParam("province", province)); - List allCity = administrativeMappingDao.findAllByParams(queryParams,null,0,1000,new String[]{"city"}); + List allCity = administrativeMappingDao.findAllByParams(queryParams, null, 0, 1000, new String[]{"city"}); List cities = new ArrayList(); for (AdministrativeMapping mapping : allCity) { cities.add(mapping.getCity()); @@ -117,7 +125,7 @@ public class DevelopmentZoneServiceImpl implements DevelopmentZoneService { List queryParams = new ArrayList(); queryParams.add(new QueryParam("type", "ÇøÓò")); queryParams.add(new QueryParam("city", city)); - List allDistrict = administrativeMappingDao.findAllByParams(queryParams,null,0,1000,new String[]{"district"}); + List allDistrict = administrativeMappingDao.findAllByParams(queryParams, null, 0, 1000, new String[]{"district"}); List districts = new ArrayList(); for (AdministrativeMapping mapping : allDistrict) { districts.add(mapping.getDistrict());