From 527aba52435ae182aa9b9b090d4c09eae6347e3f Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 8 Oct 2024 18:04:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E7=BD=91=E6=BC=8F=E6=B4=9E=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/controller/RepairController.java | 5 ++++- .../material/controller/BackRecordController.java | 3 +++ .../material/controller/InputRecordController.java | 3 +++ .../material/controller/LeaseRecordController.java | 3 +++ .../controller/ProjUsingRecordController.java | 2 ++ .../controller/PurchaseCheckInfoController.java | 2 ++ .../PurchaseCheckServiceCenterController.java | 3 +++ .../material/controller/RepairRecordController.java | 3 +++ .../material/controller/ScrapRecordController.java | 3 +++ .../controller/SltAgreementInfoController.java | 11 +++++++---- 10 files changed, 33 insertions(+), 5 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/RepairController.java index 39c1fcd..a4bd549 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/RepairController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/controller/RepairController.java @@ -13,6 +13,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.Logical; import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.system.api.domain.SysUser; import io.swagger.annotations.ApiOperation; @@ -39,6 +40,7 @@ public class RepairController extends BaseController { @ApiOperation(value = "获取维修任务列表") @Log(title = "维修任务列表", businessType = BusinessType.QUERY) @GetMapping("/getRepairTaskList") + @RequiresPermissions(value = "repair:manage:list") public TableDataInfo getRepairTaskList(RepairTask bean) { startPage(); @@ -51,6 +53,7 @@ public class RepairController extends BaseController { */ @Log(title = "导出维修任务列表", businessType = BusinessType.EXPORT) @PostMapping("/export") + @RequiresPermissions("repair:manage:export") public void export(HttpServletResponse response, RepairTask bean) { List list = service.exportRepairTaskList(bean); @@ -76,7 +79,7 @@ public class RepairController extends BaseController { @ApiOperation(value = "获取维修任务机具列表") @Log(title = "维修任务机具列表", businessType = BusinessType.QUERY) @GetMapping("/getRepairMaTypeList") - @RequiresPermissions("base:repair:list") + @RequiresPermissions("repair:manage:preview") public TableDataInfo getRepairMaTypeList(RepairTaskDetails bean) { startPage(); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java index 8dc7a80..02721cb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java @@ -5,6 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.material.domain.BackRecord; import com.bonus.sgzb.material.domain.LeaseRecord; import com.bonus.sgzb.material.service.BackRecordService; @@ -38,6 +39,7 @@ public class BackRecordController extends BaseController { */ @ApiOperation(value = "综合查询--退料记录列表") @GetMapping("/getBackRecordList") + @RequiresPermissions("return:list:query") public AjaxResult getBackRecordList(BackRecord bean) { startPage(); List list = backRecordService.getBackRecordList(bean); @@ -50,6 +52,7 @@ public class BackRecordController extends BaseController { @ApiOperation("导出综合查询退料记录列表") @Log(title = "导出综合查询退料记录列表", businessType = BusinessType.EXPORT) @PostMapping("/export") + @RequiresPermissions("return:list:export") public void export(HttpServletResponse response, BackRecord bean) { List list = backRecordService.getBackRecordList(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java index 5e0d5fc..5deebe0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java @@ -5,6 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.material.domain.InputRecord; import com.bonus.sgzb.material.domain.OutRecord; import com.bonus.sgzb.material.domain.ScrapRecord; @@ -38,6 +39,7 @@ public class InputRecordController extends BaseController { */ @ApiOperation(value = "综合查询--机具入库查询列表") @GetMapping("/getInputRecordList") + @RequiresPermissions("storage:list:query") public AjaxResult getInputRecordList(InputRecord bean) { startPage(); List list = inputRecordService.getInputRecordList(bean); @@ -58,6 +60,7 @@ public class InputRecordController extends BaseController { @ApiOperation("导出综合查询机具入库查询列表") @Log(title = "导出综合查询机具入库查询列表", businessType = BusinessType.EXPORT) @PostMapping("/export") + @RequiresPermissions("storage:list:export") public void exInputport(HttpServletResponse response, InputRecord bean) { List list = inputRecordService.getInputRecordList(bean); ExcelUtil util = new ExcelUtil(InputRecord.class); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java index 471bbbd..1320ced 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java @@ -5,6 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.material.domain.LeaseRecord; import com.bonus.sgzb.material.service.LeaseRecordService; import io.swagger.annotations.Api; @@ -32,6 +33,7 @@ public class LeaseRecordController extends BaseController { */ @ApiOperation(value = "综合查询--领料记录列表") @GetMapping("/getLeaseRecordList") + @RequiresPermissions("picking:list:query") public AjaxResult getLeaseRecordList(LeaseRecord bean) { startPage(); List list = leaseRecordService.getLeaseRecordList(bean); @@ -44,6 +46,7 @@ public class LeaseRecordController extends BaseController { @ApiOperation("导出综合查询领料记录列表") @Log(title = "导出综合查询领料记录列表", businessType = BusinessType.EXPORT) @PostMapping("/export") + @RequiresPermissions("picking:list:export") public void export(HttpServletResponse response, LeaseRecord bean) { List list = leaseRecordService.getLeaseRecordList(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java index a506257..7985500 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java @@ -5,6 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.material.domain.BackRecord; import com.bonus.sgzb.material.domain.ProjUsingRecord; import com.bonus.sgzb.material.service.BackRecordService; @@ -37,6 +38,7 @@ public class ProjUsingRecordController extends BaseController { */ @ApiOperation(value = "综合查询--工程机具使用列表") @GetMapping("/getProjUsingRecordList") + @RequiresPermissions("stquery:projUsingRecord:list") public AjaxResult getProjUsingRecordList(ProjUsingRecord bean) { startPage(); List list = projUsingRecordService.getProjUsingRecordList(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java index 211830b..0617f63 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java @@ -3,6 +3,7 @@ package com.bonus.sgzb.material.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; @@ -40,6 +41,7 @@ public class PurchaseCheckInfoController extends BaseController { */ @ApiOperation("查询新购入库任务列表") @GetMapping("/putInList") + @RequiresPermissions("warehousing:newTools:list") public TableDataInfo putInList(PurchaseCheckInfo purchaseCheckInfo) { startPage(); return getDataTable(purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo)); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java index 0c898e5..7d37db3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckServiceCenterController.java @@ -6,6 +6,8 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.Logical; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; @@ -68,6 +70,7 @@ public class PurchaseCheckServiceCenterController extends BaseController * 审核-通过/不通过 */ @ApiOperation(value = "综合服务中心审核") + @RequiresPermissions(value = "warehousing:newTools:list,warehousing:newTools:auditing",logical = Logical.OR) @PutMapping("/manageStatus") public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception { return toAjax(purchaseCheckServiceCenterService.modifyManageStatus(maInputVO)); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java index 421e650..6a6f70e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java @@ -5,6 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.material.domain.BackRecord; import com.bonus.sgzb.material.domain.RepairRecord; import com.bonus.sgzb.material.service.BackRecordService; @@ -37,6 +38,7 @@ public class RepairRecordController extends BaseController { */ @ApiOperation(value = "综合查询--维修记录列表") @GetMapping("/getRepairRecordList") + @RequiresPermissions("tools:repair:list") public AjaxResult getRepairRecordList(RepairRecord bean) { startPage(); List list = repairRecordService.getRepairRecordList(bean); @@ -49,6 +51,7 @@ public class RepairRecordController extends BaseController { @ApiOperation("导出综合查询维修记录列表") @Log(title = "导出综合查询维修记录列表", businessType = BusinessType.EXPORT) @PostMapping("/export") + @RequiresPermissions("tools:repair:export") public void export(HttpServletResponse response, RepairRecord bean) { List list = repairRecordService.getRepairRecordList(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapRecordController.java index c74b7e3..7fcfcce 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapRecordController.java @@ -5,6 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; import com.bonus.sgzb.material.domain.BackRecord; import com.bonus.sgzb.material.domain.ScrapRecord; import com.bonus.sgzb.material.service.BackRecordService; @@ -37,6 +38,7 @@ public class ScrapRecordController extends BaseController { */ @ApiOperation(value = "综合查询--机具报废查询列表") @GetMapping("/getScrapRecordList") + @RequiresPermissions("stquery:deviceScrapQuery:list") public AjaxResult getBackRecordList(ScrapRecord bean) { startPage(); List list = scrapRecordService.getScrapRecordList(bean); @@ -49,6 +51,7 @@ public class ScrapRecordController extends BaseController { @ApiOperation("导出综合查询机具报废查询列表") @Log(title = "导出综合查询机具报废查询列表", businessType = BusinessType.EXPORT) @PostMapping("/export") + @RequiresPermissions("device:scrap:export") public void export(HttpServletResponse response, ScrapRecord bean) { List list = scrapRecordService.getScrapRecordList(bean); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java index 3b01c1d..29878f2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SltAgreementInfoController.java @@ -66,7 +66,7 @@ public class SltAgreementInfoController extends BaseController { /** * 根据协议获取月结算清单 */ - @RequiresPermissions("cost:settlement:month") + @RequiresPermissions("month:record:query") @ApiOperation(value = "根据协议获取月结算清单") @PostMapping("/getSltInfoMonth") public AjaxResult getSltInfoMonth(@RequestBody List list) { @@ -151,7 +151,7 @@ public class SltAgreementInfoController extends BaseController { */ @Log(title = "租赁明细导出", businessType = BusinessType.EXPORT) @PostMapping("/exportLeaseOne") - @RequiresPermissions("sltAgreementInfo:exportLeaseOne:export") + @RequiresPermissions("ndertake:export_1") public void exportLeaseOne(HttpServletResponse response, @RequestBody List list) { List explist = sltAgreementInfoService.getLeaseListOne(list); List leaseInfoList = Convert.toList(LeaseInfo.class, explist); @@ -164,6 +164,7 @@ public class SltAgreementInfoController extends BaseController { */ @Log(title = "租赁明细导出", businessType = BusinessType.EXPORT) @PostMapping("/exportLeaseThree") + @RequiresPermissions("ndertake:export_2") public void exportLeaseThree(HttpServletResponse response, @RequestBody List list) { List explist = sltAgreementInfoService.getLeaseListThree(list); List leaseInfoList = Convert.toList(LeaseInfo.class, explist); @@ -176,7 +177,7 @@ public class SltAgreementInfoController extends BaseController { */ @Log(title = "丢失明细导出", businessType = BusinessType.EXPORT) @PostMapping("/exportLose") - @RequiresPermissions("sltAgreementInfo:exportLose:export") + @RequiresPermissions("device:wh:export") public void exportLose(HttpServletResponse response, @RequestBody List list) { List explist = sltAgreementInfoService.getLoseList(list); List leaseInfoList = Convert.toList(LoseInfo.class, explist); @@ -189,7 +190,7 @@ public class SltAgreementInfoController extends BaseController { */ @Log(title = "维修明细导出", businessType = BusinessType.EXPORT) @PostMapping("/exportRepair") - @RequiresPermissions("sltAgreementInfo:exportRepair:export") + @RequiresPermissions("device:repair:export") public void exportRepair(HttpServletResponse response, @RequestBody List list) { List explist = sltAgreementInfoService.getRepairList(list); List leaseInfoList = Convert.toList(RepairInfo.class, explist); @@ -202,6 +203,7 @@ public class SltAgreementInfoController extends BaseController { */ @Log(title = "报废明细导出", businessType = BusinessType.EXPORT) @PostMapping("/exportScrap") + @RequiresPermissions("device:scrap:export") public void exportScrap(HttpServletResponse response, @RequestBody List list) { List explist = sltAgreementInfoService.getScrapList(list); List leaseInfoList = Convert.toList(ScrapInfo.class, explist); @@ -214,6 +216,7 @@ public class SltAgreementInfoController extends BaseController { */ @Log(title = "预报废明细导出", businessType = BusinessType.EXPORT) @PostMapping("/exportPreScrap") + @RequiresPermissions("device:dai:scrap:export") public void exportPreScrap(HttpServletResponse response, @RequestBody List list) { List explist = sltAgreementInfoService.getPreScrapList(list); List leaseInfoList = Convert.toList(preScrapInfo.class, explist);