From b336a7bda437ea71cb79d2bc2046cda70b2b698b Mon Sep 17 00:00:00 2001 From: majintao Date: Wed, 18 Sep 2024 11:29:50 +0800 Subject: [PATCH] =?UTF-8?q?API=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=94=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/ApiUserController.java | 13 +++++++- .../com/fangjia/bkoff/model/ApiUserModel.java | 30 +++++++++++++++++ .../src/main/webapp/apiUser/add.ftl | 25 ++++++++++++-- .../src/main/webapp/apiUser/edit.ftl | 21 ++++++++++++ .../com/fangjia/dal/sql/model/ApiUser.java | 33 +++++++++++++++++++ .../com/fangjia/service/open/ApiUserBo.java | 30 +++++++++++++++++ 6 files changed, 149 insertions(+), 3 deletions(-) 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 fab71c646..4f2379d4b 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 @@ -133,7 +133,9 @@ public class ApiUserController { bo.setDeadTime(apiUser.getDeadTime()); bo.setManager(apiUser.getManager()); bo.setIsMonitor(apiUser.getIsMonitor()); - + bo.setIsMonitorStatistic(apiUser.getIsMonitorStatistic()); + bo.setIsMonitorUsed(apiUser.getIsMonitorUsed()); + bo.setIsWarnExpired(apiUser.getIsWarnExpired()); apiUserBoList.add(bo); } @@ -217,6 +219,9 @@ public class ApiUserController { apiUser.setIsMonitor(model.getIsMonitor()); apiUser.setContact(model.getContact()); apiUser.setPhone(model.getPhone()); + apiUser.setIsMonitorStatistic(model.getIsMonitorStatistic()); + apiUser.setIsMonitorUsed(model.getIsMonitorUsed()); + apiUser.setIsWarnExpired(model.getIsWarnExpired()); this.apiUserService.save(apiUser); // ÐÂÔöÓû§£¬ĬÈϹÒÅƼ۸ÄΪĬÈÏÆÀ¹À¼Û model.setPriceType("evaluate"); @@ -253,6 +258,9 @@ public class ApiUserController { bo.setDisplayName(user.getDisplayName()); bo.setIsTest(apiUser.getIsTest()); bo.setPurpose(apiUser.getPurpose()); + bo.setIsMonitorStatistic(apiUser.getIsMonitorStatistic()); + bo.setIsMonitorUsed(apiUser.getIsMonitorUsed()); + bo.setIsWarnExpired(apiUser.getIsWarnExpired()); bo.setSiteName(apiUser.getSiteName()); bo.setIp(apiUser.getIp()); bo.setCompany(apiUser.getCompany()); @@ -317,6 +325,9 @@ public class ApiUserController { dataApiUser.put("isMonitor", model.getIsMonitor()); dataApiUser.put("contact", model.getContact()); dataApiUser.put("phone", model.getPhone()); + dataApiUser.put("isMonitorStatistic",model.getIsMonitorStatistic()); + dataApiUser.put("isMonitorUsed",model.getIsMonitorUsed()); + dataApiUser.put("isWarnExpired",model.getIsWarnExpired()); this.apiUserService.update(dataApiUser, userId); // ¸ü¸ÄÓû§ÃÜÂë // this.userService.updateById(user,userId); 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 f77689d9e..353a79d8c 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 @@ -44,6 +44,12 @@ public class ApiUserModel extends BaseModel { private String phone; + private Integer isMonitorStatistic; + + private Integer isMonitorUsed; + + private Integer isWarnExpired; + public String getPriceType() { return priceType; } @@ -635,4 +641,28 @@ public class ApiUserModel extends BaseModel { public void setPhone(String phone) { this.phone = phone; } + + public Integer getIsMonitorStatistic() { + return isMonitorStatistic; + } + + public void setIsMonitorStatistic(Integer isMonitorStatistic) { + this.isMonitorStatistic = isMonitorStatistic; + } + + public Integer getIsMonitorUsed() { + return isMonitorUsed; + } + + public void setIsMonitorUsed(Integer isMonitorUsed) { + this.isMonitorUsed = isMonitorUsed; + } + + public Integer getIsWarnExpired() { + return isWarnExpired; + } + + public void setIsWarnExpired(Integer isWarnExpired) { + this.isWarnExpired = isWarnExpired; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl index 0681d3bfe..01b6b9d82 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/add.ftl @@ -69,8 +69,29 @@ 是否监控 - 不监控 - 监控 + 不监控 + 监控 + + + + 是否需要API统计量 + + 不需要 + 需要 + + + + 是否需要API费用使用量 + + 不需要 + 需要 + + + + 是否提醒即将到期 + + 不提醒 + 提醒 diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl index cc656fb8e..bf62526e0 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/edit.ftl @@ -95,6 +95,27 @@ checked="checked" name="isMonitor" value="1" style="margin-left: 15px;"/>监控 + + 是否需要API统计量 + + checked="checked" name="isMonitorStatistic" value="0" />不需要 + checked="checked" name="isMonitorStatistic" value="1" style="margin-left: 15px;"/>需要 + + + + 是否需要API费用使用量 + + checked="checked" name="isMonitorUsed" value="0" />不需要 + checked="checked" name="isMonitorUsed" value="1" style="margin-left: 15px;"/>需要 + + + + 是否提醒即将到期 + + checked="checked" name="isWarnExpired" value="0" />不提醒 + checked="checked" name="isWarnExpired" value="1" style="margin-left: 15px;"/>提醒 + + Email 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 20e6390c3..216e0d6cb 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 @@ -45,6 +45,12 @@ public class ApiUser implements SqlEntity { private Integer isMonitor; + private Integer isMonitorStatistic; + + private Integer isMonitorUsed; + + private Integer isWarnExpired; + @Id @Column(name = "ID") public long getId() { @@ -207,4 +213,31 @@ public class ApiUser implements SqlEntity { public void setPhone(String phone) { this.phone = phone; } + + @Column(name = "IS_MONITOR_STATISTIC") + public Integer getIsMonitorStatistic() { + return isMonitorStatistic; + } + + public void setIsMonitorStatistic(Integer isMonitorStatistic) { + this.isMonitorStatistic = isMonitorStatistic; + } + + @Column(name = "IS_MONITOR_USED") + public Integer getIsMonitorUsed() { + return isMonitorUsed; + } + + public void setIsMonitorUsed(Integer isMonitorUsed) { + this.isMonitorUsed = isMonitorUsed; + } + + @Column(name = "IS_WARN_EXPIRED") + public Integer getIsWarnExpired() { + return isWarnExpired; + } + + public void setIsWarnExpired(Integer isWarnExpired) { + this.isWarnExpired = isWarnExpired; + } } 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 f00b8e6d6..1f3da2050 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 @@ -32,6 +32,12 @@ public class ApiUserBo implements Serializable { private String phone; //ÁªϵÈËÊֻúºÅ + private Integer isMonitorStatistic; + + private Integer isMonitorUsed; + + private Integer isWarnExpired; + public String getPriceType() { return priceType; } @@ -191,4 +197,28 @@ public class ApiUserBo implements Serializable { public void setPhone(String phone) { this.phone = phone; } + + public Integer getIsMonitorStatistic() { + return isMonitorStatistic; + } + + public void setIsMonitorStatistic(Integer isMonitorStatistic) { + this.isMonitorStatistic = isMonitorStatistic; + } + + public Integer getIsMonitorUsed() { + return isMonitorUsed; + } + + public void setIsMonitorUsed(Integer isMonitorUsed) { + this.isMonitorUsed = isMonitorUsed; + } + + public Integer getIsWarnExpired() { + return isWarnExpired; + } + + public void setIsWarnExpired(Integer isWarnExpired) { + this.isWarnExpired = isWarnExpired; + } }