From a094605649201157510e8840cf14ba283660e996 Mon Sep 17 00:00:00 2001 From: awenes <1121353141@qq.com> Date: Mon, 25 Sep 2023 15:11:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:arrow=5Fup:=20=E4=BE=9D=E8=B5=96=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eiam-console/src/main/console-fe/package.json | 2 +- eiam-portal/src/main/portal-fe/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eiam-console/src/main/console-fe/package.json b/eiam-console/src/main/console-fe/package.json index 409cbe6f..f4b96ecd 100644 --- a/eiam-console/src/main/console-fe/package.json +++ b/eiam-console/src/main/console-fe/package.json @@ -47,7 +47,7 @@ "@ant-design/charts": "^1.4.2", "@ant-design/icons": "^5.2.6", "@ant-design/maps": "^1.0.7", - "@ant-design/pro-components": "^2.6.23", + "@ant-design/pro-components": "^2.6.24", "ahooks": "^3.7.8", "antd": "^5.9.2", "antd-img-crop": "^4.13.0", diff --git a/eiam-portal/src/main/portal-fe/package.json b/eiam-portal/src/main/portal-fe/package.json index 252d7ba7..a5676d4b 100644 --- a/eiam-portal/src/main/portal-fe/package.json +++ b/eiam-portal/src/main/portal-fe/package.json @@ -48,7 +48,7 @@ "@ant-design/charts": "^1.4.2", "@ant-design/icons": "^5.2.6", "@ant-design/maps": "^1.0.7", - "@ant-design/pro-components": "^2.6.23", + "@ant-design/pro-components": "^2.6.24", "ahooks": "^3.7.8", "antd": "^5.9.2", "antd-img-crop": "^4.13.0", From 9a5c6d68d6b8abf4bbafbf452450ce44181ca8b8 Mon Sep 17 00:00:00 2001 From: Friday <1121353141@qq.com> Date: Mon, 25 Sep 2023 11:27:51 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=A8=E6=88=B7=E7=AB=AF=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/app}/query/GetAppListQuery.java | 10 +++++++--- .../repository/app/AppRepositoryCustomized.java | 5 +++-- .../app/impl/AppRepositoryCustomizedImpl.java | 13 +++++++------ .../employee/portal/controller/AppController.java | 2 +- .../topiam/employee/portal/service/AppService.java | 2 +- .../portal/service/impl/AppServiceImpl.java | 5 ++--- 6 files changed, 21 insertions(+), 16 deletions(-) rename {eiam-portal/src/main/java/cn/topiam/employee/portal/pojo => eiam-common/src/main/java/cn/topiam/employee/common/entity/app}/query/GetAppListQuery.java (85%) diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/query/GetAppListQuery.java b/eiam-common/src/main/java/cn/topiam/employee/common/entity/app/query/GetAppListQuery.java similarity index 85% rename from eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/query/GetAppListQuery.java rename to eiam-common/src/main/java/cn/topiam/employee/common/entity/app/query/GetAppListQuery.java index e34820f8..7eec7900 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/query/GetAppListQuery.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/entity/app/query/GetAppListQuery.java @@ -15,11 +15,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package cn.topiam.employee.portal.pojo.query; +package cn.topiam.employee.common.entity.app.query; import java.io.Serial; import java.io.Serializable; +import io.swagger.v3.oas.annotations.Parameter; import org.springdoc.core.annotations.ParameterObject; import lombok.Data; @@ -39,14 +40,17 @@ public class GetAppListQuery implements Serializable { @Serial private static final long serialVersionUID = -4981513177967939516L; + /** - * name + * 应用名称 */ + @Parameter(description = "应用名称") private String name; /** - * groupId + * 应用分组ID */ + @Parameter(description = "应用分组ID") private Long groupId; } diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/AppRepositoryCustomized.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/AppRepositoryCustomized.java index bea2c11f..6665bc28 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/AppRepositoryCustomized.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/AppRepositoryCustomized.java @@ -19,6 +19,7 @@ package cn.topiam.employee.common.repository.app; import java.util.List; +import cn.topiam.employee.common.entity.app.query.GetAppListQuery; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -37,12 +38,12 @@ public interface AppRepositoryCustomized { * * 获取我的应用列表 * - * @param name {@link String} * @param userId {@link Long} + * @param query {@link GetAppListQuery} * @param pageable {@link Pageable} * @return {@link List} */ - Page getAppList(Long userId, String name, Long groupId, Pageable pageable); + Page getAppList(Long userId, GetAppListQuery query, Pageable pageable); /** * diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java index 46b24d81..23dd7a63 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppRepositoryCustomizedImpl.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import cn.topiam.employee.common.entity.app.query.GetAppListQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -56,13 +57,13 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized { /** * 获取我的应用列表 * - * @param name {@link String} * @param userId {@link Long} + * @param query {@link query} * @param pageable {@link String} * @return {@link List} */ @Override - public Page getAppList(Long userId, String name, Long groupId, Pageable pageable) { + public Page getAppList(Long userId, GetAppListQuery query, Pageable pageable) { List paramList = Lists.newArrayList(); //当前用户加入的用户组Id List groupIdList = userGroupMemberRepository.findByUserId(userId).stream() @@ -89,12 +90,12 @@ public class AppRepositoryCustomizedImpl implements AppRepositoryCustomized { AND (app_acce.subject_id IN (:subjectIds) OR app.authorization_type = 'all_access') """); //用户名 - if (StringUtils.isNoneBlank(name)) { - builder.append(" AND app.name_ like '%").append(name).append("%'"); + if (StringUtils.isNoneBlank(query.getName())) { + builder.append(" AND app.name_ like '%").append(query.getName()).append("%'"); } //分组id - if (null!=groupId) { - builder.append(" AND ass.group_id = ").append(groupId); + if (Objects.nonNull(query.getGroupId())) { + builder.append(" AND ass.group_id = ").append(query.getGroupId()); } //@formatter:on String sql = builder.toString(); diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/controller/AppController.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/controller/AppController.java index 440a7981..49c3db6a 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/controller/AppController.java +++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/controller/AppController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import cn.topiam.employee.common.entity.app.query.AppGroupQuery; -import cn.topiam.employee.portal.pojo.query.GetAppListQuery; +import cn.topiam.employee.common.entity.app.query.GetAppListQuery; import cn.topiam.employee.portal.pojo.result.AppGroupListResult; import cn.topiam.employee.portal.pojo.result.GetAppListResult; import cn.topiam.employee.portal.service.AppService; diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/service/AppService.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/service/AppService.java index 3163ea14..c5b1b516 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/service/AppService.java +++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/service/AppService.java @@ -20,7 +20,7 @@ package cn.topiam.employee.portal.service; import java.util.List; import cn.topiam.employee.common.entity.app.query.AppGroupQuery; -import cn.topiam.employee.portal.pojo.query.GetAppListQuery; +import cn.topiam.employee.common.entity.app.query.GetAppListQuery; import cn.topiam.employee.portal.pojo.result.AppGroupListResult; import cn.topiam.employee.portal.pojo.result.GetAppListResult; import cn.topiam.employee.support.repository.page.domain.Page; diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/service/impl/AppServiceImpl.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/service/impl/AppServiceImpl.java index 807d7063..5da76eb4 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/service/impl/AppServiceImpl.java +++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/service/impl/AppServiceImpl.java @@ -29,7 +29,7 @@ import cn.topiam.employee.common.repository.app.AppGroupRepository; import cn.topiam.employee.common.repository.app.AppRepository; import cn.topiam.employee.portal.converter.AppConverter; import cn.topiam.employee.portal.converter.AppGroupConverter; -import cn.topiam.employee.portal.pojo.query.GetAppListQuery; +import cn.topiam.employee.common.entity.app.query.GetAppListQuery; import cn.topiam.employee.portal.pojo.result.AppGroupListResult; import cn.topiam.employee.portal.pojo.result.GetAppListResult; import cn.topiam.employee.portal.service.AppService; @@ -56,8 +56,7 @@ public class AppServiceImpl implements AppService { public Page getAppList(GetAppListQuery query, PageModel pageModel) { Long userId = Long.valueOf(SecurityUtils.getCurrentUserId()); org.springframework.data.domain.Page list = appRepository.getAppList(userId, - query.getName(), query.getGroupId(), - QPageRequest.of(pageModel.getCurrent(), pageModel.getPageSize())); + query, QPageRequest.of(pageModel.getCurrent(), pageModel.getPageSize())); return appConverter.entityConvertToAppListResult(list); }