From 2f07f9eb668b5c0efb8bac1cf5a015b38d722657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com>
Date: Mon, 30 Sep 2024 11:46:43 +0800
Subject: [PATCH] publish 2.0.11
---
pom.xml | 18 +++++++++---------
springboot-ademo/pom.xml | 4 ++--
springboot-annotation/pom.xml | 2 +-
springboot-database/pom.xml | 2 +-
springboot-login/pom.xml | 2 +-
springboot-message/pom.xml | 2 +-
springboot-platform/pom.xml | 2 +-
springboot-role/pom.xml | 2 +-
.../role/controller/CommRoleController.java | 1 +
.../controller/role/RoleServerController.java | 6 ++++--
.../tiesheng/role/pojos/dto/ServerListDTO.java | 15 +++++++++++++++
springboot-util/pom.xml | 2 +-
springboot-web/pom.xml | 2 +-
13 files changed, 39 insertions(+), 21 deletions(-)
create mode 100644 springboot-role/src/main/java/com/tiesheng/role/pojos/dto/ServerListDTO.java
diff --git a/pom.xml b/pom.xml
index 44c52db..97d9a6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 2.0.10
+ 2.0.11
pom
springboot-parent
杭州铁晟科技有限公司基础依赖
@@ -58,49 +58,49 @@
com.tiesheng.springboot-parent
springboot-database
- 2.0.10
+ 2.0.11
com.tiesheng.springboot-parent
springboot-login
- 2.0.10
+ 2.0.11
com.tiesheng.springboot-parent
springboot-web
- 2.0.10
+ 2.0.11
com.tiesheng.springboot-parent
springboot-util
- 2.0.10
+ 2.0.11
com.tiesheng.springboot-parent
springboot-platform
- 2.0.10
+ 2.0.11
com.tiesheng.springboot-parent
springboot-message
- 2.0.10
+ 2.0.11
com.tiesheng.springboot-parent
springboot-role
- 2.0.10
+ 2.0.11
com.tiesheng.springboot-parent
springboot-annotation
- 2.0.10
+ 2.0.11
diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml
index 8afb3f3..8bdcae0 100644
--- a/springboot-ademo/pom.xml
+++ b/springboot-ademo/pom.xml
@@ -6,11 +6,11 @@
com.tiesheng.springboot-parent
springboot-parent
- 2.0.10
+ 2.0.11
springboot-ademo
- 2.0.10
+ 2.0.11
8
diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml
index 7b4aa32..029737a 100644
--- a/springboot-annotation/pom.xml
+++ b/springboot-annotation/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 2.0.10
+ 2.0.11
springboot-annotation
diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml
index e7c32b7..b859cb7 100644
--- a/springboot-database/pom.xml
+++ b/springboot-database/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 2.0.10
+ 2.0.11
springboot-database
diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml
index fe9b37d..4252c15 100644
--- a/springboot-login/pom.xml
+++ b/springboot-login/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 2.0.10
+ 2.0.11
springboot-login
diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml
index a908f6b..4c52b0b 100644
--- a/springboot-message/pom.xml
+++ b/springboot-message/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 2.0.10
+ 2.0.11
springboot-message
diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml
index 1cca291..97f0366 100644
--- a/springboot-platform/pom.xml
+++ b/springboot-platform/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 2.0.10
+ 2.0.11
springboot-platform
diff --git a/springboot-role/pom.xml b/springboot-role/pom.xml
index 9822c13..affbd59 100644
--- a/springboot-role/pom.xml
+++ b/springboot-role/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 2.0.10
+ 2.0.11
springboot-role
diff --git a/springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java b/springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java
index 2892e91..9c9ae85 100644
--- a/springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java
+++ b/springboot-role/src/main/java/com/tiesheng/role/controller/CommRoleController.java
@@ -49,6 +49,7 @@ public class CommRoleController {
.in("id", list)
.eq(CoreRoleServer.IS_DELETED, 0)
.eq("is_open", 1)
+ .orderByAsc("sort")
);
}
diff --git a/springboot-role/src/main/java/com/tiesheng/role/controller/role/RoleServerController.java b/springboot-role/src/main/java/com/tiesheng/role/controller/role/RoleServerController.java
index eeb3033..da0d202 100644
--- a/springboot-role/src/main/java/com/tiesheng/role/controller/role/RoleServerController.java
+++ b/springboot-role/src/main/java/com/tiesheng/role/controller/role/RoleServerController.java
@@ -6,6 +6,7 @@ import com.tiesheng.annotation.role.RoleAuthority;
import com.tiesheng.role.pojos.dao.CoreRoleAuthority;
import com.tiesheng.role.pojos.dao.CoreRoleServer;
import com.tiesheng.role.pojos.dto.MenuListDTO;
+import com.tiesheng.role.pojos.dto.ServerListDTO;
import com.tiesheng.role.pojos.vo.ServiceMenuVO;
import com.tiesheng.role.service.CoreRoleService;
import com.tiesheng.util.pojos.ApiResp;
@@ -29,10 +30,11 @@ public class RoleServerController {
* @return
*/
@GetMapping("/server/list")
- public ApiResp> list() {
+ public ApiResp> list(ServerListDTO dto) {
return ApiResp.respOK(coreRoleService.getServerMapper().selectList(new QueryWrapper()
.eq(CoreRoleServer.IS_DELETED, 0)
- .eq("is_open", 1)
+ .eq(StrUtil.isNotEmpty(dto.getIsOpen()), "is_open", dto.getIsOpen())
+ .orderByAsc("sort")
));
}
diff --git a/springboot-role/src/main/java/com/tiesheng/role/pojos/dto/ServerListDTO.java b/springboot-role/src/main/java/com/tiesheng/role/pojos/dto/ServerListDTO.java
new file mode 100644
index 0000000..fb0c5d2
--- /dev/null
+++ b/springboot-role/src/main/java/com/tiesheng/role/pojos/dto/ServerListDTO.java
@@ -0,0 +1,15 @@
+package com.tiesheng.role.pojos.dto;
+
+public class ServerListDTO {
+
+ private String isOpen;
+
+
+ public String getIsOpen() {
+ return isOpen;
+ }
+
+ public void setIsOpen(String isOpen) {
+ this.isOpen = isOpen;
+ }
+}
diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml
index fe6cd31..92aa89f 100644
--- a/springboot-util/pom.xml
+++ b/springboot-util/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 2.0.10
+ 2.0.11
springboot-util
diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml
index 6d13339..1138aa2 100644
--- a/springboot-web/pom.xml
+++ b/springboot-web/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 2.0.10
+ 2.0.11
springboot-web