From 79c6c469a4c49608c143732ed6c12aa2d051fe2e Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Tue, 25 Jan 2022 16:47:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/pojo/dtos/OAuth2ClientDTO.java | 44 ++---- .../server/pojo/pos/OAuth2ClientPO.java | 9 ++ .../server/pojo/vos/OAuth2ClientVO.java | 10 ++ .../mybatis/mapper/oauth2-client-mapper.xml | 37 ++++- .../templates/oauth2client/save.html | 132 +++++++++++------ .../templates/oauth2client/update.html | 138 +++++++++++------- .../mybatis/mapper/grid/grid-group-mapper.xml | 4 + 7 files changed, 234 insertions(+), 140 deletions(-) diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/dtos/OAuth2ClientDTO.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/dtos/OAuth2ClientDTO.java index 56a27696..6bae7d17 100644 --- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/dtos/OAuth2ClientDTO.java +++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/dtos/OAuth2ClientDTO.java @@ -43,6 +43,8 @@ public class OAuth2ClientDTO extends OAuth2ClientSimpleDTO { private String expireTime; @ApiModelProperty(name = "gmtCreate", value = "创建时间") private String gmtCreate; + @ApiModelProperty(name = "sort", value = "排序") + private Double sort; public String getResourceIds() { return resourceIds == null ? "" : resourceIds.trim(); @@ -166,40 +168,12 @@ public class OAuth2ClientDTO extends OAuth2ClientSimpleDTO { this.gmtCreate = gmtCreate; } - @Override - public String toString() { - final StringBuilder sb = new StringBuilder("{"); - sb.append("\"resourceIds\":") - .append("\"").append(resourceIds).append("\""); - sb.append(",\"clientSecret\":") - .append("\"").append(clientSecret).append("\""); - sb.append(",\"scope\":") - .append("\"").append(scope).append("\""); - sb.append(",\"authorizedGrantTypes\":") - .append("\"").append(authorizedGrantTypes).append("\""); - sb.append(",\"authorities\":") - .append("\"").append(authorities).append("\""); - sb.append(",\"accessTokenValidity\":") - .append(accessTokenValidity); - sb.append(",\"refreshTokenValidity\":") - .append(refreshTokenValidity); - sb.append(",\"additionalInformation\":") - .append("\"").append(additionalInformation).append("\""); - sb.append(",\"autoapprove\":") - .append("\"").append(autoapprove).append("\""); - sb.append(",\"menuId\":") - .append("\"").append(menuId).append("\""); - sb.append(",\"menuName\":") - .append("\"").append(menuName).append("\""); - sb.append(",\"systemType\":") - .append("\"").append(systemType).append("\""); - sb.append(",\"systemState\":") - .append("\"").append(systemState).append("\""); - sb.append(",\"expireTime\":") - .append("\"").append(expireTime).append("\""); - sb.append(",\"gmtCreate\":") - .append("\"").append(gmtCreate).append("\""); - sb.append('}'); - return sb.toString(); + public Double getSort() { + return sort == null ? 0 : sort; } + + public void setSort(Double sort) { + this.sort = sort; + } + } diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/pos/OAuth2ClientPO.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/pos/OAuth2ClientPO.java index 00400749..cba37997 100644 --- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/pos/OAuth2ClientPO.java +++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/pos/OAuth2ClientPO.java @@ -31,6 +31,7 @@ public class OAuth2ClientPO implements Serializable{ private String expireTime; private String systemSummary; private String systemIcon; + private Double sort; private String gmtCreate; private String creator; private String gmtModified; @@ -189,6 +190,14 @@ public class OAuth2ClientPO implements Serializable{ this.systemIcon = systemIcon; } + public Double getSort() { + return sort == null ? 0 : sort; + } + + public void setSort(Double sort) { + this.sort = sort; + } + public String getGmtCreate() { return gmtCreate == null ? "" : gmtCreate.trim(); } diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/vos/OAuth2ClientVO.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/vos/OAuth2ClientVO.java index 5d1e0968..68c535f5 100644 --- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/vos/OAuth2ClientVO.java +++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/pojo/vos/OAuth2ClientVO.java @@ -61,6 +61,8 @@ public class OAuth2ClientVO { private String systemSummary; @ApiModelProperty(name = "systemIcon", value = "系统图标") private String systemIcon; + @ApiModelProperty(name = "sort", value = "排序") + private Double sort; public String getClientId() { return clientId == null ? "" : clientId.trim(); @@ -205,4 +207,12 @@ public class OAuth2ClientVO { public void setSystemIcon(String systemIcon) { this.systemIcon = systemIcon; } + + public Double getSort() { + return sort == null ? 0D : sort; + } + + public void setSort(Double sort) { + this.sort = sort; + } } diff --git a/login-oauth2-server/src/main/resources/mybatis/mapper/oauth2-client-mapper.xml b/login-oauth2-server/src/main/resources/mybatis/mapper/oauth2-client-mapper.xml index 3164bfba..902a9759 100644 --- a/login-oauth2-server/src/main/resources/mybatis/mapper/oauth2-client-mapper.xml +++ b/login-oauth2-server/src/main/resources/mybatis/mapper/oauth2-client-mapper.xml @@ -32,6 +32,7 @@ + @@ -56,6 +57,7 @@ + @@ -85,6 +87,7 @@ `expire_time` varchar(10) DEFAULT NULL COMMENT '系统到期时间', `system_summary` text COMMENT '系统介绍', `system_icon` varchar(255) DEFAULT NULL COMMENT '系统图标', + `sort` double(11, 4) DEFAULT NULL COMMENT '排序', `gmt_create` datetime DEFAULT NULL, `creator` char(36) DEFAULT NULL, `gmt_modified` datetime DEFAULT NULL, @@ -115,6 +118,7 @@ expire_time, system_summary, system_icon, + sort, creator, gmt_create, modifier, @@ -134,11 +138,12 @@ #{additionalInformation}, #{autoapprove}, #{environment}, - #{system_type}, - #{system_state}, - #{expire_time}, - #{system_summary}, - #{system_icon}, + #{systemType}, + #{systemState}, + #{expireTime}, + #{systemSummary}, + #{systemIcon}, + #{sort}, #{creator}, #{gmtCreate}, #{modifier}, @@ -217,6 +222,9 @@ system_icon = #{systemIcon}, + + + sort = #{sort}, modifier = #{modifier}, gmt_modified = #{gmtModified} @@ -282,7 +290,7 @@ ORDER BY - t1.gmt_create desc + t1.sort @@ -312,6 +320,21 @@ #{menuIds[${index}]} + + + ORDER BY + + t1.client_id ${order} + + + t1.client_name ${order} + + + + ORDER BY + t1.sort + + @@ -334,6 +357,7 @@ t1.expire_time, t1.system_summary, t1.system_icon, + t1.sort, t2.menu_id, t2.menu_name FROM @@ -383,6 +407,7 @@ t1.expire_time, t1.system_summary, t1.system_icon, + t1.sort, t1.menu_id, t1.gmt_create, t1.creator, diff --git a/login-oauth2-server/src/main/resources/templates/oauth2client/save.html b/login-oauth2-server/src/main/resources/templates/oauth2client/save.html index 7b4ffe08..62e88e31 100644 --- a/login-oauth2-server/src/main/resources/templates/oauth2client/save.html +++ b/login-oauth2-server/src/main/resources/templates/oauth2client/save.html @@ -50,16 +50,22 @@ -
- -
- +
+
+
+ +
+ +
+
-
-
- -
- +
+
+ +
+ +
+
@@ -72,52 +78,82 @@
-
- -
- - - +
+
+
+ +
+ + + +
+
+
+
+
+ +
+ +
+
-
- -
- +
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
-
- -
- - +
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
-
- -
- - +
+
+
+ +
+ + +
+
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- +
+
+ +
+ +
+
diff --git a/login-oauth2-server/src/main/resources/templates/oauth2client/update.html b/login-oauth2-server/src/main/resources/templates/oauth2client/update.html index 31db984f..19b9f1f5 100644 --- a/login-oauth2-server/src/main/resources/templates/oauth2client/update.html +++ b/login-oauth2-server/src/main/resources/templates/oauth2client/update.html @@ -50,16 +50,22 @@
-
- -
- +
+
+
+ +
+ +
+
-
-
- -
- +
+
+ +
+ +
+
@@ -67,57 +73,87 @@
- + - +
-
- -
- - - +
+
+
+ +
+ + + +
+
+
+
+
+ +
+ +
+
-
- -
- +
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
-
- -
- - +
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
-
- -
- - +
+
+
+ +
+ + +
+
-
-
- -
- - -
-
-
- -
- - -
-
-
- -
- +
+
+ +
+ +
+
@@ -156,7 +192,6 @@
-
@@ -303,6 +338,7 @@ expireTime: data.expireTime, systemSummary: data.systemSummary, systemIcon: data.systemIcon, + sort: data.sort }); var authorizedGrantTypes = data.authorizedGrantTypes.split(','); var formObj = {}; diff --git a/module-map/src/main/resources/mybatis/mapper/grid/grid-group-mapper.xml b/module-map/src/main/resources/mybatis/mapper/grid/grid-group-mapper.xml index 41f054ed..39677452 100644 --- a/module-map/src/main/resources/mybatis/mapper/grid/grid-group-mapper.xml +++ b/module-map/src/main/resources/mybatis/mapper/grid/grid-group-mapper.xml @@ -146,6 +146,10 @@ AND grid_group_id = #{gridGroupId} + + AND + grid_group_code = #{gridGroupCode} +