From dcbf3fe95376c629b377ec724ad9eed2d7d268ec Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Thu, 18 Dec 2025 00:30:20 +0800 Subject: [PATCH] 养护计划优化提交 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java | 12 +++++++++++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java | 11 ++++++++++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java | 11 ++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java index cd3df42..d5a2cac 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/InspectionPlanController.java @@ -5,6 +5,7 @@ import com.zteits.urbanops.framework.common.pojo.CommonResult; import com.zteits.urbanops.framework.common.pojo.PageParam; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import com.zteits.urbanops.framework.datapermission.core.util.DataPermissionUtils; import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanPageReqVO; @@ -13,6 +14,7 @@ import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.Insp import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanUpdateReqVO; import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO; import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanService; +import com.zteits.urbanops.module.system.api.permission.PermissionApi; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -43,6 +45,9 @@ public class InspectionPlanController { @Resource private InspectionPlanService inspectionPlanService; + @Resource + private PermissionApi permissionApi; + @PostMapping("/create") @Operation(summary = "创建巡检计划汇总") @PreAuthorize("@ss.hasPermission('garden:inspection-plan:create')") @@ -118,8 +123,13 @@ public class InspectionPlanController { @Operation(summary = "获得巡检计划汇总分页") @PreAuthorize("@ss.hasPermission('garden:inspection-plan:query')") public CommonResult> getInspectionPlanPage(@Valid InspectionPlanPageReqVO pageReqVO) { + Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); if(pageReqVO.getCompanyId() == null){ - pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId()); + if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){ + pageReqVO.setCompanyId( null); + }else{ + pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId()); + } } PageResult pageResult = inspectionPlanService.getInspectionPlanPage(pageReqVO); return success(pageResult); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java index 4f2cf1a..9b42aa2 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java @@ -13,6 +13,7 @@ import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.Mainta import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanUpdateReqVO; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO; import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanService; +import com.zteits.urbanops.module.system.api.permission.PermissionApi; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -43,6 +44,9 @@ public class MaintainPlanController { @Resource private MaintainPlanService maintainPlanService; + @Resource + private PermissionApi permissionApi; + @PostMapping("/create") @Operation(summary = "创建养护计划汇总") @PreAuthorize("@ss.hasPermission('garden:maintain-plan:create')") @@ -119,7 +123,12 @@ public class MaintainPlanController { @PreAuthorize("@ss.hasPermission('garden:maintain-plan:query')") public CommonResult> getMaintainPlanPage(@Valid MaintainPlanPageReqVO pageReqVO) { if(pageReqVO.getCompanyId() == null){ - pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId()); + Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); + if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){ + pageReqVO.setCompanyId( null); + }else{ + pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId()); + } } PageResult pageResult = maintainPlanService.getMaintainPlanPage(pageReqVO); return success(pageResult); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java index b6ab21c..e3b026c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadController.java @@ -1,6 +1,7 @@ package com.zteits.urbanops.module.garden.controller.admin.road; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; +import com.zteits.urbanops.module.system.api.permission.PermissionApi; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -38,6 +39,9 @@ public class RoadController { @Resource private RoadService roadService; + @Resource + private PermissionApi permissionApi; + @PostMapping("/create") @Operation(summary = "创建道路管理") @PreAuthorize("@ss.hasPermission('garden:road:create')") @@ -84,7 +88,12 @@ public class RoadController { @PreAuthorize("@ss.hasPermission('garden:road:query')") public CommonResult> getRoadPage(@Valid RoadPageReqVO pageReqVO) { if(pageReqVO.getCompanyId() == null){ - pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId()); + Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); + if(permissionApi.hasAnyRoles(loginUserId, "super_admin")){ + pageReqVO.setCompanyId( null); + }else{ + pageReqVO.setCompanyId(SecurityFrameworkUtils.getCompanyId()); + } } PageResult pageResult = roadService.getRoadPage(pageReqVO); return success(pageResult); -- libgit2 0.21.4