From 59c8d2a6723d95604a35e11a0201d31859eb7a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Fri, 10 Jan 2025 00:06:05 +0800 Subject: [PATCH] =?UTF-8?q?refactor(app):=20=E5=BA=95=E9=83=A8tabbar=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BC=98=E5=85=88=E7=BA=A7=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/0pigxx_boot.sql | 1 + db/999pigxx_app.sql | 1 + .../com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java | 6 ++++++ .../pig4cloud/pigx/app/controller/AppTabbarController.java | 3 ++- .../pigx/app/service/impl/AppIndexServiceImpl.java | 3 ++- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/db/0pigxx_boot.sql b/db/0pigxx_boot.sql index f9cc61441..38b0abac8 100644 --- a/db/0pigxx_boot.sql +++ b/db/0pigxx_boot.sql @@ -2728,6 +2728,7 @@ CREATE TABLE `app_tabbar` ( `selected` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '未选图标', `unselected` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '已选图标', `link` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '链接地址', + `sort_order` int(11) NOT NULL DEFAULT '0' COMMENT '排序', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间', `create_by` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', diff --git a/db/999pigxx_app.sql b/db/999pigxx_app.sql index be5ca51a8..45fe2b69b 100644 --- a/db/999pigxx_app.sql +++ b/db/999pigxx_app.sql @@ -117,6 +117,7 @@ CREATE TABLE `app_tabbar` ( `selected` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '未选图标', `unselected` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '已选图标', `link` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '链接地址', + `sort_order` int(11) NOT NULL DEFAULT '0' COMMENT '排序', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间', `create_by` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java index 70a5bb8db..30725d18a 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppTabbarEntity.java @@ -57,6 +57,12 @@ public class AppTabbarEntity extends Model { @JsonDeserialize() private String link; + /** + * 排序顺序 + */ + @Schema(description = "排序值") + private Integer sortOrder; + /** * 创建人 */ diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppTabbarController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppTabbarController.java index 7a596c8bc..6cc3e6c85 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppTabbarController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppTabbarController.java @@ -1,6 +1,7 @@ package com.pig4cloud.pigx.app.controller; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.app.api.entity.AppTabbarEntity; import com.pig4cloud.pigx.app.service.AppTabbarService; import com.pig4cloud.pigx.common.core.util.R; @@ -37,7 +38,7 @@ public class AppTabbarController { @Operation(summary = "查询导航列表", description = "查询导航列表") @GetMapping("/list") public R list() { - return R.ok(tabbarService.list()); + return R.ok(tabbarService.list(Wrappers.lambdaQuery().orderByAsc(AppTabbarEntity::getSortOrder))); } @Operation(summary = "更新导航", description = "更新导航") diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppIndexServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppIndexServiceImpl.java index 2d57aab3a..73e3831ed 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppIndexServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppIndexServiceImpl.java @@ -59,7 +59,8 @@ public class AppIndexServiceImpl implements AppIndexService { @Override public Map config() { Map response = new LinkedHashMap<>(); - List tabbarEntityList = appTabbarMapper.selectList(Wrappers.emptyWrapper()); + List tabbarEntityList = appTabbarMapper + .selectList(Wrappers.lambdaQuery().orderByAsc(AppTabbarEntity::getSortOrder)); response.put("tabbar", tabbarEntityList); return response; }