From 6f79a0f83c43b1846a07ebb089ccbf3958e1bb2b Mon Sep 17 00:00:00 2001 From: "zhaojixiang@fangjia.com" Date: Fri, 7 Jul 2023 10:28:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E7=B3=BB=E6=95=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=92=8C?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/BuildingRatioController.java | 39 +++++++++---------- .../src/main/webapp/buildingRatio/add.ftl | 31 +++++++++++++++ .../src/main/webapp/buildingRatio/edit.ftl | 31 +++++++++++++++ .../mongo/bkoff/BuildingRatioService.java | 2 +- .../mongo/bkoff/BuildingRatioServiceImpl.java | 5 ++- 5 files changed, 86 insertions(+), 22 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java index 76f7368fb..afd4fb55c 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/BuildingRatioController.java @@ -1,7 +1,9 @@ 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; @@ -24,14 +26,11 @@ public class BuildingRatioController { * @return */ public Object doAddAction(BuildingRatioModel model) throws Exception { - if (StringUtils.isBlank(model.getCity_name()) || StringUtils.isBlank(model.getRegion()) - || StringUtils.isBlank(model.getDistrict()) || StringUtils.isBlank(model.getBuilding_name()) - || model.getRatio() == null || StringUtils.isBlank(model.getCreate_user())) { - model.setMsg("城市,区域,小区,楼栋名称,楼栋系数,创建人不能为空"); - model.forward("/buildingRatio/add"); - return model; - } 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()); @@ -69,18 +68,7 @@ public class BuildingRatioController { * @param model * @return */ - public Object updateAction(BuildingRatioModel model){ - String id = model.getId(); - if (StringUtils.isBlank(model.getCity_name()) || - StringUtils.isBlank(model.getRegion()) || - StringUtils.isBlank(model.getDistrict()) || - StringUtils.isBlank(model.getBuilding_name()) || - model.getRatio() == null || StringUtils.isBlank(model.getCreate_user())) { - model.setMsg("城市,区域,小区,楼栋名称,楼栋系数,创建人不能为空"); - model.forward("/buildingRatio/edit"); - return model; - } - + public Object updateAction(BuildingRatioModel model) throws Exception { Map data_buildingRatio = new HashMap(); data_buildingRatio.put("id", model.getId()); @@ -103,7 +91,7 @@ public class BuildingRatioController { public Object listAction(BuildingRatioModel model) { - List buildingRatioList = this.buildingRatioService.findAllByDistrict(model.getCity_name(),model.getRegion(),model.getDistrict()); + List buildingRatioList = this.buildingRatioService.findAllByBuildingName(model.getCity_name(),model.getRegion(),model.getDistrict(),model.getBuilding_name()); List buildingRatioBoList = new ArrayList(); @@ -158,6 +146,17 @@ public class BuildingRatioController { return model; } + public boolean checkBuildingNameAction(BuildingRatioModel model) { + model.setViewType("json"); + model.setViewParam("config", null); + List 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; } diff --git a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl index dbfca71b2..ca7565298 100644 --- a/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/buildingRatio/add.ftl @@ -67,6 +67,37 @@