From 9ffbdbdf57dfe36d3fa3648b34059cfe8cc1362a Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 25 Dec 2025 20:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=88=B1=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/system/pojo/param/PqDashboardPageParam.java   |  6 ++++++
 .../com/njcn/system/pojo/vo/PqDashboardPageVO.java     |  7 +++++++
 .../system/controller/PqDashboardPageController.java   | 10 ++++++++++
 .../njcn/system/service/PqDashboardPageService.java    |  2 ++
 .../service/impl/PqDashboardPageServiceImpl.java       | 10 +++++++++-
 5 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/PqDashboardPageParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/PqDashboardPageParam.java
index ee89aaa37..2bb6c23ab 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/PqDashboardPageParam.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/PqDashboardPageParam.java
@@ -65,6 +65,12 @@ public class PqDashboardPageParam  {
     @ApiModelProperty("图标")
     private String icon;
 
+    /**
+     * 页面名称
+     */
+    @ApiModelProperty("用户id")
+    private String userId;
+
     /**
      * 更新操作实体
      */
diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/PqDashboardPageVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/PqDashboardPageVO.java
index e66c8d018..e2f9763d5 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/PqDashboardPageVO.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/PqDashboardPageVO.java
@@ -1,5 +1,6 @@
 package com.njcn.system.pojo.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -50,6 +51,12 @@ public class PqDashboardPageVO extends BaseEntity {
      */
     private Integer sort;
 
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+
     /**
      * 0未激活，1激活
      */
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/PqDashboardPageController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/PqDashboardPageController.java
index ad843a207..0af9e55a0 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/PqDashboardPageController.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/PqDashboardPageController.java
@@ -89,6 +89,16 @@ public class PqDashboardPageController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    @PostMapping("/scopePage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("全局的驾驶舱页面")
+    public HttpResult<Boolean> scopePage(@RequestParam("id") String id,@RequestParam("userId") String userId){
+        log.info("全局的驾驶舱页面");
+        String methodDescribe = getMethodDescribe("scopePage");
+        Boolean result = pqDashboardPageService.scopePage(id,userId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
     @PostMapping("/queryActivatePage")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @ApiOperation("查询激活的驾驶舱页面")
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/PqDashboardPageService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/PqDashboardPageService.java
index 267b414ad..1e430d811 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/PqDashboardPageService.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/PqDashboardPageService.java
@@ -33,4 +33,6 @@ public interface PqDashboardPageService extends IService<PqDashboardPage> {
     PqDashboardPageVO queryByPagePath(String pagePath);
 
     List<PqDashboardPage> getDashboardPageByUserId(String id,boolean state);
+
+    Boolean scopePage(String id, String userId);
 }
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java
index 733031fd8..c92084c8d 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java
@@ -42,7 +42,7 @@ public class PqDashboardPageServiceImpl extends ServiceImpl<PqDashboardPageMappe
         BeanUtils.copyProperties(pqDashboardPageParam,pqDashboardPage);
         //根据前端传递状态赋值
         //pqDashboardPage.setState(0);
-        pqDashboardPage.setUserId(RequestUtil.getUserIndex());
+//        pqDashboardPage.setUserId(RequestUtil.getUserIndex());
         this.save(pqDashboardPage);
         return true;
     }
@@ -74,6 +74,7 @@ public class PqDashboardPageServiceImpl extends ServiceImpl<PqDashboardPageMappe
         if(Objects.nonNull(param.getPageName())){
             queryWrapper.like("A.page_name",param.getPageName());
         }
+        queryWrapper.orderByAsc("A.sort");
         return this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
     }
 
@@ -82,6 +83,11 @@ public class PqDashboardPageServiceImpl extends ServiceImpl<PqDashboardPageMappe
         return this.lambdaUpdate().set(PqDashboardPage::getState,state).eq(PqDashboardPage::getId,id).update();
     }
 
+    @Override
+    public Boolean scopePage(String id, String userId) {
+        return this.lambdaUpdate().set(PqDashboardPage::getUserId,userId).eq(PqDashboardPage::getId,id).update();
+    }
+
     @Override
     public PqDashboardPageVO queryByPagePath(String pagePath) {
         List<String> userList = Arrays.asList("0",RequestUtil.getUserIndex());
@@ -108,6 +114,8 @@ public class PqDashboardPageServiceImpl extends ServiceImpl<PqDashboardPageMappe
         }
     }
 
+
+
     /**
      * 校验参数，检查是否存在相同编码的字典类型
      */