diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java index 7c782d610..7df83ddd3 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/ApiUserController.java @@ -102,6 +102,7 @@ public class ApiUserController { bo.setPurpose(apiUser.getPurpose()); bo.setDeadTime(apiUser.getDeadTime()); bo.setManager(apiUser.getManager()); + bo.setIsMonitor(apiUser.getIsMonitor()); apiUserBoList.add(bo); } @@ -183,6 +184,7 @@ public class ApiUserController { apiUser.setModificationDate(date); apiUser.setDeadTime(model.getDeadTime()); apiUser.setManager(model.getManager()); + apiUser.setIsMonitor(model.getIsMonitor()); this.apiUserService.save(apiUser); if(model.getEvaluateRate() != null && model.getEvaluateRate() != 0){ ApiUserCfg apiUserCfg = new ApiUserCfg(); @@ -222,6 +224,7 @@ public class ApiUserController { bo.setEmail(apiUser.getEmail()); bo.setDeadTime(apiUser.getDeadTime()); bo.setManager(apiUser.getManager()); + bo.setIsMonitor(apiUser.getIsMonitor()); ApiUserCfg apiUserCfg_rate = apiUserCfgService.findByUserId(apiUser.getId(), ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE); if(apiUserCfg_rate != null){ bo.setEvaluateRate((Double) apiUserCfg_rate.getCfgValue()); @@ -272,6 +275,7 @@ public class ApiUserController { dataApiUser.put("purpose", model.getPurpose()); dataApiUser.put("deadTime", model.getDeadTime()); dataApiUser.put("manager", model.getManager()); + dataApiUser.put("isMonitor", model.getIsMonitor()); this.apiUserService.update(dataApiUser, userId); //ApiUserCfg.ApiUserCfgKey.EVALUATE_RATE 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/java/com/fangjia/bkoff/model/ApiUserModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java index b252774f1..ad264fe9a 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/ApiUserModel.java @@ -38,6 +38,7 @@ public class ApiUserModel extends BaseModel { private Integer creditLevelStatus; private String priceType; private Map 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; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl index 410b73fae..29ae67e83 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl @@ -57,13 +57,20 @@ 账户用途 + + 是否监控 + + 不监控 + 监控 + + Email diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index caf99a2c7..31fb2f51a 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -72,6 +72,13 @@ + + 是否监控 + + checked="checked" name="isMonitor" value="0" />不监控 + checked="checked" name="isMonitor" value="1" style="margin-left: 15px;"/>监控 + + Email diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl index 0924ceb7e..37afef638 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl @@ -53,6 +53,9 @@ 账户用途 + + 是否监控 + 到期时间 @@ -114,6 +117,13 @@ 房生活 + + <#if bo.isMonitor==1> + 是 + <#else> + 否 + + <#if bo.deadTime??> ${bo.deadTime?string("yyyy年MM月dd日")} 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 @@