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 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 { PqDashboardPageVO queryByPagePath(String pagePath); List 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(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper); } @@ -82,6 +83,11 @@ public class PqDashboardPageServiceImpl extends ServiceImpl userList = Arrays.asList("0",RequestUtil.getUserIndex()); @@ -108,6 +114,8 @@ public class PqDashboardPageServiceImpl extends ServiceImpl