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/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-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java index 1cddeac31..52806e4df 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ApiUser.java @@ -39,6 +39,8 @@ public class ApiUser implements SqlEntity { private String manager; + private Integer isMonitor; + @Id @Column(name = "ID") public long getId() { @@ -175,4 +177,12 @@ public class ApiUser implements SqlEntity { public void setManager(String manager) { this.manager = manager; } + @Column(name = "IS_MONITOR") + public Integer getIsMonitor() { + return isMonitor; + } + + public void setIsMonitor(Integer isMonitor) { + this.isMonitor = isMonitor; + } } diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/ApiUserBo.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/ApiUserBo.java index 4eae77e54..8c09268bf 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/open/ApiUserBo.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/ApiUserBo.java @@ -26,6 +26,7 @@ public class ApiUserBo implements Serializable { private Date deadTime; private String manager; private String priceType; + private Integer isMonitor; public String getPriceType() { return priceType; @@ -162,4 +163,12 @@ public class ApiUserBo implements Serializable { public void setManager(String manager) { this.manager = manager; } + + public Integer getIsMonitor() { + return isMonitor; + } + + public void setIsMonitor(Integer isMonitor) { + this.isMonitor = isMonitor; + } }