From 3050a67d884ae5eee120e88782bb4ae45879508b Mon Sep 17 00:00:00 2001 From: majintao Date: Tue, 12 Nov 2024 18:08:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EAPICode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/ApiUserController.java | 3 +- .../controllers/OpenResourceController.java | 22 +++++++-- .../bkoff/model/OpenResourceModel.java | 19 ++++++++ .../src/main/webapp/apiUser/auth.ftl | 46 ++++++++++++------- .../src/main/webapp/openResource/doAdd.ftl | 7 +++ .../src/main/webapp/openResource/doUpdate.ftl | 5 ++ .../src/main/webapp/openResource/list.ftl | 45 ++++++++++++------ .../com/fangjia/service/open/AuthorityBo.java | 22 +++++++-- 8 files changed, 128 insertions(+), 41 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 6e85874c7..01093e983 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 @@ -623,7 +623,8 @@ public class ApiUserController { * @param AuthorityBo * :Óû§µÄappKey username¡¢µÈ×ÊÁÏ */ - List openResourceList = openResourceService.findAll(); + List queryParams = Arrays.asList(new QueryParam("pubStatus", 1)); + List openResourceList = openResourceService.findOpenResource(queryParams); List authorityBoList = new ArrayList(); ApiUserAuthority authority = apiUserAuthorityService.findByUserId(model.getUserId()); if (authority == null) { diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenResourceController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenResourceController.java index 65eff39c5..ce5fc7904 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenResourceController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/OpenResourceController.java @@ -2,10 +2,7 @@ package com.fangjia.bkoff.controllers; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import com.fangjia.bkoff.model.JsonModel; import org.apache.commons.lang.StringUtils; @@ -42,6 +39,15 @@ public class OpenResourceController { } public Object doAddAction(OpenResourceModel model) { + List openResource = this.openResourceService.findOpenResource(null); + HashSet apiCodeSet = new HashSet(); + for (OpenResource resource : openResource) { + apiCodeSet.add(resource.getApiCode()); + } + if (model.getApiCode() != 0 && apiCodeSet.contains(model.getApiCode())){ + model.setMsg("APICodeÒѴæÔÚ"); + return model; + } if (!"doAdd".equals(model.getMethod())) { return model; } @@ -70,7 +76,9 @@ public class OpenResourceController { OpenResource r = new OpenResource(); r.setUri(uri); r.setName(name); + r.setApiCode(model.getApiCode()); r.setSaveResult(model.getSave_result()); + r.setPubStatus(model.getPubStatus() ? 1 : 0); r.setDescription(model.getDescription()); this.openResourceService.save(r); model.setMsg("Ìí¼ӳɹ¦£¡"); @@ -80,6 +88,7 @@ public class OpenResourceController { public Object doChangeAction(OpenResourceModel model){ Map data = new HashMap(); data.put("saveResult",model.getSave_result()); + data.put("pubStatus",model.getPubStatus() ? 1 : 0); this.openResourceService.update(data,model.getId()); model.setMsg("±£´æ³ɹ¦"); JsonModel model1 = new JsonModel(); @@ -105,6 +114,9 @@ public class OpenResourceController { if (StringUtils.isNotBlank(model.getDescription())) { data.put("description", model.getDescription()); } + if (0 != model.getApiCode()){ + data.put("apiCode",model.getApiCode()); + } List params = new ArrayList(); params.add(new QueryParam("uri", uri)); params.add(new QueryParam("name", name)); @@ -141,7 +153,7 @@ public class OpenResourceController { /** * ¸ñʽ»¯URI - * + * * @param uri * @return */ diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/OpenResourceModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/OpenResourceModel.java index 2f867b209..321e3f0ac 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/OpenResourceModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/OpenResourceModel.java @@ -28,6 +28,9 @@ public class OpenResourceModel extends BaseModel { private Boolean save_result; private OpenResource or; + private Boolean pubStatus; + + private int apiCode; public String getExceptId() { return exceptId; @@ -116,4 +119,20 @@ public class OpenResourceModel extends BaseModel { public void setSave_result(Boolean save_result) { this.save_result = save_result; } + + public Boolean getPubStatus() { + return pubStatus; + } + + public void setPubStatus(Boolean pubStatus) { + this.pubStatus = pubStatus; + } + + public int getApiCode() { + return apiCode; + } + + public void setApiCode(int apiCode) { + this.apiCode = apiCode; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl index 100afe5b8..23d09901d 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/auth.ftl @@ -35,6 +35,11 @@ top: 0; background-color: #f2f2f2; } + .resizable-td { + resize: horizontal; /* 允许水平调整大小 */ + overflow: auto; /* 显示滚动条以便查看超出部分 */ + min-width: 50px; /* 设置最小宽度,防止过于缩小 */ + } @@ -58,28 +63,33 @@ API数量: ${authorityBoList?size}个 - + + APICode + + uri - + API名称 - - 是否有权限全选 + + 是否有权限
+ 全选 - + 访问最大次数(每天)/(总数) - + 访问次数修改 - - 是否按查得计费全选 + + 是否按查得计费
+ 全选 - + 计费次数(当天)/(历史) - + 操作 @@ -88,10 +98,13 @@ <#list authorityBoList as bo> + ${bo.apiCode!} + + ${bo.uri!} - + ${bo.name!} @@ -99,16 +112,15 @@ <#if bo.limitCountMap?? && bo.limitCountMap[bo.uri!]??> - + <#else> - + - -   / + / <#if bo.totalCountMap?? && bo.totalCountMap[bo.uri!]??> - + <#else> - + diff --git a/projects/fangjia-bkoff/src/main/webapp/openResource/doAdd.ftl b/projects/fangjia-bkoff/src/main/webapp/openResource/doAdd.ftl index 548a17f9d..482cfcfeb 100644 --- a/projects/fangjia-bkoff/src/main/webapp/openResource/doAdd.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/openResource/doAdd.ftl @@ -23,6 +23,7 @@ table{text-align: left;}
+ @@ -32,6 +33,12 @@ table{text-align: left;} + + +
APICode
名称
URI
说明
是否对外 + + +
diff --git a/projects/fangjia-bkoff/src/main/webapp/openResource/doUpdate.ftl b/projects/fangjia-bkoff/src/main/webapp/openResource/doUpdate.ftl index c578a2214..5464ae225 100644 --- a/projects/fangjia-bkoff/src/main/webapp/openResource/doUpdate.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/openResource/doUpdate.ftl @@ -24,6 +24,11 @@ table{text-align: left;} + diff --git a/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl b/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl index 629c14ec4..72424c8fb 100644 --- a/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/openResource/list.ftl @@ -47,8 +47,8 @@
APICode<#if apiCode != 0> + + <#else> + +
名称
URI
说明
- - + - +<#-- --> @@ -74,7 +77,7 @@ <#list ors as or> +<#-- --> @@ -118,18 +124,27 @@ var a = $(e); var id = a.attr("value"); var eck = $('#jk_'+id).attr("checked"); + var eck2 = $('#pub_'+id).attr("checked"); var flag = false; + var flag2 = false; if (eck == "checked") { flag = true; } else{ flag= false; } + if (eck2 == "checked") { + flag2 = true; + } + else{ + flag2 = false; + } + $.ajax({ type: "post", url: "../openResource/doChange", - data: "id="+id+"&save_result="+flag, + data: "id="+id+"&save_result="+flag+"&pubStatus="+flag2, dataType: "json", success: function (data) { diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/open/AuthorityBo.java b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AuthorityBo.java index 7b29385d9..4b58254a6 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/open/AuthorityBo.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/open/AuthorityBo.java @@ -32,6 +32,10 @@ public class AuthorityBo implements Serializable { private long curVisitedCount; private long totalVisitedCount; private Integer isCheckCount;//ÊǷ񰴲éµüƷÑ 1£ºÊÇ £¬0£º·ñ + + private int pubStatus; + + private int apiCode; public Map getResourceAuthorityMap() { return resourceAuthorityMap; @@ -158,7 +162,19 @@ public class AuthorityBo implements Serializable { this.totalVisitedCount = totalVisitedCount; } - - - + public int getPubStatus() { + return pubStatus; + } + + public void setPubStatus(int pubStatus) { + this.pubStatus = pubStatus; + } + + public int getApiCode() { + return apiCode; + } + + public void setApiCode(int apiCode) { + this.apiCode = apiCode; + } }
- ID + + APICode 名称 @@ -56,15 +56,18 @@ URI + 监控返回结果 + 是否对外 + 说明 - 是否有字权限 - --> +<#-- 是否有字权限--> +<#-- 操作
- ${or.id} + ${or.apiCode!} ${or.name!} @@ -86,17 +89,20 @@ checked id="jk_${or.id}" - ${or.description!} + checked id="pub_${or.id}" - <#if or.hasSubResource> - 有 - <#else> - 无 - + ${or.description!} --> +<#-- <#if or.hasSubResource>--> +<#-- 有--> +<#-- <#else>--> +<#-- 无--> +<#-- --> +<#-- - 删除   + 删除 编辑 保存