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 @@