diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/qrcoderecord/QrcodeRecordController.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/qrcoderecord/QrcodeRecordController.java index 4223efcfe..86f83c207 100644 --- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/qrcoderecord/QrcodeRecordController.java +++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/qrcoderecord/QrcodeRecordController.java @@ -69,7 +69,7 @@ public class QrcodeRecordController { @GetMapping("/get") @Operation(summary = "获得通用二维码记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qrcode:record:query')") + // @PreAuthorize("@ss.hasPermission('qrcode:record:query')") public CommonResult getRecord(@RequestParam("id") Long id) { QrcodeRecordDO record = qrcodeRecordService.getRecord(id); return success(BeanUtils.toBean(record, QrcodeRecordRespVO.class)); @@ -77,7 +77,7 @@ public class QrcodeRecordController { @GetMapping("/page") @Operation(summary = "获得通用二维码记录分页") - @PreAuthorize("@ss.hasPermission('qrcode:record:query')") + // @PreAuthorize("@ss.hasPermission('qrcode:record:query')") public CommonResult> getRecordPage(@Valid QrcodeRecordPageReqVO pageReqVO) { PageResult pageResult = qrcodeRecordService.getRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, QrcodeRecordRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodePartController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodePartController.java index 9fb7faeee..a74b928a0 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodePartController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodePartController.java @@ -64,7 +64,7 @@ public class AutocodePartController { @GetMapping("/get") @Operation(summary = "获得编码规则组成") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:autocode-part:query')") + // @PreAuthorize("@ss.hasPermission('erp:autocode-part:query')") public CommonResult getAutocodePart(@RequestParam("id") Long id) { AutocodePartDO autocodePart = autocodePartService.getAutocodePart(id); return success(BeanUtils.toBean(autocodePart, AutocodePartRespVO.class)); @@ -72,7 +72,7 @@ public class AutocodePartController { @GetMapping("/page") @Operation(summary = "获得编码规则组成分页") - @PreAuthorize("@ss.hasPermission('erp:autocode-part:query')") + // @PreAuthorize("@ss.hasPermission('erp:autocode-part:query')") public CommonResult> getAutocodePartPage(@Valid AutocodePartPageReqVO pageReqVO) { PageResult pageResult = autocodePartService.getAutocodePartPage(pageReqVO); return success(BeanUtils.toBean(pageResult, AutocodePartRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRecordController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRecordController.java index 2470dd958..f177ab5f1 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRecordController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRecordController.java @@ -68,7 +68,7 @@ public class AutocodeRecordController { @GetMapping("/get") @Operation(summary = "获得编码生成记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:autocode-record:query')") + // @PreAuthorize("@ss.hasPermission('erp:autocode-record:query')") public CommonResult getAutocodeRecord(@RequestParam("id") Long id) { AutocodeRecordDO autocodeRecord = autocodeRecordService.getAutocodeRecord(id); return success(BeanUtils.toBean(autocodeRecord, AutocodeRecordRespVO.class)); @@ -76,7 +76,7 @@ public class AutocodeRecordController { @GetMapping("/page") @Operation(summary = "获得编码生成记录分页") - @PreAuthorize("@ss.hasPermission('erp:autocode-record:query')") + // @PreAuthorize("@ss.hasPermission('erp:autocode-record:query')") public CommonResult> getAutocodeRecordPage(@Valid AutocodeRecordPageReqVO pageReqVO) { PageResult pageResult = autocodeRecordService.getAutocodeRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, AutocodeRecordRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRuleController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRuleController.java index 64ae21f02..a1ba9ce77 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRuleController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRuleController.java @@ -71,7 +71,7 @@ public class AutocodeRuleController { @GetMapping("/get") @Operation(summary = "获得编码规则") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:autocode-rule:query')") + // @PreAuthorize("@ss.hasPermission('erp:autocode-rule:query')") public CommonResult getAutocodeRule(@RequestParam("id") Long id) { AutocodeRuleDO autocodeRule = autocodeRuleService.getAutocodeRule(id); return success(BeanUtils.toBean(autocodeRule, AutocodeRuleRespVO.class)); @@ -79,7 +79,7 @@ public class AutocodeRuleController { @GetMapping("/page") @Operation(summary = "获得编码规则分页") - @PreAuthorize("@ss.hasPermission('erp:autocode-rule:query')") + // @PreAuthorize("@ss.hasPermission('erp:autocode-rule:query')") public CommonResult> getAutocodeRulePage(@Valid AutocodeRulePageReqVO pageReqVO) { PageResult pageResult = autocodeRuleService.getAutocodeRulePage(pageReqVO); return success(BeanUtils.toBean(pageResult, AutocodeRuleRespVO.class)); @@ -113,7 +113,7 @@ public class AutocodeRuleController { @GetMapping("/autocode-part/list-by-rule-id") @Operation(summary = "获得编码规则组成列表") @Parameter(name = "ruleId", description = "规则ID") - @PreAuthorize("@ss.hasPermission('erp:autocode-rule:query')") + // @PreAuthorize("@ss.hasPermission('erp:autocode-rule:query')") public CommonResult> getAutocodePartListByRuleId(@RequestParam("ruleId") Long ruleId) { return success(autocodeRuleService.getAutocodePartListByRuleId(ruleId)); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java index fcc43ed34..245ef580e 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java @@ -78,7 +78,7 @@ public class ErpAccountController { @GetMapping("/get") @Operation(summary = "获得结算账户") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:account:query')") + // @PreAuthorize("@ss.hasPermission('erp:account:query')") public CommonResult getAccount(@RequestParam("id") Long id) { ErpAccountDO account = accountService.getAccount(id); return success(BeanUtils.toBean(account, ErpAccountRespVO.class)); @@ -94,7 +94,7 @@ public class ErpAccountController { @GetMapping("/page") @Operation(summary = "获得结算账户分页") - @PreAuthorize("@ss.hasPermission('erp:account:query')") + // @PreAuthorize("@ss.hasPermission('erp:account:query')") public CommonResult> getAccountPage(@Valid ErpAccountPageReqVO pageReqVO) { PageResult pageResult = accountService.getAccountPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ErpAccountRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java index 58ec2fd30..78cb6800b 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java @@ -92,7 +92,7 @@ public class ErpFinancePaymentController { @GetMapping("/get") @Operation(summary = "获得付款单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:finance-payment:query')") + // @PreAuthorize("@ss.hasPermission('erp:finance-payment:query')") public CommonResult getFinancePayment(@RequestParam("id") Long id) { ErpFinancePaymentDO payment = financePaymentService.getFinancePayment(id); if (payment == null) { @@ -105,7 +105,7 @@ public class ErpFinancePaymentController { @GetMapping("/page") @Operation(summary = "获得付款单分页") - @PreAuthorize("@ss.hasPermission('erp:finance-payment:query')") + // @PreAuthorize("@ss.hasPermission('erp:finance-payment:query')") public CommonResult> getFinancePaymentPage(@Valid ErpFinancePaymentPageReqVO pageReqVO) { PageResult pageResult = financePaymentService.getFinancePaymentPage(pageReqVO); return success(buildFinancePaymentVOPageResult(pageResult)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinanceReceiptController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinanceReceiptController.java index 173f40afe..043bef6e2 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinanceReceiptController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinanceReceiptController.java @@ -92,7 +92,7 @@ public class ErpFinanceReceiptController { @GetMapping("/get") @Operation(summary = "获得收款单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:finance-receipt:query')") + // @PreAuthorize("@ss.hasPermission('erp:finance-receipt:query')") public CommonResult getFinanceReceipt(@RequestParam("id") Long id) { ErpFinanceReceiptDO receipt = financeReceiptService.getFinanceReceipt(id); if (receipt == null) { @@ -105,7 +105,7 @@ public class ErpFinanceReceiptController { @GetMapping("/page") @Operation(summary = "获得收款单分页") - @PreAuthorize("@ss.hasPermission('erp:finance-receipt:query')") + // @PreAuthorize("@ss.hasPermission('erp:finance-receipt:query')") public CommonResult> getFinanceReceiptPage(@Valid ErpFinanceReceiptPageReqVO pageReqVO) { PageResult pageResult = financeReceiptService.getFinanceReceiptPage(pageReqVO); return success(buildFinanceReceiptVOPageResult(pageResult)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldBrandController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldBrandController.java index 587dc4f99..ef7265bdd 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldBrandController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldBrandController.java @@ -71,7 +71,7 @@ public class MoldBrandController { @GetMapping("/get") @Operation(summary = "获得模具型号") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") public CommonResult getMoldBrand(@RequestParam("id") Long id) { MoldBrandRespVO respVO = moldBrandService.getMoldBrandDetail(id); moldBrandService.fillLatestOperateDeviceName(respVO); @@ -79,14 +79,14 @@ public class MoldBrandController { } @GetMapping("/getBrandList") @Operation(summary = "获得模具型号列表") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") public CommonResult> getBrandList(MoldBrandPageReqVO pageReqVO) { PageResult pageResult = moldBrandService.getMoldBrandPage(pageReqVO); return success(pageResult.getList()); } @GetMapping("/page") @Operation(summary = "获得模具型号分页") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") public CommonResult getMoldBrandPage(@Valid MoldBrandPageReqVO pageReqVO) { MoldBrandPageRespVO respVO = moldBrandService.getMoldBrandPageWithStatistics(pageReqVO); if (respVO != null && respVO.getPageResult() != null) { @@ -110,7 +110,7 @@ public class MoldBrandController { @GetMapping("/tree") @Operation(summary = "获得设备类型树") - @PreAuthorize("@ss.hasPermission('mes:device-type:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-type:query')") public CommonResult> getDeviceTypeTree() { List tree = moldBrandService.getMoldBrandTree(); return success(tree); @@ -133,7 +133,7 @@ public class MoldBrandController { @GetMapping("/mold/page") @Operation(summary = "获得模具分页") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") public CommonResult> getMoldPage(@Valid MoldPageReqVO pageReqVO) { return success(moldBrandService.getMoldPage(pageReqVO)); } @@ -141,7 +141,7 @@ public class MoldBrandController { @GetMapping("/mold/list") @Operation(summary = "获得模具列表") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") public CommonResult> getMoldList(@Valid MoldPageReqVO pageReqVO) { List moldDOList = moldBrandService.getMoldList(pageReqVO); return success(moldDOList); @@ -173,7 +173,7 @@ public class MoldBrandController { @GetMapping("/mold/get") @Operation(summary = "获得模具") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") public CommonResult getMold(@RequestParam(value = "id", required = false) Long id, @RequestParam(value = "code", required = false) String code) { return success(moldBrandService.getMold(id, code)); @@ -207,7 +207,7 @@ public class MoldBrandController { @GetMapping("/mold-brand-product/page") @Operation(summary = "获得模具产品分页") @Parameter(name = "brandId", description = "型号ID") - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") public CommonResult> getMoldBrandProductPage(PageParam pageReqVO, @RequestParam("brandId") Long brandId) { PageResult pageResult = moldBrandService.getMoldBrandProductPage(pageReqVO, brandId); @@ -242,7 +242,7 @@ public class MoldBrandController { @GetMapping("/mold-brand-product/get") @Operation(summary = "获得模具产品") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold-brand:query')") public CommonResult getMoldBrandProduct(@RequestParam("id") Long id) { return success(moldBrandService.getMoldBrandProduct(id)); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldController.java index 3d2fffa75..48c819ee8 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldController.java @@ -69,7 +69,7 @@ public class MoldController { @GetMapping("/get") @Operation(summary = "获得模具") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:mold:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold:query')") public CommonResult getMold(@RequestParam("id") Long id) { MoldDO mold = moldService.getMold(id); return success(BeanUtils.toBean(mold, MoldRespVO.class)); @@ -77,7 +77,7 @@ public class MoldController { @GetMapping("/page") @Operation(summary = "获得模具分页") - @PreAuthorize("@ss.hasPermission('erp:mold:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold:query')") public CommonResult> getMoldPage(@Valid MoldPageReqVO pageReqVO) { PageResult pageResult = moldService.getMoldPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MoldRespVO.class)); @@ -107,7 +107,7 @@ public class MoldController { @GetMapping("/getMoldListByStatus") @Operation(summary = "根据状态获得模具列表") @Parameter(name = "id", description = "设备id", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-operate:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-operate:query')") public CommonResult> getMoldListByStatus(@RequestParam("status") Long status) { List moldDO = moldService.getMoldListByStatus(status); return success(moldDO); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldPressureNetRecordController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldPressureNetRecordController.java index 3300392e4..98d58e613 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldPressureNetRecordController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldPressureNetRecordController.java @@ -78,7 +78,7 @@ public class MoldPressureNetRecordController { @GetMapping("/get") @Operation(summary = "获得子模具压网记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:mold-pressure-net-record:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold-pressure-net-record:query')") public CommonResult getMoldPressureNetRecord(@RequestParam("id") Long id) { MoldPressureNetRecordDO record = moldPressureNetRecordService.getMoldPressureNetRecord(id); return success(BeanUtils.toBean(record, MoldPressureNetRecordRespVO.class)); @@ -86,7 +86,7 @@ public class MoldPressureNetRecordController { @GetMapping("/page") @Operation(summary = "获得子模具压网记录分页") - @PreAuthorize("@ss.hasPermission('erp:mold-pressure-net-record:query')") + // @PreAuthorize("@ss.hasPermission('erp:mold-pressure-net-record:query')") public CommonResult> getMoldPressureNetRecordPage(@Valid MoldPressureNetRecordPageReqVO pageReqVO) { PageResult pageResult = moldPressureNetRecordService.getMoldPressureNetRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MoldPressureNetRecordRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/ErpPalletController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/ErpPalletController.java index a9f4c7fa1..545e30ae6 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/ErpPalletController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/ErpPalletController.java @@ -73,7 +73,7 @@ public class ErpPalletController { @GetMapping("/get") @Operation(summary = "获得托盘") @Parameter(name = "id", description = "编号", required = true, example = "1") - @PreAuthorize("@ss.hasPermission('erp:pallet:query')") + // @PreAuthorize("@ss.hasPermission('erp:pallet:query')") public CommonResult getPallet(@RequestParam("id") Long id) { ErpPalletDO pallet = palletService.getPallet(id); return success(buildPalletRespVO(pallet)); @@ -81,7 +81,7 @@ public class ErpPalletController { @GetMapping("/page") @Operation(summary = "获得托盘分页") - @PreAuthorize("@ss.hasPermission('erp:pallet:query')") + // @PreAuthorize("@ss.hasPermission('erp:pallet:query')") public CommonResult getPalletPage(@Valid ErpPalletPageReqVO pageReqVO) { ErpPalletPageRespVO respVO = palletService.getPalletPageWithStatistics(pageReqVO); PageResult doPage = new PageResult<>(BeanUtils.toBean(respVO.getList(), ErpPalletDO.class), respVO.getTotal()); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpPackagingSchemeController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpPackagingSchemeController.java index 6e71b1d22..bb2faccb7 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpPackagingSchemeController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpPackagingSchemeController.java @@ -72,7 +72,7 @@ public class ErpPackagingSchemeController { @GetMapping("/get") @Operation(summary = "获得包装方案") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:packaging-scheme:query')") + // @PreAuthorize("@ss.hasPermission('erp:packaging-scheme:query')") public CommonResult getPackagingScheme(@RequestParam("id") Long id) { ErpPackagingSchemeDO scheme = packagingSchemeService.getPackagingScheme(id); return success(BeanUtils.toBean(scheme, ErpPackagingSchemeRespVO.class)); @@ -80,7 +80,7 @@ public class ErpPackagingSchemeController { @GetMapping("/page") @Operation(summary = "获得包装方案分页") - @PreAuthorize("@ss.hasPermission('erp:packaging-scheme:query')") + // @PreAuthorize("@ss.hasPermission('erp:packaging-scheme:query')") public CommonResult> getPackagingSchemePage(@Valid ErpPackagingSchemePageReqVO pageReqVO) { PageResult pageResult = packagingSchemeService.getPackagingSchemePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ErpPackagingSchemeRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java index a72d06509..8654d9080 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java @@ -68,14 +68,14 @@ public class ErpProductCategoryController { @GetMapping("/get") @Operation(summary = "获得产品分类") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:product-category:query')") + // @PreAuthorize("@ss.hasPermission('erp:product-category:query')") public CommonResult getProductCategory(@RequestParam("id") Long id) { return success(productCategoryService.getProductCategoryResp(id)); } @GetMapping("/list") @Operation(summary = "获得产品分类列表") - @PreAuthorize("@ss.hasPermission('erp:product-category:query')") + // @PreAuthorize("@ss.hasPermission('erp:product-category:query')") public CommonResult> getProductCategoryList(@Valid ErpProductCategoryListReqVO listReqVO) { List list = productCategoryService.getProductCategoryList(listReqVO); return success(BeanUtils.toBean(list, ErpProductCategoryRespVO.class)); @@ -83,7 +83,7 @@ public class ErpProductCategoryController { @GetMapping("/group-tree") @Operation(summary = "按类型分组获得产品分类树") - @PreAuthorize("@ss.hasPermission('erp:product-category:query')") + // @PreAuthorize("@ss.hasPermission('erp:product-category:query')") public CommonResult> getProductCategoryGroupTree(@Valid ErpProductCategoryListReqVO listReqVO) { List list = productCategoryService.getProductCategoryList(listReqVO); Map> typeMap = new LinkedHashMap<>(); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java index 8d164f472..39e256190 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java @@ -104,7 +104,7 @@ public class ErpProductController { @GetMapping("/get") @Operation(summary = "获得产品") - @PreAuthorize("@ss.hasPermission('erp:product:query')") + // @PreAuthorize("@ss.hasPermission('erp:product:query')") public CommonResult getProduct(@RequestParam(value = "id", required = false) Long id, @RequestParam(value = "code", required = false) String code) { return success(productService.getProduct(id, code)); @@ -120,7 +120,7 @@ public class ErpProductController { @GetMapping("/page") @Operation(summary = "获得产品分页") - @PreAuthorize("@ss.hasPermission('erp:product:query')") + // @PreAuthorize("@ss.hasPermission('erp:product:query')") public CommonResult> getProductPage(@Valid ErpProductPageReqVO pageReqVO) { return success(productService.getProductVOPage(pageReqVO)); } diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java index 6d98252cb..c3da8f980 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java @@ -82,7 +82,7 @@ public class ErpProductUnitController { @GetMapping("/get") @Operation(summary = "获得产品单位") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:product-unit:query')") + // @PreAuthorize("@ss.hasPermission('erp:product-unit:query')") public CommonResult getProductUnit(@RequestParam("id") Long id) { ErpProductUnitDO productUnit = productUnitService.getProductUnit(id); return success(BeanUtils.toBean(productUnit, ErpProductUnitRespVO.class)); @@ -90,7 +90,7 @@ public class ErpProductUnitController { @GetMapping("/page") @Operation(summary = "获得产品单位分页") - @PreAuthorize("@ss.hasPermission('erp:product-unit:query')") + // @PreAuthorize("@ss.hasPermission('erp:product-unit:query')") public CommonResult> getProductUnitPage(@Valid ErpProductUnitPageReqVO pageReqVO) { PageResult pageResult = productUnitService.getProductUnitPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ErpProductUnitRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/productdevicerel/ProductDeviceRelController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/productdevicerel/ProductDeviceRelController.java index df1050649..b1a2bc7f5 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/productdevicerel/ProductDeviceRelController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/productdevicerel/ProductDeviceRelController.java @@ -66,7 +66,7 @@ public class ProductDeviceRelController { @GetMapping("/get") @Operation(summary = "获得产品-设备关联") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:product-device-rel:query')") + // @PreAuthorize("@ss.hasPermission('erp:product-device-rel:query')") public CommonResult getProductDeviceRel(@RequestParam("id") Long id) { ProductDeviceRelDO productDeviceRel = productDeviceRelService.getProductDeviceRel(id); return success(BeanUtils.toBean(productDeviceRel, ProductDeviceRelRespVO.class)); @@ -74,7 +74,7 @@ public class ProductDeviceRelController { @GetMapping("/page") @Operation(summary = "获得产品-设备关联分页") - @PreAuthorize("@ss.hasPermission('erp:product-device-rel:query')") + // @PreAuthorize("@ss.hasPermission('erp:product-device-rel:query')") public CommonResult> getProductDeviceRelPage(@Valid ProductDeviceRelPageReqVO pageReqVO) { PageResult pageResult = productDeviceRelService.getProductDeviceRelPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProductDeviceRelRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/productmoldrel/ProductMoldRelController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/productmoldrel/ProductMoldRelController.java index 4975f5cb5..3fd89968c 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/productmoldrel/ProductMoldRelController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/productmoldrel/ProductMoldRelController.java @@ -65,7 +65,7 @@ public class ProductMoldRelController { @GetMapping("/get") @Operation(summary = "获得产品-模具关联") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:product-mold-rel:query')") + // @PreAuthorize("@ss.hasPermission('erp:product-mold-rel:query')") public CommonResult getProductMoldRel(@RequestParam("id") Long id) { ProductMoldRelDO productMoldRel = productMoldRelService.getProductMoldRel(id); return success(BeanUtils.toBean(productMoldRel, ProductMoldRelRespVO.class)); @@ -73,7 +73,7 @@ public class ProductMoldRelController { @GetMapping("/page") @Operation(summary = "获得产品-模具关联分页") - @PreAuthorize("@ss.hasPermission('erp:product-mold-rel:query')") + // @PreAuthorize("@ss.hasPermission('erp:product-mold-rel:query')") public CommonResult> getProductMoldRelPage(@Valid ProductMoldRelPageReqVO pageReqVO) { PageResult pageResult = productMoldRelService.getProductMoldRelPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProductMoldRelRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java index 4aa485a72..1c55f4eb8 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java @@ -96,7 +96,7 @@ public class ErpPurchaseInController { @GetMapping("/get") @Operation(summary = "获得采购入库") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:purchase-in:query')") + // @PreAuthorize("@ss.hasPermission('erp:purchase-in:query')") public CommonResult getPurchaseIn(@RequestParam("id") Long id) { ErpPurchaseInDO purchaseIn = purchaseInService.getPurchaseIn(id); if (purchaseIn == null) { @@ -116,7 +116,7 @@ public class ErpPurchaseInController { @GetMapping("/page") @Operation(summary = "获得采购入库分页") - @PreAuthorize("@ss.hasPermission('erp:purchase-in:query')") + // @PreAuthorize("@ss.hasPermission('erp:purchase-in:query')") public CommonResult> getPurchaseInPage(@Valid ErpPurchaseInPageReqVO pageReqVO) { PageResult pageResult = purchaseInService.getPurchaseInPage(pageReqVO); return success(buildPurchaseInVOPageResult(pageResult)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java index c3d36e97b..b26f38305 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java @@ -95,7 +95,7 @@ public class ErpPurchaseOrderController { @GetMapping("/get") @Operation(summary = "获得采购订单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:purchase-order:query')") + // @PreAuthorize("@ss.hasPermission('erp:purchase-order:query')") public CommonResult getPurchaseOrder(@RequestParam("id") Long id) { ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.getPurchaseOrder(id); if (purchaseOrder == null) { @@ -115,7 +115,7 @@ public class ErpPurchaseOrderController { @GetMapping("/page") @Operation(summary = "获得采购订单分页") - @PreAuthorize("@ss.hasPermission('erp:purchase-order:query')") + // @PreAuthorize("@ss.hasPermission('erp:purchase-order:query')") public CommonResult> getPurchaseOrderPage(@Valid ErpPurchaseOrderPageReqVO pageReqVO) { PageResult pageResult = purchaseOrderService.getPurchaseOrderPage(pageReqVO); return success(buildPurchaseOrderVOPageResult(pageResult)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java index e72b17552..3d300adb4 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java @@ -96,7 +96,7 @@ public class ErpPurchaseReturnController { @GetMapping("/get") @Operation(summary = "获得采购退货") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:purchase-return:query')") + // @PreAuthorize("@ss.hasPermission('erp:purchase-return:query')") public CommonResult getPurchaseReturn(@RequestParam("id") Long id) { ErpPurchaseReturnDO purchaseReturn = purchaseReturnService.getPurchaseReturn(id); if (purchaseReturn == null) { @@ -116,7 +116,7 @@ public class ErpPurchaseReturnController { @GetMapping("/page") @Operation(summary = "获得采购退货分页") - @PreAuthorize("@ss.hasPermission('erp:purchase-return:query')") + // @PreAuthorize("@ss.hasPermission('erp:purchase-return:query')") public CommonResult> getPurchaseReturnPage(@Valid ErpPurchaseReturnPageReqVO pageReqVO) { PageResult pageResult = purchaseReturnService.getPurchaseReturnPage(pageReqVO); return success(buildPurchaseReturnVOPageResult(pageResult)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java index affc0cadb..3519044a2 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java @@ -65,7 +65,7 @@ public class ErpSupplierController { @GetMapping("/get") @Operation(summary = "获得供应商") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:supplier:query')") + // @PreAuthorize("@ss.hasPermission('erp:supplier:query')") public CommonResult getSupplier(@RequestParam("id") Long id) { ErpSupplierDO supplier = supplierService.getSupplier(id); return success(BeanUtils.toBean(supplier, ErpSupplierRespVO.class)); @@ -73,7 +73,7 @@ public class ErpSupplierController { @GetMapping("/page") @Operation(summary = "获得供应商分页") - @PreAuthorize("@ss.hasPermission('erp:supplier:query')") + // @PreAuthorize("@ss.hasPermission('erp:supplier:query')") public CommonResult> getSupplierPage(@Valid ErpSupplierPageReqVO pageReqVO) { PageResult pageResult = supplierService.getSupplierPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ErpSupplierRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpCustomerController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpCustomerController.java index 5a1c4a891..a34a4a459 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpCustomerController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpCustomerController.java @@ -65,7 +65,7 @@ public class ErpCustomerController { @GetMapping("/get") @Operation(summary = "获得客户") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:customer:query')") + // @PreAuthorize("@ss.hasPermission('erp:customer:query')") public CommonResult getCustomer(@RequestParam("id") Long id) { ErpCustomerDO customer = customerService.getCustomer(id); return success(BeanUtils.toBean(customer, ErpCustomerRespVO.class)); @@ -73,7 +73,7 @@ public class ErpCustomerController { @GetMapping("/page") @Operation(summary = "获得客户分页") - @PreAuthorize("@ss.hasPermission('erp:customer:query')") + // @PreAuthorize("@ss.hasPermission('erp:customer:query')") public CommonResult> getCustomerPage(@Valid ErpCustomerPageReqVO pageReqVO) { PageResult pageResult = customerService.getCustomerPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ErpCustomerRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java index 12fb1c3ed..90a5069de 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java @@ -95,7 +95,7 @@ public class ErpSaleOrderController { @GetMapping("/get") @Operation(summary = "获得销售订单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:sale-out:query')") + // @PreAuthorize("@ss.hasPermission('erp:sale-out:query')") public CommonResult getSaleOrder(@RequestParam("id") Long id) { ErpSaleOrderDO saleOrder = saleOrderService.getSaleOrder(id); if (saleOrder == null) { @@ -115,7 +115,7 @@ public class ErpSaleOrderController { @GetMapping("/page") @Operation(summary = "获得销售订单分页") - @PreAuthorize("@ss.hasPermission('erp:sale-out:query')") + // @PreAuthorize("@ss.hasPermission('erp:sale-out:query')") public CommonResult> getSaleOrderPage(@Valid ErpSaleOrderPageReqVO pageReqVO) { PageResult pageResult = saleOrderService.getSaleOrderPage(pageReqVO); return success(buildSaleOrderVOPageResult(pageResult)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOutController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOutController.java index fb3ce9727..11a2fed45 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOutController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOutController.java @@ -96,7 +96,7 @@ public class ErpSaleOutController { @GetMapping("/get") @Operation(summary = "获得销售出库") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:sale-out:query')") + // @PreAuthorize("@ss.hasPermission('erp:sale-out:query')") public CommonResult getSaleOut(@RequestParam("id") Long id) { ErpSaleOutDO saleOut = saleOutService.getSaleOut(id); if (saleOut == null) { @@ -116,7 +116,7 @@ public class ErpSaleOutController { @GetMapping("/page") @Operation(summary = "获得销售出库分页") - @PreAuthorize("@ss.hasPermission('erp:sale-out:query')") + // @PreAuthorize("@ss.hasPermission('erp:sale-out:query')") public CommonResult> getSaleOutPage(@Valid ErpSaleOutPageReqVO pageReqVO) { PageResult pageResult = saleOutService.getSaleOutPage(pageReqVO); return success(buildSaleOutVOPageResult(pageResult)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleReturnController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleReturnController.java index b3d7837d4..dd35ec975 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleReturnController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleReturnController.java @@ -96,7 +96,7 @@ public class ErpSaleReturnController { @GetMapping("/get") @Operation(summary = "获得销售退货") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:sale-return:query')") + // @PreAuthorize("@ss.hasPermission('erp:sale-return:query')") public CommonResult getSaleReturn(@RequestParam("id") Long id) { ErpSaleReturnDO saleReturn = saleReturnService.getSaleReturn(id); if (saleReturn == null) { @@ -116,7 +116,7 @@ public class ErpSaleReturnController { @GetMapping("/page") @Operation(summary = "获得销售退货分页") - @PreAuthorize("@ss.hasPermission('erp:sale-return:query')") + // @PreAuthorize("@ss.hasPermission('erp:sale-return:query')") public CommonResult> getSaleReturnPage(@Valid ErpSaleReturnPageReqVO pageReqVO) { PageResult pageResult = saleReturnService.getSaleReturnPage(pageReqVO); return success(buildSaleReturnVOPageResult(pageResult)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCheckController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCheckController.java index c66ab5510..84c92b704 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCheckController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCheckController.java @@ -120,7 +120,7 @@ public class ErpStockCheckController { @GetMapping("/approve-record-list") @Operation(summary = "获得库存盘点单审核记录") - @PreAuthorize("@ss.hasPermission('erp:stock-check:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-check:query')") public CommonResult> getApproveRecordList(@RequestParam("id") Long id) { return success(buildApproveRecordRespList(stockCheckService.getStockCheckApproveRecordList(id))); } @@ -151,7 +151,7 @@ public class ErpStockCheckController { @GetMapping("/get") @Operation(summary = "获得库存盘点单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:stock-check:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-check:query')") public CommonResult getStockCheck(@RequestParam("id") Long id) { ErpStockCheckDO stockCheck = stockCheckService.getStockCheck(id); if (stockCheck == null) { @@ -164,7 +164,7 @@ public class ErpStockCheckController { @GetMapping("/page") @Operation(summary = "获得库存盘点单分页") - @PreAuthorize("@ss.hasPermission('erp:stock-check:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-check:query')") public CommonResult getStockCheckPage(@Valid ErpStockCheckPageReqVO pageReqVO) { ErpStockCheckPageRespVO respVO = stockCheckService.getStockCheckPageWithStatistics(pageReqVO); PageResult doPage = new PageResult<>(BeanUtils.toBean(respVO.getList(), ErpStockCheckDO.class), respVO.getTotal()); @@ -187,7 +187,7 @@ public class ErpStockCheckController { @GetMapping("/record-page") @Operation(summary = "获得库存盘点记录分页") - @PreAuthorize("@ss.hasPermission('erp:stock-check:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-check:query')") public CommonResult> getStockCheckRecordPage( @Valid ErpStockCheckRecordPageReqVO pageReqVO) { return success(buildStockCheckRecordVOPageResult(stockCheckService.getStockCheckRecordPage(pageReqVO))); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockController.java index 199d04a0e..825c1825e 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockController.java @@ -108,7 +108,7 @@ public class ErpStockController { @GetMapping("/page") @Operation(summary = "获得产品库存分页") - @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('erp:stock:query')") + // @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('erp:stock:query')") public CommonResult> getStockPage(@Valid ErpStockPageReqVO pageReqVO) { ErpStockPageReqVO queryReqVO = BeanUtils.toBean(pageReqVO, ErpStockPageReqVO.class); queryReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java index 3b09b5246..0937fa4f7 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java @@ -147,7 +147,7 @@ public class ErpStockInController { @GetMapping("/approve-record-list") @Operation(summary = "获得其它入库单审核记录") - @PreAuthorize("@ss.hasPermission('erp:stock-in:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-in:query')") public CommonResult> getApproveRecordList(@RequestParam("id") Long id) { return success(buildApproveRecordRespList(stockInService.getStockInApproveRecordList(id))); } @@ -164,7 +164,7 @@ public class ErpStockInController { @GetMapping("/get") @Operation(summary = "获得其它入库单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:stock-in:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-in:query')") public CommonResult getStockIn(@RequestParam("id") Long id) { ErpStockInDO stockIn = stockInService.getStockIn(id); if (stockIn == null) { @@ -177,7 +177,7 @@ public class ErpStockInController { @GetMapping("/page") @Operation(summary = "获得其它入库单分页") - @PreAuthorize("@ss.hasPermission('erp:stock-in:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-in:query')") public CommonResult getStockInPage(@Valid ErpStockInPageReqVO pageReqVO) { fillPageReqDefault(pageReqVO); ErpStockInPageRespVO respVO = stockInService.getStockInPageWithStatistics(pageReqVO); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockMoveController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockMoveController.java index ab9038e9d..14be6604b 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockMoveController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockMoveController.java @@ -126,14 +126,14 @@ public class ErpStockMoveController { @GetMapping("/approve-record-list") @Operation(summary = "获得库存调拨单审核记录") - @PreAuthorize("@ss.hasPermission('erp:stock-move:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-move:query')") public CommonResult> getApproveRecordList(@RequestParam("id") Long id) { return success(buildApproveRecordRespList(stockMoveService.getStockMoveApproveRecordList(id))); } @GetMapping("/product-stock-list") @Operation(summary = "获得产品仓库库区库存列表") - @PreAuthorize("@ss.hasPermission('erp:stock-move:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-move:query')") public CommonResult> getProductStockList( @RequestParam("productId") Long productId, @RequestParam(value = "warehouseId", required = false) Long warehouseId) { @@ -154,7 +154,7 @@ public class ErpStockMoveController { @GetMapping("/get") @Operation(summary = "获得库存调拨单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:stock-move:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-move:query')") public CommonResult getStockMove(@RequestParam("id") Long id) { ErpStockMoveDO stockMove = stockMoveService.getStockMove(id); if (stockMove == null) { @@ -167,7 +167,7 @@ public class ErpStockMoveController { @GetMapping("/page") @Operation(summary = "获得库存调拨单分页") - @PreAuthorize("@ss.hasPermission('erp:stock-move:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-move:query')") public CommonResult getStockMovePage(@Valid ErpStockMovePageReqVO pageReqVO) { ErpStockMovePageRespVO respVO = stockMoveService.getStockMovePageWithStatistics(pageReqVO); PageResult doPage = new PageResult<>(BeanUtils.toBean(respVO.getList(), ErpStockMoveDO.class), respVO.getTotal()); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockOutController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockOutController.java index 399b23561..6394c1f1c 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockOutController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockOutController.java @@ -150,7 +150,7 @@ public class ErpStockOutController { @GetMapping("/approve-record-list") @Operation(summary = "获得其它出库单审核记录") - @PreAuthorize("@ss.hasPermission('erp:stock-out:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-out:query')") public CommonResult> getApproveRecordList(@RequestParam("id") Long id) { return success(buildApproveRecordRespList(stockOutService.getStockOutApproveRecordList(id))); } @@ -177,7 +177,7 @@ public class ErpStockOutController { @GetMapping("/get") @Operation(summary = "获得其它出库单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:stock-out:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-out:query')") public CommonResult getStockOut(@RequestParam("id") Long id) { ErpStockOutDO stockOut = stockOutService.getStockOut(id); if (stockOut == null) { @@ -192,7 +192,7 @@ public class ErpStockOutController { @GetMapping("/page") @Operation(summary = "获得其它出库单分页") - @PreAuthorize("@ss.hasPermission('erp:stock-out:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-out:query')") public CommonResult getStockOutPage(@Valid ErpStockOutPageReqVO pageReqVO) { fillPageReqDefault(pageReqVO); applyItemFilter(pageReqVO); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockRecordController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockRecordController.java index 636116012..9b4c35d31 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockRecordController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockRecordController.java @@ -71,7 +71,7 @@ public class ErpStockRecordController { @GetMapping("/get") @Operation(summary = "获得产品库存明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:stock-record:query')") + // @PreAuthorize("@ss.hasPermission('erp:stock-record:query')") public CommonResult getStockRecord(@RequestParam("id") Long id) { ErpStockRecordDO stockRecord = stockRecordService.getStockRecord(id); return success(buildStockRecordRespVO(stockRecord)); @@ -79,7 +79,7 @@ public class ErpStockRecordController { @GetMapping("/page") @Operation(summary = "获得产品库存明细分页") - @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('erp:stock-record:query')") + // @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('erp:stock-record:query')") public CommonResult> getStockRecordPage(@Valid ErpStockRecordPageReqVO pageReqVO) { PageResult pageResult = stockRecordService.getStockRecordPage(pageReqVO); return success(buildStockRecrodVOPageResult(pageResult)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseController.java index d87830a28..4ad6de8e0 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseController.java @@ -84,14 +84,14 @@ public class ErpWarehouseController { @GetMapping("/get") @Operation(summary = "获得仓库") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:warehouse:query')") + // @PreAuthorize("@ss.hasPermission('erp:warehouse:query')") public CommonResult getWarehouse(@RequestParam("id") Long id) { return success(warehouseService.getWarehouseDetail(id)); } @GetMapping("/page") @Operation(summary = "获得仓库分页") - @PreAuthorize("@ss.hasPermission('erp:warehouse:query')") + // @PreAuthorize("@ss.hasPermission('erp:warehouse:query')") public CommonResult> getWarehousePage(@Valid ErpWarehousePageReqVO pageReqVO) { PageResult pageResult = warehouseService.getWarehousePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ErpWarehouseRespVO.class)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/warehousearea/WarehouseAreaController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/warehousearea/WarehouseAreaController.java index 0acf7573b..5b0728f86 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/warehousearea/WarehouseAreaController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/warehousearea/WarehouseAreaController.java @@ -77,7 +77,7 @@ public class WarehouseAreaController { @GetMapping("/get") @Operation(summary = "获得ERP 库区信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:warehouse-area:query')") + // @PreAuthorize("@ss.hasPermission('erp:warehouse-area:query')") public CommonResult getWarehouseArea(@RequestParam("id") Long id) { WarehouseAreaDO warehouseArea = warehouseAreaService.getWarehouseArea(id); WarehouseAreaRespVO respVO = BeanUtils.toBean(warehouseArea, WarehouseAreaRespVO.class); @@ -88,7 +88,7 @@ public class WarehouseAreaController { @GetMapping("/page") @Operation(summary = "获得ERP 库区信息分页") - @PreAuthorize("@ss.hasPermission('erp:warehouse-area:query')") + // @PreAuthorize("@ss.hasPermission('erp:warehouse-area:query')") public CommonResult> getWarehouseAreaPage(@Valid WarehouseAreaPageReqVO pageReqVO) { PageResult pageResult = warehouseAreaService.getWarehouseAreaPage(pageReqVO); PageResult result = BeanUtils.toBean(pageResult, WarehouseAreaRespVO.class); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/warehouselocation/WarehouseLocationController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/warehouselocation/WarehouseLocationController.java index cf58dbf37..b1bdd39b3 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/warehouselocation/WarehouseLocationController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/warehouselocation/WarehouseLocationController.java @@ -67,7 +67,7 @@ public class WarehouseLocationController { @GetMapping("/get") @Operation(summary = "获得ERP 库位信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:warehouse-location:query')") + // @PreAuthorize("@ss.hasPermission('erp:warehouse-location:query')") public CommonResult getWarehouseLocation(@RequestParam("id") Long id) { WarehouseLocationDO warehouseLocation = warehouseLocationService.getWarehouseLocation(id); return success(BeanUtils.toBean(warehouseLocation, WarehouseLocationRespVO.class)); @@ -75,7 +75,7 @@ public class WarehouseLocationController { @GetMapping("/page") @Operation(summary = "获得ERP 库位信息分页") - @PreAuthorize("@ss.hasPermission('erp:warehouse-location:query')") + // @PreAuthorize("@ss.hasPermission('erp:warehouse-location:query')") public CommonResult> getWarehouseLocationPage(@Valid WarehouseLocationPageReqVO pageReqVO) { PageResult pageResult = warehouseLocationService.getWarehouseLocationPage(pageReqVO); return success(BeanUtils.toBean(pageResult, WarehouseLocationRespVO.class)); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java index 6889d03ca..728225a51 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java @@ -64,7 +64,7 @@ public class CodegenController { @GetMapping("/table/list") @Operation(summary = "获得表定义列表") @Parameter(name = "dataSourceConfigId", description = "数据源配置的编号", required = true, example = "1") - @PreAuthorize("@ss.hasPermission('infra:codegen:query')") + // @PreAuthorize("@ss.hasPermission('infra:codegen:query')") public CommonResult> getCodegenTableList(@RequestParam(value = "dataSourceConfigId") Long dataSourceConfigId) { List list = codegenService.getCodegenTableList(dataSourceConfigId); return success(BeanUtils.toBean(list, CodegenTableRespVO.class)); @@ -72,7 +72,7 @@ public class CodegenController { @GetMapping("/table/page") @Operation(summary = "获得表定义分页") - @PreAuthorize("@ss.hasPermission('infra:codegen:query')") + // @PreAuthorize("@ss.hasPermission('infra:codegen:query')") public CommonResult> getCodegenTablePage(@Valid CodegenTablePageReqVO pageReqVO) { PageResult pageResult = codegenService.getCodegenTablePage(pageReqVO); return success(BeanUtils.toBean(pageResult, CodegenTableRespVO.class)); @@ -81,7 +81,7 @@ public class CodegenController { @GetMapping("/detail") @Operation(summary = "获得表和字段的明细") @Parameter(name = "tableId", description = "表编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('infra:codegen:query')") + // @PreAuthorize("@ss.hasPermission('infra:codegen:query')") public CommonResult getCodegenDetail(@RequestParam("tableId") Long tableId) { CodegenTableDO table = codegenService.getCodegenTable(tableId); List columns = codegenService.getCodegenColumnListByTableId(tableId); @@ -91,7 +91,7 @@ public class CodegenController { @Operation(summary = "基于数据库的表结构，创建代码生成器的表和字段定义") @PostMapping("/create-list") - @PreAuthorize("@ss.hasPermission('infra:codegen:create')") + // @PreAuthorize("@ss.hasPermission('infra:codegen:create')") public CommonResult> createCodegenList(@Valid @RequestBody CodegenCreateListReqVO reqVO) { return success(codegenService.createCodegenList(getLoginUserId(), reqVO)); } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java index 56216621d..7dda1be81 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java @@ -63,7 +63,7 @@ public class ConfigController { @GetMapping(value = "/get") @Operation(summary = "获得参数配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('infra:config:query')") + // @PreAuthorize("@ss.hasPermission('infra:config:query')") public CommonResult getConfig(@RequestParam("id") Long id) { return success(ConfigConvert.INSTANCE.convert(configService.getConfig(id))); } @@ -84,7 +84,7 @@ public class ConfigController { @GetMapping("/page") @Operation(summary = "获取参数配置分页") - @PreAuthorize("@ss.hasPermission('infra:config:query')") + // @PreAuthorize("@ss.hasPermission('infra:config:query')") public CommonResult> getConfigPage(@Valid ConfigPageReqVO pageReqVO) { PageResult page = configService.getConfigPage(pageReqVO); return success(ConfigConvert.INSTANCE.convertPage(page)); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java index 85a12279e..6f5f2337e 100755 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java @@ -55,7 +55,7 @@ public class DataSourceConfigController { @GetMapping("/get") @Operation(summary = "获得数据源配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('infra:data-source-config:query')") + // @PreAuthorize("@ss.hasPermission('infra:data-source-config:query')") public CommonResult getDataSourceConfig(@RequestParam("id") Long id) { DataSourceConfigDO config = dataSourceConfigService.getDataSourceConfig(id); return success(BeanUtils.toBean(config, DataSourceConfigRespVO.class)); @@ -63,7 +63,7 @@ public class DataSourceConfigController { @GetMapping("/list") @Operation(summary = "获得数据源配置列表") - @PreAuthorize("@ss.hasPermission('infra:data-source-config:query')") + // @PreAuthorize("@ss.hasPermission('infra:data-source-config:query')") public CommonResult> getDataSourceConfigList() { List list = dataSourceConfigService.getDataSourceConfigList(); return success(BeanUtils.toBean(list, DataSourceConfigRespVO.class)); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java index 0492ee500..7da2638e6 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java @@ -63,7 +63,7 @@ public class Demo01ContactController { @GetMapping("/get") @Operation(summary = "获得示例联系人") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('infra:demo01-contact:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo01-contact:query')") public CommonResult getDemo01Contact(@RequestParam("id") Long id) { Demo01ContactDO demo01Contact = demo01ContactService.getDemo01Contact(id); return success(BeanUtils.toBean(demo01Contact, Demo01ContactRespVO.class)); @@ -71,7 +71,7 @@ public class Demo01ContactController { @GetMapping("/page") @Operation(summary = "获得示例联系人分页") - @PreAuthorize("@ss.hasPermission('infra:demo01-contact:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo01-contact:query')") public CommonResult> getDemo01ContactPage(@Valid Demo01ContactPageReqVO pageReqVO) { PageResult pageResult = demo01ContactService.getDemo01ContactPage(pageReqVO); return success(BeanUtils.toBean(pageResult, Demo01ContactRespVO.class)); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java index 7cc35b71e..e2696045b 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java @@ -61,7 +61,7 @@ public class Demo02CategoryController { @GetMapping("/get") @Operation(summary = "获得示例分类") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('infra:demo02-category:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo02-category:query')") public CommonResult getDemo02Category(@RequestParam("id") Long id) { Demo02CategoryDO demo02Category = demo02CategoryService.getDemo02Category(id); return success(BeanUtils.toBean(demo02Category, Demo02CategoryRespVO.class)); @@ -69,7 +69,7 @@ public class Demo02CategoryController { @GetMapping("/list") @Operation(summary = "获得示例分类列表") - @PreAuthorize("@ss.hasPermission('infra:demo02-category:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo02-category:query')") public CommonResult> getDemo02CategoryList(@Valid Demo02CategoryListReqVO listReqVO) { List list = demo02CategoryService.getDemo02CategoryList(listReqVO); return success(BeanUtils.toBean(list, Demo02CategoryRespVO.class)); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java index 1a7375ffe..807044eae 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java @@ -65,7 +65,7 @@ public class Demo03StudentController { @GetMapping("/get") @Operation(summary = "获得学生") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") public CommonResult getDemo03Student(@RequestParam("id") Long id) { Demo03StudentDO demo03Student = demo03StudentService.getDemo03Student(id); return success(BeanUtils.toBean(demo03Student, Demo03StudentRespVO.class)); @@ -73,7 +73,7 @@ public class Demo03StudentController { @GetMapping("/page") @Operation(summary = "获得学生分页") - @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") public CommonResult> getDemo03StudentPage(@Valid Demo03StudentPageReqVO pageReqVO) { PageResult pageResult = demo03StudentService.getDemo03StudentPage(pageReqVO); return success(BeanUtils.toBean(pageResult, Demo03StudentRespVO.class)); @@ -97,7 +97,7 @@ public class Demo03StudentController { @GetMapping("/demo03-course/page") @Operation(summary = "获得学生课程分页") @Parameter(name = "studentId", description = "学生编号") - @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") public CommonResult> getDemo03CoursePage(PageParam pageReqVO, @RequestParam("studentId") Long studentId) { return success(demo03StudentService.getDemo03CoursePage(pageReqVO, studentId)); @@ -130,7 +130,7 @@ public class Demo03StudentController { @GetMapping("/demo03-course/get") @Operation(summary = "获得学生课程") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") public CommonResult getDemo03Course(@RequestParam("id") Long id) { return success(demo03StudentService.getDemo03Course(id)); } @@ -138,7 +138,7 @@ public class Demo03StudentController { @GetMapping("/demo03-course/list-by-student-id") @Operation(summary = "获得学生课程列表") @Parameter(name = "studentId", description = "学生编号") - @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") public CommonResult> getDemo03CourseListByStudentId(@RequestParam("studentId") Long studentId) { return success(demo03StudentService.getDemo03CourseListByStudentId(studentId)); } @@ -148,7 +148,7 @@ public class Demo03StudentController { @GetMapping("/demo03-grade/page") @Operation(summary = "获得学生班级分页") @Parameter(name = "studentId", description = "学生编号") - @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") public CommonResult> getDemo03GradePage(PageParam pageReqVO, @RequestParam("studentId") Long studentId) { return success(demo03StudentService.getDemo03GradePage(pageReqVO, studentId)); @@ -181,7 +181,7 @@ public class Demo03StudentController { @GetMapping("/demo03-grade/get") @Operation(summary = "获得学生班级") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") + // @PreAuthorize("@ss.hasPermission('infra:demo03-student:query')") public CommonResult getDemo03Grade(@RequestParam("id") Long id) { return success(demo03StudentService.getDemo03Grade(id)); } diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java index eb51f08c3..454f95f29 100755 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java @@ -64,7 +64,7 @@ public class FileConfigController { @GetMapping("/get") @Operation(summary = "获得文件配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('infra:file-config:query')") + // @PreAuthorize("@ss.hasPermission('infra:file-config:query')") public CommonResult getFileConfig(@RequestParam("id") Long id) { FileConfigDO config = fileConfigService.getFileConfig(id); return success(BeanUtils.toBean(config, FileConfigRespVO.class)); @@ -72,7 +72,7 @@ public class FileConfigController { @GetMapping("/page") @Operation(summary = "获得文件配置分页") - @PreAuthorize("@ss.hasPermission('infra:file-config:query')") + // @PreAuthorize("@ss.hasPermission('infra:file-config:query')") public CommonResult> getFileConfigPage(@Valid FileConfigPageReqVO pageVO) { PageResult pageResult = fileConfigService.getFileConfigPage(pageVO); return success(BeanUtils.toBean(pageResult, FileConfigRespVO.class)); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java index a529e4818..767126653 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java @@ -96,7 +96,7 @@ public class FileController { @GetMapping("/page") @Operation(summary = "获得文件分页") - @PreAuthorize("@ss.hasPermission('infra:file:query')") + // @PreAuthorize("@ss.hasPermission('infra:file:query')") public CommonResult> getFilePage(@Valid FilePageReqVO pageVO) { PageResult pageResult = fileService.getFilePage(pageVO); return success(BeanUtils.toBean(pageResult, FileRespVO.class)); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java index 9b01ce771..d606da973 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java @@ -101,7 +101,7 @@ public class JobController { @GetMapping("/get") @Operation(summary = "获得定时任务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('infra:job:query')") + // @PreAuthorize("@ss.hasPermission('infra:job:query')") public CommonResult getJob(@RequestParam("id") Long id) { JobDO job = jobService.getJob(id); return success(BeanUtils.toBean(job, JobRespVO.class)); @@ -109,7 +109,7 @@ public class JobController { @GetMapping("/page") @Operation(summary = "获得定时任务分页") - @PreAuthorize("@ss.hasPermission('infra:job:query')") + // @PreAuthorize("@ss.hasPermission('infra:job:query')") public CommonResult> getJobPage(@Valid JobPageReqVO pageVO) { PageResult pageResult = jobService.getJobPage(pageVO); return success(BeanUtils.toBean(pageResult, JobRespVO.class)); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java index afe513a7f..32ed6a3d3 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java @@ -41,7 +41,7 @@ public class JobLogController { @GetMapping("/get") @Operation(summary = "获得定时任务日志") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('infra:job:query')") + // @PreAuthorize("@ss.hasPermission('infra:job:query')") public CommonResult getJobLog(@RequestParam("id") Long id) { JobLogDO jobLog = jobLogService.getJobLog(id); return success(BeanUtils.toBean(jobLog, JobLogRespVO.class)); @@ -49,7 +49,7 @@ public class JobLogController { @GetMapping("/page") @Operation(summary = "获得定时任务日志分页") - @PreAuthorize("@ss.hasPermission('infra:job:query')") + // @PreAuthorize("@ss.hasPermission('infra:job:query')") public CommonResult> getJobLogPage(@Valid JobLogPageReqVO pageVO) { PageResult pageResult = jobLogService.getJobLogPage(pageVO); return success(BeanUtils.toBean(pageResult, JobLogRespVO.class)); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java index 81b0ee9d8..092cb30f5 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java @@ -38,7 +38,7 @@ public class ApiAccessLogController { @GetMapping("/page") @Operation(summary = "获得API 访问日志分页") - @PreAuthorize("@ss.hasPermission('infra:api-access-log:query')") + // @PreAuthorize("@ss.hasPermission('infra:api-access-log:query')") public CommonResult> getApiAccessLogPage(@Valid ApiAccessLogPageReqVO pageReqVO) { PageResult pageResult = apiAccessLogService.getApiAccessLogPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ApiAccessLogRespVO.class)); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java index 726215a8a..799378cca 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java @@ -52,7 +52,7 @@ public class ApiErrorLogController { @GetMapping("/page") @Operation(summary = "获得 API 错误日志分页") - @PreAuthorize("@ss.hasPermission('infra:api-error-log:query')") + // @PreAuthorize("@ss.hasPermission('infra:api-error-log:query')") public CommonResult> getApiErrorLogPage(@Valid ApiErrorLogPageReqVO pageReqVO) { PageResult pageResult = apiErrorLogService.getApiErrorLogPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ApiErrorLogRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/AlertController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/AlertController.java index 95b906886..df36e580b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/AlertController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/AlertController.java @@ -66,7 +66,7 @@ public class AlertController { @GetMapping("/get") @Operation(summary = "获得告警配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:alert:query')") + // @PreAuthorize("@ss.hasPermission('iot:alert:query')") public CommonResult getAlert(@RequestParam("id") Long id) { AlertDO alert = alertService.getAlert(id); return success(BeanUtils.toBean(alert, AlertRespVO.class)); @@ -74,7 +74,7 @@ public class AlertController { @GetMapping("/page") @Operation(summary = "获得告警配置分页") - @PreAuthorize("@ss.hasPermission('iot:alert:query')") + // @PreAuthorize("@ss.hasPermission('iot:alert:query')") public CommonResult> getAlertPage(@Valid AlertPageReqVO pageReqVO) { PageResult pageResult = alertService.getAlertPage(pageReqVO); return success(BeanUtils.toBean(pageResult, AlertRespVO.class)); @@ -98,7 +98,7 @@ public class AlertController { @GetMapping("/alert-record/page") @Operation(summary = "获得告警记录分页") @Parameter(name = "alertId", description = "告警ID") - @PreAuthorize("@ss.hasPermission('iot:alert:query')") + // @PreAuthorize("@ss.hasPermission('iot:alert:query')") public CommonResult> getAlertRecordPage(PageParam pageReqVO, @RequestParam("alertId") Long alertId) { return success(alertService.getAlertRecordPage(pageReqVO, alertId)); @@ -131,7 +131,7 @@ public class AlertController { @GetMapping("/alert-record/get") @Operation(summary = "获得告警记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('iot:alert:query')") + // @PreAuthorize("@ss.hasPermission('iot:alert:query')") public CommonResult getAlertRecord(@RequestParam("id") Long id) { return success(alertService.getAlertRecord(id)); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alertrecord/AlertRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alertrecord/AlertRecordController.java index 84e420b26..5a8276ee1 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alertrecord/AlertRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alertrecord/AlertRecordController.java @@ -65,7 +65,7 @@ public class AlertRecordController { @GetMapping("/get") @Operation(summary = "获得告警记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:alert-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:alert-record:query')") public CommonResult getAlertRecord(@RequestParam("id") Long id) { AlertRecordDO alertRecord = alertRecordService.getAlertRecord(id); return success(BeanUtils.toBean(alertRecord, AlertRecordRespVO.class)); @@ -73,7 +73,7 @@ public class AlertRecordController { @GetMapping("/page") @Operation(summary = "获得告警记录分页") - @PreAuthorize("@ss.hasPermission('iot:alert-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:alert-record:query')") public CommonResult> getAlertRecordPage(@Valid AlertRecordPageReqVO pageReqVO) { PageResult pageResult = alertRecordService.getAlertRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, AlertRecordRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java index d02bc0e3d..5bd7ec9a3 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java @@ -104,7 +104,7 @@ public class DeviceController { @GetMapping("/get") @Operation(summary = "获得物联设备") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device:query')") + // @PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult getDevice(@RequestParam("id") Long id) { DeviceRespVO deviceRespVO = deviceService.getDevice(id); return success(deviceRespVO); @@ -112,7 +112,7 @@ public class DeviceController { @GetMapping("/page") @Operation(summary = "获得物联设备分页") - @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('iot:device:query')") + // @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('iot:device:query')") public CommonResult> getDevicePage(@Valid DevicePageReqVO pageReqVO) { PageResult pageResult = deviceService.getDevicePage(pageReqVO); return success(pageResult); @@ -120,14 +120,14 @@ public class DeviceController { @GetMapping("/available-list") @Operation(summary = "获取设备下拉列表（全量+是否已选+已删除标识）") - @PreAuthorize("@ss.hasPermission('iot:device:query')") + // @PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult> getAvailableDeviceList() { return success(deviceService.getDeviceSelectList()); } @GetMapping("/available-page") @Operation(summary = "获取设备分页列表（全量+是否已选+已删除标识）") - @PreAuthorize("@ss.hasPermission('iot:device:query')") + // @PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult> getAvailableDevicePage(@Valid DevicePageReqVO pageReqVO) { PageResult pageResult = deviceService.getAvailableDevicePage(pageReqVO); return success(pageResult); @@ -155,7 +155,7 @@ public class DeviceController { @GetMapping("/production-daily-report/page") @Operation(summary = "获得设备生产日报 Excel 分页") - @PreAuthorize("@ss.hasPermission('iot:device:query')") + // @PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult> getProductionDailyReportPage( @Valid DeviceProductionDailyReportPageReqVO reqVO) { return success(deviceProductionDailyReportService.getReportPage(reqVO)); @@ -171,7 +171,7 @@ public class DeviceController { @GetMapping("/noUsedlist") @Operation(summary = "获得未关联设备台账列表") - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult> getDeviceLedgerListByNoUsed() { DevicePageReqVO pageReqVO = new DevicePageReqVO(); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); @@ -185,7 +185,7 @@ public class DeviceController { @GetMapping("/noUsedlist2") @Operation(summary = "获得未关联设备台账列表") - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult> getDeviceLedgerList2ByNoUsed(@RequestParam("id") Long id) { DevicePageReqVO pageReqVO = new DevicePageReqVO(); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); @@ -328,7 +328,7 @@ public class DeviceController { @GetMapping("/device-attribute/page") @Operation(summary = "获得设备属性分页") @Parameter(name = "deviceId", description = "设备id") - @PreAuthorize("@ss.hasPermission('iot:device:query')") + // @PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult> getDeviceAttributePage(PageParam pageParam, DeviceContactModelPageReqVO deviceModelAttributePageReqVO) { return success(deviceService.getDeviceAttributePage(pageParam, deviceModelAttributePageReqVO)); } @@ -336,7 +336,7 @@ public class DeviceController { @GetMapping("/device-attribute/groupList") @Operation(summary = "获得设备属性") @Parameter(name = "deviceId", description = "设备id") - @PreAuthorize("@ss.hasPermission('iot:device:query')") + // @PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult>> getDeviceAttributeGroupList(DeviceContactModelPageReqVO deviceModelAttributePageReqVO) { return success(deviceService.getDeviceAttributeGroupList(deviceModelAttributePageReqVO)); } @@ -345,7 +345,7 @@ public class DeviceController { @GetMapping("/device-attribute/list") @Operation(summary = "获得设备属性列表") @Parameter(name = "deviceId", description = "设备id") - @PreAuthorize("@ss.hasPermission('iot:device:query')") + // @PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult> getDeviceAttributeList(@RequestParam(name = "deviceId") Long deviceId) { return success(deviceService.getDeviceAttributeList(deviceId)); } @@ -386,7 +386,7 @@ public class DeviceController { @GetMapping("/device-attribute/get") @Operation(summary = "获得设备属性") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('iot:device:query')") + // @PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult getDeviceAttribute(@RequestParam("id") Long id) { return success(deviceService.getDeviceAttribute(id)); } @@ -409,7 +409,7 @@ public class DeviceController { @Parameter(name = "file", description = "Excel 文件", required = true), @Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true") }) - //@PreAuthorize("@ss.hasPermission('')") + @PreAuthorize("@ss.hasPermission('')") public CommonResult importExcel(@RequestParam("file") MultipartFile file, @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport, @RequestParam("deviceId") Long deviceId) throws Exception { @@ -418,7 +418,7 @@ public class DeviceController { } @GetMapping("/devicePointList") - @PreAuthorize("@ss.hasPermission('iot:device:query')") + // @PreAuthorize("@ss.hasPermission('iot:device:query')") public CommonResult> devicePointList() { return success( deviceService.devicePointList()); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceattributetype/DeviceAttributeTypeController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceattributetype/DeviceAttributeTypeController.java index df3dfdc1d..9a6e2aaec 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceattributetype/DeviceAttributeTypeController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceattributetype/DeviceAttributeTypeController.java @@ -74,7 +74,7 @@ public class DeviceAttributeTypeController { @GetMapping("/get") @Operation(summary = "获得采集点分类") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-attribute-type:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-attribute-type:query')") public CommonResult getDeviceAttributeType(@RequestParam("id") Long id) { DeviceAttributeTypeDO deviceAttributeType = deviceAttributeTypeService.getDeviceAttributeType(id); return success(BeanUtils.toBean(deviceAttributeType, DeviceAttributeTypeRespVO.class)); @@ -82,7 +82,7 @@ public class DeviceAttributeTypeController { @GetMapping("/page") @Operation(summary = "获得采集点分类分页") - @PreAuthorize("@ss.hasPermission('iot:device-attribute-type:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-attribute-type:query')") public CommonResult> getDeviceAttributeTypePage(@Valid DeviceAttributeTypePageReqVO pageReqVO) { PageResult pageResult = deviceAttributeTypeService.getDeviceAttributeTypePage(pageReqVO); return success(BeanUtils.toBean(pageResult, DeviceAttributeTypeRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicecontactmodel/DeviceContactModelController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicecontactmodel/DeviceContactModelController.java index 69b323483..3c7c39800 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicecontactmodel/DeviceContactModelController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicecontactmodel/DeviceContactModelController.java @@ -72,7 +72,7 @@ public class DeviceContactModelController { @GetMapping("/get") @Operation(summary = "获得采集设备模型-点位管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-contact-model:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-contact-model:query')") public CommonResult getDeviceContactModel(@RequestParam("id") Long id) { DeviceContactModelDO deviceContactModel = deviceContactModelService.getDeviceContactModel(id); return success(BeanUtils.toBean(deviceContactModel, DeviceContactModelRespVO.class)); @@ -80,7 +80,7 @@ public class DeviceContactModelController { @GetMapping("/page") @Operation(summary = "获得采集设备模型-点位管理分页") - @PreAuthorize("@ss.hasPermission('iot:device-contact-model:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-contact-model:query')") public CommonResult> getDeviceContactModelPage(@Valid DeviceContactModelPageReqVO pageReqVO) { PageResult pageResult = deviceContactModelService.getDeviceContactModelPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DeviceContactModelRespVO.class)); @@ -90,7 +90,7 @@ public class DeviceContactModelController { @GetMapping("/list") @Operation(summary = "获得采集设备模型-点位管理 列表") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-model-attribute:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-model-attribute:query')") public CommonResult> getDeviceContactModelList(@RequestParam("id") Long id) { List deviceModelAttribute = deviceContactModelService.getDeviceContactModelList(id); return success(deviceModelAttribute); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodel/DeviceModelController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodel/DeviceModelController.java index 7c3533025..c264573ed 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodel/DeviceModelController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodel/DeviceModelController.java @@ -73,7 +73,7 @@ public class DeviceModelController { @GetMapping("/get") @Operation(summary = "获得采集设备模型") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-model:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-model:query')") public CommonResult getDeviceModel(@RequestParam("id") Long id) { DeviceModelDO deviceModel = deviceModelService.getDeviceModel(id); return success(BeanUtils.toBean(deviceModel, DeviceModelRespVO.class)); @@ -81,7 +81,7 @@ public class DeviceModelController { @GetMapping("/page") @Operation(summary = "获得采集设备模型分页") - @PreAuthorize("@ss.hasPermission('iot:device-model:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-model:query')") public CommonResult> getDeviceModelPage(@Valid DeviceModelPageReqVO pageReqVO) { PageResult pageResult = deviceModelService.getDeviceModelPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DeviceModelRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/DeviceModelAttributeController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/DeviceModelAttributeController.java index dc4eb360e..3c54a1cb0 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/DeviceModelAttributeController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/DeviceModelAttributeController.java @@ -77,7 +77,7 @@ public class DeviceModelAttributeController { @GetMapping("/get") @Operation(summary = "获得采集设备模型-点位管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-model-attribute:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-model-attribute:query')") public CommonResult getDeviceModelAttribute(@RequestParam("id") Long id) { DeviceModelAttributeDO deviceModelAttribute = deviceModelAttributeService.getDeviceModelAttribute(id); return success(BeanUtils.toBean(deviceModelAttribute, DeviceModelAttributeRespVO.class)); @@ -86,7 +86,7 @@ public class DeviceModelAttributeController { @GetMapping("/list") @Operation(summary = "获得采集设备模型-点位管理 列表") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-model-attribute:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-model-attribute:query')") public CommonResult> getDeviceModelAttributeList(@RequestParam("id") Long id) { List deviceModelAttribute = deviceModelAttributeService.getDeviceModelAttributeList(id); return success(deviceModelAttribute); @@ -95,7 +95,7 @@ public class DeviceModelAttributeController { @GetMapping("/page") @Operation(summary = "获得采集设备模型-点位管理分页") - @PreAuthorize("@ss.hasPermission('iot:device-model-attribute:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-model-attribute:query')") public CommonResult> getDeviceModelAttributePage(@Valid DeviceModelAttributePageReqVO pageReqVO) { PageResult pageResult = deviceModelAttributeService.getDeviceModelAttributePage(pageReqVO); return success(pageResult); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelrules/DeviceModelRulesController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelrules/DeviceModelRulesController.java index 324fba6cb..8c5540829 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelrules/DeviceModelRulesController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelrules/DeviceModelRulesController.java @@ -67,7 +67,7 @@ public class DeviceModelRulesController { @GetMapping("/get") @Operation(summary = "获得点位规则关联模型") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-model-rules:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-model-rules:query')") public CommonResult getDeviceModelRules(@RequestParam("id") Long id) { DeviceModelRulesDO deviceModelRules = deviceModelRulesService.getDeviceModelRules(id); DeviceModelRulesRespVO deviceModelRulesRespVO = BeanUtils.toBean(deviceModelRules, DeviceModelRulesRespVO.class); @@ -80,7 +80,7 @@ public class DeviceModelRulesController { @GetMapping("/page") @Operation(summary = "获得点位规则关联模型分页") - @PreAuthorize("@ss.hasPermission('iot:device-model-rules:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-model-rules:query')") public CommonResult> getDeviceModelRulesPage(@Valid DeviceModelRulesPageReqVO pageReqVO) { PageResult pageResult = deviceModelRulesService.getDeviceModelRulesPage(pageReqVO); PageResult modelRulesRespVOPageResult = BeanUtils.toBean(pageResult, DeviceModelRulesRespVO.class); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceoperationrecord/DeviceOperationRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceoperationrecord/DeviceOperationRecordController.java index 5231af29e..1efbc1548 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceoperationrecord/DeviceOperationRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceoperationrecord/DeviceOperationRecordController.java @@ -77,7 +77,7 @@ public class DeviceOperationRecordController { @GetMapping("/get") @Operation(summary = "获得运行记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-operation-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-operation-record:query')") public CommonResult getDeviceOperationRecord(@RequestParam("id") Long id) { DeviceOperationRecordDO deviceOperationRecord = deviceOperationRecordService.getDeviceOperationRecord(id); return success(BeanUtils.toBean(deviceOperationRecord, DeviceOperationRecordRespVO.class)); @@ -85,7 +85,7 @@ public class DeviceOperationRecordController { @GetMapping("/page") @Operation(summary = "获得运行记录分页") - @PreAuthorize("@ss.hasPermission('iot:device-operation-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-operation-record:query')") public CommonResult> getDeviceOperationRecordPage(@Valid DeviceOperationRecordPageReqVO pageReqVO) { PageResult pageResult = deviceOperationRecordService.getDeviceOperationRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DeviceOperationRecordRespVO.class)); @@ -113,7 +113,7 @@ public class DeviceOperationRecordController { @GetMapping("/deviceOperationPageList") @Operation(summary = "设备运行报表列表") - @PreAuthorize("@ss.hasPermission('iot:device-operation-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-operation-record:query')") public CommonResult> deviceOperationPageList(@Valid DeviceTotalTimeRecordReqVO pageReqVO) { return success(deviceOperationRecordService.deviceOperationPageList(pageReqVO)); } @@ -129,7 +129,7 @@ public class DeviceOperationRecordController { @GetMapping("/deviceOperationList") @Operation(summary = "产线设备运行开机率/利用率大屏") - @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('iot:device-operation-record:query')") + // @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('iot:device-operation-record:query')") public CommonResult> deviceOperationList(@Valid DeviceTotalTimeRecordReqVO pageReqVO) { return success(deviceOperationRecordService.deviceOperationList(pageReqVO)); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicepointrules/DevicePointRulesController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicepointrules/DevicePointRulesController.java index e4d82f535..5927f0f21 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicepointrules/DevicePointRulesController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicepointrules/DevicePointRulesController.java @@ -68,7 +68,7 @@ public class DevicePointRulesController { @GetMapping("/get") @Operation(summary = "获得点位规则") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-point-rules:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-point-rules:query')") public CommonResult getDevicePointRules(@RequestParam("id") Long id) { DevicePointRulesDO devicePointRules = devicePointRulesService.getDevicePointRules(id); return success(BeanUtils.toBean(devicePointRules, DevicePointRulesRespVO.class)); @@ -76,7 +76,7 @@ public class DevicePointRulesController { @GetMapping("/page") @Operation(summary = "获得点位规则分页") - @PreAuthorize("@ss.hasPermission('iot:device-point-rules:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-point-rules:query')") public CommonResult> getDevicePointRulesPage(@Valid DevicePointRulesPageReqVO pageReqVO) { PageResult pageResult = devicePointRulesService.getDevicePointRulesPage(pageReqVO); PageResult rulesRespVOPageResult = BeanUtils.toBean(pageResult, DevicePointRulesRespVO.class); @@ -124,7 +124,7 @@ public class DevicePointRulesController { @GetMapping("/getList") @Operation(summary = "获得点位规则列表") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-point-rules:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-point-rules:query')") public CommonResult> getList(@RequestParam("id") Long id) { List devicePointRules = devicePointRulesService.getList(id); return success(devicePointRules); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicewarinningrecord/DeviceWarinningRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicewarinningrecord/DeviceWarinningRecordController.java index 767869a75..703dec0ab 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicewarinningrecord/DeviceWarinningRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicewarinningrecord/DeviceWarinningRecordController.java @@ -65,7 +65,7 @@ public class DeviceWarinningRecordController { @GetMapping("/get") @Operation(summary = "获得告警记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:device-warinning-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-warinning-record:query')") public CommonResult getDeviceWarinningRecord(@RequestParam("id") Long id) { DeviceWarinningRecordDO deviceWarinningRecord = deviceWarinningRecordService.getDeviceWarinningRecord(id); return success(BeanUtils.toBean(deviceWarinningRecord, DeviceWarinningRecordRespVO.class)); @@ -73,7 +73,7 @@ public class DeviceWarinningRecordController { @GetMapping("/page") @Operation(summary = "获得告警记录分页") - @PreAuthorize("@ss.hasPermission('iot:device-warinning-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:device-warinning-record:query')") public CommonResult> getDeviceWarinningRecordPage(@Valid DeviceWarinningRecordPageReqVO pageReqVO) { PageResult pageResult = deviceWarinningRecordService.getDeviceWarinningRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DeviceWarinningRecordRespVO.class)); @@ -108,7 +108,7 @@ public class DeviceWarinningRecordController { @GetMapping("/getLastSevenHoursCount") @Operation(summary = "获取过去7小时每小时告警数量") @Parameter(name = "orgId", description = "产线组织Id", required = true, example = "1024") - //@PreAuthorize("@ss.hasPermission('iot:device-warinning-record:query')") + @PreAuthorize("@ss.hasPermission('iot:device-warinning-record:query')") public CommonResult>> getLastSevenHoursCount( @RequestParam(name = "orgId" ,required = false) Long orgId) { List> hourCounts = deviceWarinningRecordService.getLastSevenHoursCount(); return success(hourCounts); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/feedback/FeedbackController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/feedback/FeedbackController.java index 43dbad925..65ba8c419 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/feedback/FeedbackController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/feedback/FeedbackController.java @@ -65,7 +65,7 @@ public class FeedbackController { @GetMapping("/get") @Operation(summary = "获得用户反馈") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:feedback:query')") + // @PreAuthorize("@ss.hasPermission('iot:feedback:query')") public CommonResult getFeedback(@RequestParam("id") Long id) { FeedbackDO feedback = feedbackService.getFeedback(id); return success(BeanUtils.toBean(feedback, FeedbackRespVO.class)); @@ -73,7 +73,7 @@ public class FeedbackController { @GetMapping("/page") @Operation(summary = "获得用户反馈分页") - @PreAuthorize("@ss.hasPermission('iot:feedback:query')") + // @PreAuthorize("@ss.hasPermission('iot:feedback:query')") public CommonResult> getFeedbackPage(@Valid FeedbackPageReqVO pageReqVO) { PageResult pageResult = feedbackService.getFeedbackPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FeedbackRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaController.java index 0c8dc7f51..b889e31b6 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaController.java @@ -64,7 +64,7 @@ public class FormulaController { @GetMapping("/get") @Operation(summary = "获得计算公式") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:formula:query')") + // @PreAuthorize("@ss.hasPermission('iot:formula:query')") public CommonResult getFormula(@RequestParam("id") Long id) { FormulaDO formula = formulaService.getFormula(id); return success(BeanUtils.toBean(formula, FormulaRespVO.class)); @@ -72,7 +72,7 @@ public class FormulaController { @GetMapping("/page") @Operation(summary = "获得计算公式分页") - @PreAuthorize("@ss.hasPermission('iot:formula:query')") + // @PreAuthorize("@ss.hasPermission('iot:formula:query')") public CommonResult> getFormulaPage(@Valid FormulaPageReqVO pageReqVO) { PageResult pageResult = formulaService.getFormulaPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FormulaRespVO.class)); @@ -96,7 +96,7 @@ public class FormulaController { @GetMapping("/formula-detail/page") @Operation(summary = "获得计算公式明细分页") @Parameter(name = "formulaId", description = "计算公式ID") - @PreAuthorize("@ss.hasPermission('iot:formula:query')") + // @PreAuthorize("@ss.hasPermission('iot:formula:query')") public CommonResult> getFormulaDetailPage(PageParam pageReqVO, @RequestParam("formulaId") Long formulaId) { return success(formulaService.getFormulaDetailPage(pageReqVO, formulaId)); @@ -129,7 +129,7 @@ public class FormulaController { @GetMapping("/formula-detail/get") @Operation(summary = "获得计算公式明细") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('iot:formula:query')") + // @PreAuthorize("@ss.hasPermission('iot:formula:query')") public CommonResult getFormulaDetail(@RequestParam("id") Long id) { return success(formulaService.getFormulaDetail(id)); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaRecordController.java index 8f67a5cae..6bb173a0d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaRecordController.java @@ -63,7 +63,7 @@ public class FormulaRecordController { @GetMapping("/get") @Operation(summary = "获得变量记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:formula-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:formula-record:query')") public CommonResult getFormulaRecord(@RequestParam("id") Long id) { FormulaRecordDO formulaRecord = formulaRecordService.getFormulaRecord(id); return success(BeanUtils.toBean(formulaRecord, FormulaRecordRespVO.class)); @@ -71,7 +71,7 @@ public class FormulaRecordController { @GetMapping("/page") @Operation(summary = "获得变量记录分页") - @PreAuthorize("@ss.hasPermission('iot:formula-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:formula-record:query')") public CommonResult> getFormulaRecordPage(@Valid FormulaRecordPageReqVO pageReqVO) { PageResult pageResult = formulaRecordService.getFormulaRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FormulaRecordRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java index 137a2883d..81cae82c3 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java @@ -63,7 +63,7 @@ public class FrpcProxyServerController { @GetMapping("/get") @Operation(summary = "获得代理服务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:query')") + // @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:query')") public CommonResult getFrpcProxyServer(@RequestParam("id") Long id) { FrpcProxyServerDO frpcProxyServer = frpcProxyServerService.getFrpcProxyServer(id); return success(BeanUtils.toBean(frpcProxyServer, FrpcProxyServerRespVO.class)); @@ -71,7 +71,7 @@ public class FrpcProxyServerController { @GetMapping("/page") @Operation(summary = "获得代理服务分页") - @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:query')") + // @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:query')") public CommonResult> getFrpcProxyServerPage(@Valid FrpcProxyServerPageReqVO pageReqVO) { PageResult pageResult = frpcProxyServerService.getFrpcProxyServerPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FrpcProxyServerRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java index 18b6655c1..517e45a54 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java @@ -63,7 +63,7 @@ public class FrpsServerController { @GetMapping("/get") @Operation(summary = "获得代理服务器") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:query')") + // @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:query')") public CommonResult getFrpsServer(@RequestParam("id") Long id) { FrpsServerDO frpsServer = frpsServerService.getFrpsServer(id); return success(BeanUtils.toBean(frpsServer, FrpsServerRespVO.class)); @@ -71,7 +71,7 @@ public class FrpsServerController { @GetMapping("/page") @Operation(summary = "获得代理服务器分页") - @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:query')") + // @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:query')") public CommonResult> getFrpsServerPage(@Valid FrpsServerPageReqVO pageReqVO) { PageResult pageResult = frpsServerService.getFrpsServerPage(pageReqVO); return success(BeanUtils.toBean(pageResult, FrpsServerRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/GatewayController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/GatewayController.java index b9f9d506c..ffe635851 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/GatewayController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/GatewayController.java @@ -105,7 +105,7 @@ public class GatewayController { @GetMapping("/get") @Operation(summary = "获得网关") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:gateway:query')") + // @PreAuthorize("@ss.hasPermission('iot:gateway:query')") public CommonResult getGateway(@RequestParam("id") Long id) { GatewayDO gateway = gatewayService.getGateway(id); return success(BeanUtils.toBean(gateway, GatewayRespVO.class)); @@ -113,7 +113,7 @@ public class GatewayController { @GetMapping("/page") @Operation(summary = "获得网关分页") - @PreAuthorize("@ss.hasPermission('iot:gateway:query')") + // @PreAuthorize("@ss.hasPermission('iot:gateway:query')") public CommonResult> getGatewayPage(@Valid GatewayPageReqVO pageReqVO) { PageResult pageResult = gatewayService.getGatewayPage(pageReqVO); return success(BeanUtils.toBean(pageResult, GatewayRespVO.class)); @@ -137,7 +137,7 @@ public class GatewayController { @GetMapping("/device/page") @Operation(summary = "获得物联设备分页") @Parameter(name = "gatewayId", description = "网关id") - @PreAuthorize("@ss.hasPermission('iot:gateway:query')") + // @PreAuthorize("@ss.hasPermission('iot:gateway:query')") public CommonResult> getDevicePage(PageParam pageReqVO, @RequestParam("gatewayId") Long gatewayId) { return success(gatewayService.getDevicePage(pageReqVO, gatewayId)); @@ -170,7 +170,7 @@ public class GatewayController { @GetMapping("/device/get") @Operation(summary = "获得物联设备") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('iot:gateway:query')") + // @PreAuthorize("@ss.hasPermission('iot:gateway:query')") public CommonResult getDevice(@RequestParam("id") Long id) { return success(gatewayService.getDevice(id)); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/IotOrganizationController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/IotOrganizationController.java index 9192ad2e1..5f024c77b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/IotOrganizationController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/IotOrganizationController.java @@ -61,7 +61,7 @@ public class IotOrganizationController { @GetMapping("/get") @Operation(summary = "获得IOT组织") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:organization:query')") + // @PreAuthorize("@ss.hasPermission('iot:organization:query')") public CommonResult getOrganization(@RequestParam("id") Long id) { IotOrganizationDO organization = organizationService.getOrganization(id); return success(BeanUtils.toBean(organization, IotOrganizationRespVO.class)); @@ -69,7 +69,7 @@ public class IotOrganizationController { @GetMapping("/list") @Operation(summary = "获得IOT组织列表") - @PreAuthorize("@ss.hasPermission('iot:organization:query')") + // @PreAuthorize("@ss.hasPermission('iot:organization:query')") public CommonResult> getOrganizationList(@Valid IotOrganizationListReqVO listReqVO) { List list = organizationService.getOrganizationList(listReqVO); return success(BeanUtils.toBean(list, IotOrganizationRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/KanbanController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/KanbanController.java index 8e55c43e4..5b306241f 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/KanbanController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/KanbanController.java @@ -63,7 +63,7 @@ public class KanbanController { @GetMapping("/get") @Operation(summary = "获得物联看板") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:kanban:query')") + // @PreAuthorize("@ss.hasPermission('iot:kanban:query')") public CommonResult getKanban(@RequestParam("id") Long id) { KanbanDO kanban = kanbanService.getKanban(id); return success(BeanUtils.toBean(kanban, KanbanRespVO.class)); @@ -71,7 +71,7 @@ public class KanbanController { @GetMapping("/page") @Operation(summary = "获得物联看板分页") - @PreAuthorize("@ss.hasPermission('iot:kanban:query')") + // @PreAuthorize("@ss.hasPermission('iot:kanban:query')") public CommonResult> getKanbanPage(@Valid KanbanPageReqVO pageReqVO) { PageResult pageResult = kanbanService.getKanbanPage(pageReqVO); return success(BeanUtils.toBean(pageResult, KanbanRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/MqttDataRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/MqttDataRecordController.java index 40567fa17..cbf3344b4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/MqttDataRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/MqttDataRecordController.java @@ -64,7 +64,7 @@ public class MqttDataRecordController { @GetMapping("/get") @Operation(summary = "获得设备数据记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:mqtt-data-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:mqtt-data-record:query')") public CommonResult getMqttDataRecord(@RequestParam("id") Long id) { MqttDataRecordDO mqttDataRecord = mqttDataRecordService.getMqttDataRecord(id); return success(BeanUtils.toBean(mqttDataRecord, MqttDataRecordRespVO.class)); @@ -72,7 +72,7 @@ public class MqttDataRecordController { @GetMapping("/page") @Operation(summary = "获得设备数据记录分页") - @PreAuthorize("@ss.hasPermission('iot:mqtt-data-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:mqtt-data-record:query')") public CommonResult> getMqttDataRecordPage(@Valid MqttDataRecordPageReqVO pageReqVO) { PageResult pageResult = mqttDataRecordService.getMqttDataRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MqttDataRecordRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttRecordController.java index ad0727e67..85bbf1ea0 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttRecordController.java @@ -67,7 +67,7 @@ public class MqttRecordController { @GetMapping("/get") @Operation(summary = "获得数采记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:mqtt-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:mqtt-record:query')") public CommonResult getMqttRecord(@RequestParam("id") Long id) { MqttRecordDO mqttRecord = mqttRecordService.getMqttRecord(id); return success(BeanUtils.toBean(mqttRecord, MqttRecordRespVO.class)); @@ -88,7 +88,7 @@ public class MqttRecordController { } @GetMapping("/page") @Operation(summary = "获得数采记录分页") - @PreAuthorize("@ss.hasPermission('iot:mqtt-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:mqtt-record:query')") public CommonResult> getMqttRecordPage(@Valid MqttRecordPageReqVO pageReqVO) { PageResult pageResult = mqttRecordService.getMqttRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MqttRecordRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipe/RecipeController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipe/RecipeController.java index ebdb3a557..01e556485 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipe/RecipeController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipe/RecipeController.java @@ -65,7 +65,7 @@ public class RecipeController { @GetMapping("/get") @Operation(summary = "获得配方管理主") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:recipe:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe:query')") public CommonResult getRecipe(@RequestParam("id") Long id) { RecipeDO recipe = recipeService.getRecipe(id); return success(BeanUtils.toBean(recipe, RecipeRespVO.class)); @@ -80,7 +80,7 @@ public class RecipeController { // } @GetMapping("/page") @Operation(summary = "获得配方管理主分页") - @PreAuthorize("@ss.hasPermission('iot:recipe:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe:query')") public CommonResult> getRecipePage(@Valid RecipePageReqVO pageReqVO) { // 直接调用实现类的方法，无类型转换 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedeviceattribute/RecipeDeviceAttributeController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedeviceattribute/RecipeDeviceAttributeController.java index dc92ac8c6..79abcf0a6 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedeviceattribute/RecipeDeviceAttributeController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedeviceattribute/RecipeDeviceAttributeController.java @@ -74,7 +74,7 @@ public class RecipeDeviceAttributeController { @GetMapping("/get") @Operation(summary = "获得配方配置（关联采集设备模型-点位管理）") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:recipe-device-attribute:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-device-attribute:query')") public CommonResult getRecipeDeviceAttribute(@RequestParam("id") Long id) { RecipeDeviceAttributeDO recipeDeviceAttribute = recipeDeviceAttributeService.getRecipeDeviceAttribute(id); return success(BeanUtils.toBean(recipeDeviceAttribute, RecipeDeviceAttributeRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java index 941feb0e2..edc63f8c0 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java @@ -118,7 +118,7 @@ public class RecipeDeviceRecordController { @GetMapping("/get") @Operation(summary = "获得设备点位采集值记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:recipe-device-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-device-record:query')") public CommonResult getRecipeDeviceRecord(@RequestParam("id") Long id) { RecipeDeviceRecordDO recipeDeviceRecord = recipeDeviceRecordService.getRecipeDeviceRecord(id); return success(BeanUtils.toBean(recipeDeviceRecord, RecipeDeviceRecordRespVO.class)); @@ -126,7 +126,7 @@ public class RecipeDeviceRecordController { @GetMapping("/page") @Operation(summary = "获得设备点位采集值记录分页") - @PreAuthorize("@ss.hasPermission('iot:recipe-device-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-device-record:query')") public CommonResult> getRecipeDeviceRecordPage(@Valid RecipeDeviceRecordPageReqVO pageReqVO) { PageResult pageResult = recipeDeviceRecordService.getRecipeDeviceRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, RecipeDeviceRecordRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipeplandetail/RecipePlanDetailController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipeplandetail/RecipePlanDetailController.java index 4dc2c50fb..b432c353d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipeplandetail/RecipePlanDetailController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipeplandetail/RecipePlanDetailController.java @@ -66,7 +66,7 @@ public class RecipePlanDetailController { @GetMapping("/get") @Operation(summary = "获得配方计划详情表（配方库）") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:recipe-plan-detail:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-plan-detail:query')") public CommonResult getRecipePlanDetail(@RequestParam("id") Long id) { RecipePlanDetailDO recipePlanDetail = recipePlanDetailService.getRecipePlanDetail(id); return success(BeanUtils.toBean(recipePlanDetail, RecipePlanDetailRespVO.class)); @@ -92,7 +92,7 @@ public class RecipePlanDetailController { @GetMapping("/page") @Operation(summary = "分页查询配方计划详情（含关联信息）") - @PreAuthorize("@ss.hasPermission('iot:recipe-plan-detail:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-plan-detail:query')") public CommonResult> pageRecipePlanDetail(RecipePlanDetailPageReqVO reqVO) { PageResult pageResult = recipePlanDetailService.pageRecipePlanDetail(reqVO); return CommonResult.success(pageResult); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepoint/RecipePointController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepoint/RecipePointController.java index 5f20d6312..90fccc405 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepoint/RecipePointController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepoint/RecipePointController.java @@ -67,7 +67,7 @@ public class RecipePointController { @GetMapping("/get") @Operation(summary = "获得手动配置参数表（绑定配方）") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:recipe-point:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-point:query')") public CommonResult getRecipePoint(@RequestParam("id") Long id) { RecipePointDO recipePoint = recipePointService.getRecipePoint(id); return success(BeanUtils.toBean(recipePoint, RecipePointRespVO.class)); @@ -75,7 +75,7 @@ public class RecipePointController { @GetMapping("/page") @Operation(summary = "获得手动配置参数表（绑定配方）分页") - @PreAuthorize("@ss.hasPermission('iot:recipe-point:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-point:query')") public CommonResult> getRecipePointPage(@Valid RecipePointPageReqVO pageReqVO) { PageResult pageResult = recipePointService.getRecipePointPage(pageReqVO); return success(BeanUtils.toBean(pageResult, RecipePointRespVO.class)); @@ -97,7 +97,7 @@ public class RecipePointController { @GetMapping("/list") @Operation(summary = "获得手动配置参数表（绑定配方）分页") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:recipe-point:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-point:query')") public CommonResult> getRecipePointList(@RequestParam("id") Long recipeId) { List list = recipePointService.getRecipePointPageList(recipeId); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepointrecord/RecipePointRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepointrecord/RecipePointRecordController.java index 580a8d127..4c9ca0bab 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepointrecord/RecipePointRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepointrecord/RecipePointRecordController.java @@ -65,7 +65,7 @@ public class RecipePointRecordController { @GetMapping("/get") @Operation(summary = "获得IoT配方点位记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:recipe-point-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-point-record:query')") public CommonResult getRecipePointRecord(@RequestParam("id") Long id) { RecipePointRecordDO recipePointRecord = recipePointRecordService.getRecipePointRecord(id); return success(BeanUtils.toBean(recipePointRecord, RecipePointRecordRespVO.class)); @@ -73,7 +73,7 @@ public class RecipePointRecordController { @GetMapping("/page") @Operation(summary = "获得IoT配方点位记录分页") - @PreAuthorize("@ss.hasPermission('iot:recipe-point-record:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-point-record:query')") public CommonResult> getRecipePointRecordPage(@Valid RecipePointRecordPageReqVO pageReqVO) { PageResult pageResult = recipePointRecordService.getRecipePointRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, RecipePointRecordRespVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipetype/RecipeTypeController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipetype/RecipeTypeController.java index 4e8b64380..cc4f813a1 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipetype/RecipeTypeController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipetype/RecipeTypeController.java @@ -65,7 +65,7 @@ public class RecipeTypeController { @GetMapping("/get") @Operation(summary = "获得配方类型表（基础字典）") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('iot:recipe-type:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-type:query')") public CommonResult getRecipeType(@RequestParam("id") Long id) { RecipeTypeDO recipeType = recipeTypeService.getRecipeType(id); return success(BeanUtils.toBean(recipeType, RecipeTypeRespVO.class)); @@ -73,7 +73,7 @@ public class RecipeTypeController { @GetMapping("/page") @Operation(summary = "获得配方类型表（基础字典）分页") - @PreAuthorize("@ss.hasPermission('iot:recipe-type:query')") + // @PreAuthorize("@ss.hasPermission('iot:recipe-type:query')") public CommonResult> getRecipeTypePage(@Valid RecipeTypePageReqVO pageReqVO) { PageResult pageResult = recipeTypeService.getRecipeTypePage(pageReqVO); return success(BeanUtils.toBean(pageResult, RecipeTypeRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/AppOrgWorkerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/AppOrgWorkerController.java index 5080609ba..9199371b1 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/AppOrgWorkerController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/AppOrgWorkerController.java @@ -25,6 +25,7 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -115,7 +116,7 @@ public class AppOrgWorkerController { @PostMapping("/createReport") @Operation(summary = "创建生产报工单") - //@PreAuthorize("@ss.hasPermission('mes:produce-report:create')") + @PreAuthorize("@ss.hasPermission('mes:produce-report:create')") public CommonResult createReport(@Valid @RequestBody AppReportSaveReqVO appSaveVo) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime localDateTime = LocalDateTime.parse(appSaveVo.getReportDateString(), formatter); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/BaogongRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/BaogongRecordController.java index 908ae985f..04efb5d89 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/BaogongRecordController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/BaogongRecordController.java @@ -106,7 +106,7 @@ public class BaogongRecordController { @GetMapping("/get") @Operation(summary = "获得报工") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:baogong-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:baogong-record:query')") public CommonResult getBaogongRecord(@RequestParam("id") Long id) { BaogongRecordDO baogongRecord = baogongRecordService.getBaogongRecord(id); return success(BeanUtils.toBean(baogongRecord, BaogongRecordRespVO.class)); @@ -114,7 +114,7 @@ public class BaogongRecordController { @GetMapping("/page") @Operation(summary = "获得报工分页") - @PreAuthorize("@ss.hasPermission('mes:baogong-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:baogong-record:query')") public CommonResult> getBaogongRecordPage(@Valid BaogongRecordPageReqVO pageReqVO) { PageResult pageResult = baogongRecordService.getBaogongRecordPage(pageReqVO); return success(new PageResult<>(buildVOList(pageResult.getList()), pageResult.getTotal())); @@ -147,7 +147,7 @@ public class BaogongRecordController { @GetMapping("/stat-page") @Operation(summary = "报工统计分页") - @PreAuthorize("@ss.hasPermission('mes:baogong-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:baogong-record:query')") public CommonResult> getBaogongRecordStatPage(@Valid BaogongRecordStatPageReqVO reqVO) { return success(baogongRecordService.getBaogongRecordStatPage(reqVO)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/bom/BomController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/bom/BomController.java index f50b9a601..b65f3202b 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/bom/BomController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/bom/BomController.java @@ -74,7 +74,7 @@ public class BomController { @GetMapping("/get") @Operation(summary = "获得产品BOM") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:bom:query')") + // @PreAuthorize("@ss.hasPermission('mes:bom:query')") public CommonResult getBom(@RequestParam("id") Long id) { BomDO bom = bomService.getBom(id); return success(BeanUtils.toBean(bom, BomRespVO.class)); @@ -89,7 +89,7 @@ public class BomController { @GetMapping("/page") @Operation(summary = "获得产品BOM分页") - @PreAuthorize("@ss.hasPermission('mes:bom:query')") + // @PreAuthorize("@ss.hasPermission('mes:bom:query')") public CommonResult> getBomPage(@Valid BomPageReqVO pageReqVO) { PageResult pageResult = bomService.getBomPage(pageReqVO); return success(pageResult); @@ -113,7 +113,7 @@ public class BomController { @GetMapping("/bom-detail/list-by-bom-id") @Operation(summary = "获得产品BOM明细列表") @Parameter(name = "bomId", description = "BOM ID") - @PreAuthorize("@ss.hasPermission('mes:bom:query')") + // @PreAuthorize("@ss.hasPermission('mes:bom:query')") public CommonResult> getBomDetailListByBomId(@RequestParam("bomId") Long bomId) { return success(bomService.getBomDetailListByBomId(bomId)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/calholiday/CalHolidayController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/calholiday/CalHolidayController.java index 0a7fd6fd7..0df25e556 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/calholiday/CalHolidayController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/calholiday/CalHolidayController.java @@ -65,7 +65,7 @@ public class CalHolidayController { @GetMapping("/get") @Operation(summary = "获得节假日设置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:cal-holiday:query')") + // @PreAuthorize("@ss.hasPermission('mes:cal-holiday:query')") public CommonResult getCalHoliday(@RequestParam("id") Long id) { CalHolidayDO calHoliday = calHolidayService.getCalHoliday(id); return success(BeanUtils.toBean(calHoliday, CalHolidayRespVO.class)); @@ -73,7 +73,7 @@ public class CalHolidayController { @GetMapping("/page") @Operation(summary = "获得节假日设置分页") - @PreAuthorize("@ss.hasPermission('mes:cal-holiday:query')") + // @PreAuthorize("@ss.hasPermission('mes:cal-holiday:query')") public CommonResult> getCalHolidayPage(@Valid CalHolidayPageReqVO pageReqVO) { PageResult pageResult = calHolidayService.getCalHolidayPage(pageReqVO); return success(BeanUtils.toBean(pageResult, CalHolidayRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/changerecord/ProduceReportChangeRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/changerecord/ProduceReportChangeRecordController.java index 3605e2529..cff240cc9 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/changerecord/ProduceReportChangeRecordController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/changerecord/ProduceReportChangeRecordController.java @@ -65,7 +65,7 @@ public class ProduceReportChangeRecordController { @GetMapping("/get") @Operation(summary = "获得报工变更记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:produce-report-change-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:produce-report-change-record:query')") public CommonResult getProduceReportChangeRecord(@RequestParam("id") Long id) { ProduceReportChangeRecordDO produceReportChangeRecord = produceReportChangeRecordService.getProduceReportChangeRecord(id); return success(BeanUtils.toBean(produceReportChangeRecord, ProduceReportChangeRecordRespVO.class)); @@ -73,7 +73,7 @@ public class ProduceReportChangeRecordController { @GetMapping("/page") @Operation(summary = "获得报工变更记录分页") - @PreAuthorize("@ss.hasPermission('mes:produce-report-change-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:produce-report-change-record:query')") public CommonResult> getProduceReportChangeRecordPage(@Valid ProduceReportChangeRecordPageReqVO pageReqVO) { PageResult pageResult = produceReportChangeRecordService.getProduceReportChangeRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProduceReportChangeRecordRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/CriticalComponentController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/CriticalComponentController.java index f0a6a831b..e2b9c051d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/CriticalComponentController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/CriticalComponentController.java @@ -77,7 +77,7 @@ public class CriticalComponentController { @GetMapping("/get") @Operation(summary = "获得设备关键件") - @PreAuthorize("@ss.hasPermission('mes:critical-component:query')") + // @PreAuthorize("@ss.hasPermission('mes:critical-component:query')") public CommonResult getCriticalComponent(@RequestParam(value = "id", required = false) Long id, @RequestParam(value = "code", required = false) String code) { CriticalComponentDO criticalComponent = criticalComponentService.getCriticalComponent(id, code); @@ -89,7 +89,7 @@ public class CriticalComponentController { @GetMapping("/page") @Operation(summary = "获得设备关键件分页") - @PreAuthorize("@ss.hasPermission('mes:critical-component:query')") + // @PreAuthorize("@ss.hasPermission('mes:critical-component:query')") public CommonResult> getCriticalComponentPage(@Valid CriticalComponentPageReqVO pageReqVO) { PageResult pageResult = criticalComponentService.getCriticalComponentPage(pageReqVO); return success(BeanUtils.toBean(pageResult, CriticalComponentRespVO.class)); @@ -97,7 +97,7 @@ public class CriticalComponentController { @GetMapping("/list") @Operation(summary = "获得设备关键件列表") - @PreAuthorize("@ss.hasPermission('mes:critical-component:query')") + // @PreAuthorize("@ss.hasPermission('mes:critical-component:query')") public CommonResult> getCriticalComponentList() { List criticalComponentList= criticalComponentService.getCriticalComponentList(); return success(criticalComponentList); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/customer/CrmCustomerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/customer/CrmCustomerController.java index 5a5b7cdb9..5dcf44b51 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/customer/CrmCustomerController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/customer/CrmCustomerController.java @@ -95,7 +95,7 @@ public class CrmCustomerController { @GetMapping("/get") @Operation(summary = "获得客户") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:customer:query')") + // @PreAuthorize("@ss.hasPermission('mes:customer:query')") public CommonResult getCustomer(@RequestParam("id") Long id) { // 1. 获取客户 CrmCustomerDO customer = customerService.getCustomer(id); @@ -112,7 +112,7 @@ public class CrmCustomerController { @GetMapping("/page") @Operation(summary = "获得客户分页") - @PreAuthorize("@ss.hasPermission('mes:customer:query')") + // @PreAuthorize("@ss.hasPermission('mes:customer:query')") public CommonResult> getCustomerPage(@Valid CrmCustomerPageReqVO pageVO) { // 1. 查询客户分页 PageResult pageResult = customerService.getCustomerPage(pageVO, getLoginUserId()); @@ -152,7 +152,7 @@ public class CrmCustomerController { @GetMapping("/put-pool-remind-page") @Operation(summary = "获得待进入公海客户分页") - @PreAuthorize("@ss.hasPermission('mes:customer:query')") + // @PreAuthorize("@ss.hasPermission('mes:customer:query')") public CommonResult> getPutPoolRemindCustomerPage(@Valid CrmCustomerPageReqVO pageVO) { // 1. 查询客户分页 PageResult pageResult = customerService.getPutPoolRemindCustomerPage(pageVO, getLoginUserId()); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java index 981fb9350..41d6b30b2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java @@ -528,7 +528,7 @@ public class DashboardController { @GetMapping("/getTaskStatistics") @Operation(summary = "获得各设备统计个数") @Parameter(name = "orgId", description = "产线组织Id") - //@PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult getTaskStatistics(@RequestParam(name = "orgId") Long orgId) { EventStatisticsVO vo = new EventStatisticsVO(); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/devicecriticalcomponent/DeviceCriticalComponentController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/devicecriticalcomponent/DeviceCriticalComponentController.java index b56d5191a..d1c033444 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/devicecriticalcomponent/DeviceCriticalComponentController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/devicecriticalcomponent/DeviceCriticalComponentController.java @@ -65,7 +65,7 @@ public class DeviceCriticalComponentController { @GetMapping("/get") @Operation(summary = "获得设备关键件明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:device-critical-component:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-critical-component:query')") public CommonResult getDeviceCriticalComponent(@RequestParam("id") Long id) { DeviceCriticalComponentDO deviceCriticalComponent = deviceCriticalComponentService.getDeviceCriticalComponent(id); return success(BeanUtils.toBean(deviceCriticalComponent, DeviceCriticalComponentRespVO.class)); @@ -81,7 +81,7 @@ public class DeviceCriticalComponentController { @GetMapping("/page") @Operation(summary = "获得设备关键件明细分页") - @PreAuthorize("@ss.hasPermission('mes:critical-component:query')") + // @PreAuthorize("@ss.hasPermission('mes:critical-component:query')") public CommonResult> getDeviceCriticalComponentPage(@Valid DeviceCriticalComponentPageReqVO pageReqVO) { PageResult pageResult = deviceCriticalComponentService.getDeviceCriticalComponentPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DeviceCriticalComponentRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerComponentRelController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerComponentRelController.java index dcf51fb22..e06bf454b 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerComponentRelController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerComponentRelController.java @@ -52,7 +52,7 @@ public class DeviceLedgerComponentRelController { @GetMapping("/get") @Operation(summary = "获得设备台账关键件关系") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult get(@RequestParam("id") Long id) { return success(deviceLedgerComponentRelService.get(id)); } @@ -60,7 +60,7 @@ public class DeviceLedgerComponentRelController { @GetMapping("/list-by-device-ledger-id") @Operation(summary = "根据设备台账ID获得关键件关系列表") @Parameter(name = "deviceLedgerId", description = "设备台账ID", required = true) - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult> listByDeviceLedgerId(@RequestParam("deviceLedgerId") Long deviceLedgerId) { return success(deviceLedgerComponentRelService.getListByDeviceLedgerId(deviceLedgerId)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java index a6d04509e..63cfb522d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java @@ -100,7 +100,7 @@ public class DeviceLedgerController { @GetMapping("/get") @Operation(summary = "获得设备台账") - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult getDeviceLedger(@RequestParam(value = "id", required = false) Long id, @RequestParam(value = "code", required = false) String code) { DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(id, code); @@ -133,7 +133,7 @@ public class DeviceLedgerController { @GetMapping("/page") @Operation(summary = "获得设备台账分页") - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult getDeviceLedgerPage(@Valid DeviceLedgerPageReqVO pageReqVO) { DeviceLedgerPageRespVO respVO = deviceLedgerService.getDeviceLedgerPageWithStatistics(pageReqVO); // 填充车间名称 @@ -170,7 +170,7 @@ public class DeviceLedgerController { @GetMapping("/list") @Operation(summary = "获得设备台账列表") - @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('mes:device-ledger:query')") public CommonResult> getDeviceLedgerList(@Valid DeviceLedgerPageReqVO pageReqVO) { List deviceLedgerDOList = deviceLedgerService.getDeviceLedgerList(pageReqVO); return success(deviceLedgerDOList); @@ -178,7 +178,7 @@ public class DeviceLedgerController { @GetMapping("/noUsedlist") @Operation(summary = "获得未关联设备台账列表") - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult> getDeviceLedgerListByNoUsed() { List deviceLedgerDOList = deviceLedgerService.getDeviceLedgerList(); deviceLedgerDOList.removeIf(device -> @@ -189,7 +189,7 @@ public class DeviceLedgerController { @GetMapping("/noUsedlist2") @Operation(summary = "获得未关联设备台账列表") - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult> getDeviceLedgerList2ByNoUsed(@RequestParam("id") Long id) { List deviceLedgerDOList = deviceLedgerService.getDeviceLedgerList(); deviceLedgerDOList.removeIf(device -> @@ -216,7 +216,7 @@ public class DeviceLedgerController { @GetMapping("/capacity-report/page") @Operation(summary = "获得设备产能报表分页") - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult> getDeviceCapacityReportPage(@Valid DeviceCapacityReportPageReqVO pageReqVO) { return success(deviceLedgerService.getDeviceCapacityReportPage(pageReqVO)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerSpareRelController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerSpareRelController.java index b38c8fe7d..9c324edc9 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerSpareRelController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerSpareRelController.java @@ -52,7 +52,7 @@ public class DeviceLedgerSpareRelController { @GetMapping("/get") @Operation(summary = "获得设备台账备件关系") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult get(@RequestParam("id") Long id) { return success(deviceLedgerSpareRelService.get(id)); } @@ -60,7 +60,7 @@ public class DeviceLedgerSpareRelController { @GetMapping("/list-by-device-ledger-id") @Operation(summary = "根据设备台账ID获得备件关系列表") @Parameter(name = "deviceLedgerId", description = "设备台账ID", required = true) - @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult> listByDeviceLedgerId(@RequestParam("deviceLedgerId") Long deviceLedgerId) { return success(deviceLedgerSpareRelService.getListByDeviceLedgerId(deviceLedgerId)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceline/DeviceLineController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceline/DeviceLineController.java index e9e75d08f..b3d97b469 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceline/DeviceLineController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceline/DeviceLineController.java @@ -82,7 +82,7 @@ public class DeviceLineController { @GetMapping("/get") @Operation(summary = "获得设备产线") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:device-line:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-line:query')") public CommonResult getDeviceLine(@RequestParam("id") Long id) { DeviceLineDO deviceLine = deviceLineService.getDeviceLine(id); DeviceLineRespVO deviceLineRespVO = BeanUtils.toBean(deviceLine, DeviceLineRespVO.class); @@ -93,7 +93,7 @@ public class DeviceLineController { @GetMapping("/page") @Operation(summary = "获得设备产线分页") - @PreAuthorize("@ss.hasPermission('mes:device-line:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-line:query')") public CommonResult> getDeviceLinePage(@Valid DeviceLinePageReqVO pageReqVO) { PageResult pageResult = deviceLineService.getDeviceLinePage(pageReqVO); PageResult respVOPageResult = BeanUtils.toBean(pageResult, DeviceLineRespVO.class); @@ -113,7 +113,7 @@ public class DeviceLineController { @GetMapping("/list") @Operation(summary = "获得设备产线列表") - @PreAuthorize("@ss.hasPermission('mes:device-line:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-line:query')") public CommonResult> getDeviceLineList(@Valid DeviceLineListReqVO listReqVO) { List list = deviceLineService.getDeviceLineList(listReqVO); return success(BeanUtils.toBean(list, DeviceLineRespVO.class)); @@ -121,7 +121,7 @@ public class DeviceLineController { @GetMapping("/tree") @Operation(summary = "获得设备产线树") - @PreAuthorize("@ss.hasPermission('mes:device-line:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-line:query')") public CommonResult> getDeviceLineTree(@Valid DeviceLineListReqVO pageReqVO) { List tree = deviceLineService.getDeviceLineTree(pageReqVO); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/devicetype/DeviceTypeController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/devicetype/DeviceTypeController.java index 93ba2b66a..b856c7a49 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/devicetype/DeviceTypeController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/devicetype/DeviceTypeController.java @@ -78,7 +78,7 @@ public class DeviceTypeController { @GetMapping("/get") @Operation(summary = "获得设备类型") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:device-type:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-type:query')") public CommonResult getDeviceType(@RequestParam("id") Long id) { DeviceTypeDO deviceType = deviceTypeService.getDeviceType(id); return success(BeanUtils.toBean(deviceType, DeviceTypeRespVO.class)); @@ -86,7 +86,7 @@ public class DeviceTypeController { @GetMapping("/page") @Operation(summary = "获得设备类型分页") - @PreAuthorize("@ss.hasPermission('mes:device-type:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-type:query')") public CommonResult> getDeviceTypePage(@Valid DeviceTypePageReqVO pageReqVO) { PageResult pageResult = deviceTypeService.getDeviceTypePage(pageReqVO); return success(BeanUtils.toBean(pageResult, DeviceTypeRespVO.class)); @@ -94,7 +94,7 @@ public class DeviceTypeController { @GetMapping("/list") @Operation(summary = "获得设备类型列表") - @PreAuthorize("@ss.hasPermission('mes:device-type:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-type:query')") public CommonResult> getDeviceTypeList(@Valid DeviceTypeListReqVO listReqVO) { List list = deviceTypeService.getDeviceTypeList(listReqVO); return success(BeanUtils.toBean(list, DeviceTypeRespVO.class)); @@ -102,7 +102,7 @@ public class DeviceTypeController { @GetMapping("/tree") @Operation(summary = "获得设备类型树") - @PreAuthorize("@ss.hasPermission('mes:device-type:query')") + // @PreAuthorize("@ss.hasPermission('mes:device-type:query')") public CommonResult> getDeviceTypeTree(@Valid DeviceTypeListReqVO pageReqVO) { List tree = deviceTypeService.getDeviceTypeTree(pageReqVO); return success(tree); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvcheck/DvCheckController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvcheck/DvCheckController.java index 335b47db5..8bb9722b9 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvcheck/DvCheckController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvcheck/DvCheckController.java @@ -65,7 +65,7 @@ public class DvCheckController { @GetMapping("/get") @Operation(summary = "获得维保计划") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:dv-check:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-check:query')") public CommonResult getDvCheck(@RequestParam("id") Long id) { DvCheckDO dvCheck = dvCheckService.getDvCheck(id); return success(BeanUtils.toBean(dvCheck, DvCheckRespVO.class)); @@ -73,7 +73,7 @@ public class DvCheckController { @GetMapping("/page") @Operation(summary = "获得维保计划分页") - @PreAuthorize("@ss.hasPermission('mes:dv-check:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-check:query')") public CommonResult> getDvCheckPage(@Valid DvCheckPageReqVO pageReqVO) { PageResult pageResult = dvCheckService.getDvCheckPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DvCheckRespVO.class)); @@ -97,7 +97,7 @@ public class DvCheckController { @GetMapping("/dv-check-device/list-by-plan-id") @Operation(summary = "获得维保计划设备列表") @Parameter(name = "planId", description = "计划ID") - @PreAuthorize("@ss.hasPermission('mes:dv-check:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-check:query')") public CommonResult> getDvCheckDeviceListByPlanId(@RequestParam("planId") Long planId) { return success(dvCheckService.getDvCheckDeviceListByPlanId(planId)); } @@ -107,7 +107,7 @@ public class DvCheckController { @GetMapping("/dv-check-subject/list-by-plan-id") @Operation(summary = "获得维保计划项目列表") @Parameter(name = "planId", description = "计划ID") - @PreAuthorize("@ss.hasPermission('mes:dv-check:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-check:query')") public CommonResult> getDvCheckSubjectListByPlanId(@RequestParam("planId") Long planId) { return success(dvCheckService.getDvCheckSubjectListByPlanId(planId)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java index 22f4480b2..75b80d3e4 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java @@ -82,7 +82,7 @@ public class DvRepairController { @GetMapping("/get") @Operation(summary = "获得设备维修记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')") public CommonResult getDvRepair(@RequestParam("id") Long id) { DvRepairDO dvRepair = dvRepairService.getDvRepair(id); return success(BeanUtils.toBean(dvRepair, DvRepairRespVO.class)); @@ -90,7 +90,7 @@ public class DvRepairController { @GetMapping("/page") @Operation(summary = "获得设备维修记录分页") - @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')") public CommonResult getDvRepairPage(@Valid DvRepairPageReqVO pageReqVO) { DvRepairPageRespVO respVO = dvRepairService.getDvRepairPageWithStatistics(pageReqVO); respVO.setList(buildCreatorName(respVO.getList())); @@ -99,7 +99,7 @@ public class DvRepairController { @GetMapping("/list") @Operation(summary = "获得设备维修记录列表") - @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')") public CommonResult> getDvRepairList(@Valid DvRepairPageReqVO pageReqVO) { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = dvRepairService.getDvRepairPage(pageReqVO).getList(); @@ -157,7 +157,7 @@ public class DvRepairController { @GetMapping("/dv-repair-line/list-by-repair-id") @Operation(summary = "获得设备维修记录行列表") @Parameter(name = "repairId", description = "维修单ID") - @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')") public CommonResult> getDvRepairLineListByRepairId(@RequestParam("repairId") Long repairId) { return success(dvRepairService.getDvRepairLineListByRepairId(repairId)); } @@ -193,7 +193,7 @@ public class DvRepairController { @GetMapping("/getRepairListByDeviceId") @Operation(summary = "根据设备Id获得维修历史记录") @Parameter(name = "deviceId", description = "设备Id", required = false, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-repair:query')") public CommonResult> getRepairListByDeviceId(@RequestParam(value = "deviceId", required = false) Long deviceId, @RequestParam(value = "code", required = false) String code, @RequestParam(name = "startTime",required = false) String startTime, diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/DvSubjectController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/DvSubjectController.java index 246784684..91c7c7781 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/DvSubjectController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/DvSubjectController.java @@ -88,7 +88,7 @@ public class DvSubjectController { @GetMapping("/get") @Operation(summary = "获得维保项目") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')") public CommonResult getDvSubject(@RequestParam("id") Long id) { DvSubjectDO dvSubject = dvSubjectService.getDvSubject(id); return success(BeanUtils.toBean(dvSubject, DvSubjectRespVO.class)); @@ -96,7 +96,7 @@ public class DvSubjectController { @GetMapping("/page") @Operation(summary = "获得维保项目分页") - @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')") public CommonResult> getDvSubjectPage(@Valid DvSubjectPageReqVO pageReqVO) { PageResult pageResult = dvSubjectService.getDvSubjectPage(pageReqVO); PageResult dvSubjectRespVOPageResult = BeanUtils.toBean(pageResult, DvSubjectRespVO.class); @@ -105,7 +105,7 @@ public class DvSubjectController { @GetMapping("/list") @Operation(summary = "获得维保项目列表") - @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')") + // @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')") public CommonResult> getDvSubjectList() { List dvSubjectDOList = dvSubjectService.getDvSubjectList(); return success(dvSubjectDOList); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceCheckRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceCheckRecordController.java index b024eee27..0a4f88cb4 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceCheckRecordController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceCheckRecordController.java @@ -64,7 +64,7 @@ public class EnergyDeviceCheckRecordController { @GetMapping("/get") @Operation(summary = "获得抄表记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:energy-device-check-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-device-check-record:query')") public CommonResult getEnergyDeviceCheckRecord(@RequestParam("id") Long id) { EnergyDeviceCheckRecordDO energyDeviceCheckRecord = energyDeviceCheckRecordService.getEnergyDeviceCheckRecord(id); return success(BeanUtils.toBean(energyDeviceCheckRecord, EnergyDeviceCheckRecordRespVO.class)); @@ -72,7 +72,7 @@ public class EnergyDeviceCheckRecordController { @GetMapping("/page") @Operation(summary = "获得抄表记录分页") - @PreAuthorize("@ss.hasPermission('mes:energy-device-check-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-device-check-record:query')") public CommonResult> getEnergyDeviceCheckRecordPage(@Valid EnergyDeviceCheckRecordPageReqVO pageReqVO) { PageResult pageResult = energyDeviceCheckRecordService.getEnergyDeviceCheckRecordPage(pageReqVO); PageResult pageResult1 = diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceController.java index d668cf31c..37c3e3d71 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceController.java @@ -64,7 +64,7 @@ public class EnergyDeviceController { @GetMapping("/get") @Operation(summary = "获得能源设备") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") public CommonResult getEnergyDevice(@RequestParam("id") Long id) { EnergyDeviceRespVO energyDeviceRespVO = energyDeviceService.getEnergyDevice(id); return success(energyDeviceRespVO); @@ -78,7 +78,7 @@ public class EnergyDeviceController { } @GetMapping("/page") @Operation(summary = "获得能源设备分页") - @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") public CommonResult> getEnergyDevicePage(@Valid EnergyDevicePageReqVO pageReqVO) { PageResult pageResult = energyDeviceService.getEnergyDevicePage(pageReqVO); return success(BeanUtils.toBean(pageResult, EnergyDeviceRespVO.class)); @@ -133,7 +133,7 @@ public class EnergyDeviceController { @GetMapping("/energy-device-check-record/page") @Operation(summary = "获得抄表记录分页") @Parameter(name = "deviceId", description = "能源设备Id") - @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") public CommonResult> getEnergyDeviceCheckRecordPage(PageParam pageReqVO, @RequestParam("deviceId") Long deviceId) { return success(energyDeviceService.getEnergyDeviceCheckRecordPage(pageReqVO, deviceId)); @@ -166,7 +166,7 @@ public class EnergyDeviceController { @GetMapping("/energy-device-check-record/get") @Operation(summary = "获得抄表记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") public CommonResult getEnergyDeviceCheckRecord(@RequestParam("id") Long id) { return success(energyDeviceService.getEnergyDeviceCheckRecord(id)); } @@ -174,7 +174,7 @@ public class EnergyDeviceController { @GetMapping("/lastEnergyStatistics") @Operation(summary = "获得近七小时能耗记录") - //@PreAuthorize("@ss.hasPermission('mes:energy-device:query')") + @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") public CommonResult> lastEnergyStatistics(@RequestParam("deviceTypeId") Long deviceTypeId, @RequestParam("orgId") Long orgId) { @@ -185,7 +185,7 @@ public class EnergyDeviceController { @GetMapping("/latestSevenDaysStatistics") @Operation(summary = "获得近七天能耗记录") - // @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") + @PreAuthorize("@ss.hasPermission('mes:energy-device:query')") public CommonResult> latestSevenDaysStatistics( @RequestParam Long deviceTypeId, @RequestParam Long orgId) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceReportController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceReportController.java index b43e73891..344dbe0c4 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceReportController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceReportController.java @@ -47,7 +47,7 @@ public class EnergyDeviceReportController { @GetMapping("/page") @Operation(summary = "获得抄表记录分页") - @PreAuthorize("@ss.hasPermission('mes:energy-device-report:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-device-report:query')") public CommonResult> getEnergyDeviceReportPage(@Valid EnergyDeviceReportPageReqVO pageReqVO) { PageResult pageResult = energyDeviceReportService.getEnergyDeviceReportPage(pageReqVO); return success(BeanUtils.toBean(pageResult, EnergyDeviceReportRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energyrecord/EnergyRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energyrecord/EnergyRecordController.java index 591d82db3..6a0f0f96d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energyrecord/EnergyRecordController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energyrecord/EnergyRecordController.java @@ -65,7 +65,7 @@ public class EnergyRecordController { @GetMapping("/get") @Operation(summary = "获得能源设备历史记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:energy-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-record:query')") public CommonResult getEnergyRecord(@RequestParam("id") Long id) { EnergyRecordDO energyRecord = energyRecordService.getEnergyRecord(id); return success(BeanUtils.toBean(energyRecord, EnergyRecordRespVO.class)); @@ -73,7 +73,7 @@ public class EnergyRecordController { @GetMapping("/page") @Operation(summary = "获得能源设备历史记录分页") - @PreAuthorize("@ss.hasPermission('mes:energy-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-record:query')") public CommonResult> getEnergyRecordPage(@Valid EnergyRecordPageReqVO pageReqVO) { PageResult pageResult = energyRecordService.getEnergyRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, EnergyRecordRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energytype/EnergyTypeController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energytype/EnergyTypeController.java index e3a31796f..82efbaf67 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energytype/EnergyTypeController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energytype/EnergyTypeController.java @@ -69,7 +69,7 @@ public class EnergyTypeController { @GetMapping("/get") @Operation(summary = "获得能耗类型") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:energy-type:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-type:query')") public CommonResult getEnergyType(@RequestParam("id") Long id) { EnergyTypeDO energyType = energyTypeService.getEnergyType(id); return success(BeanUtils.toBean(energyType, EnergyTypeRespVO.class)); @@ -77,7 +77,7 @@ public class EnergyTypeController { @GetMapping("/page") @Operation(summary = "获得能耗类型分页") - @PreAuthorize("@ss.hasPermission('mes:energy-type:query')") + // @PreAuthorize("@ss.hasPermission('mes:energy-type:query')") public CommonResult> getEnergyTypePage(@Valid EnergyTypePageReqVO pageReqVO) { PageResult pageResult = energyTypeService.getEnergyTypePage(pageReqVO); return success(BeanUtils.toBean(pageResult, EnergyTypeRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/errorrecord/ErrorRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/errorrecord/ErrorRecordController.java index cade5a8ae..c182c67c4 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/errorrecord/ErrorRecordController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/errorrecord/ErrorRecordController.java @@ -65,7 +65,7 @@ public class ErrorRecordController { @GetMapping("/get") @Operation(summary = "获得错误记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:error-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:error-record:query')") public CommonResult getErrorRecord(@RequestParam("id") Long id) { ErrorRecordDO errorRecord = errorRecordService.getErrorRecord(id); return success(BeanUtils.toBean(errorRecord, ErrorRecordRespVO.class)); @@ -73,7 +73,7 @@ public class ErrorRecordController { @GetMapping("/page") @Operation(summary = "获得错误记录分页") - @PreAuthorize("@ss.hasPermission('mes:error-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:error-record:query')") public CommonResult> getErrorRecordPage(@Valid ErrorRecordPageReqVO pageReqVO) { PageResult pageResult = errorRecordService.getErrorRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ErrorRecordRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/esopFile/EsopFileController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/esopFile/EsopFileController.java index f098db330..fd0879573 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/esopFile/EsopFileController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/esopFile/EsopFileController.java @@ -78,7 +78,7 @@ public class EsopFileController { @GetMapping("/get") @Operation(summary = "获得esop文件表库") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('esop:file:query')") + // @PreAuthorize("@ss.hasPermission('esop:file:query')") public CommonResult getFile(@RequestParam("id") Long id) { EsopFileDO file = fileService.getFile(id); return success(BeanUtils.toBean(file, EsopFileRespVO.class)); @@ -86,7 +86,7 @@ public class EsopFileController { @GetMapping("/page") @Operation(summary = "获得esop文件表库分页") - @PreAuthorize("@ss.hasPermission('esop:file:query')") + // @PreAuthorize("@ss.hasPermission('esop:file:query')") public CommonResult> getFilePage(@Valid EsopFilePageReqVO pageReqVO) { PageResult pageResult = fileService.getFilePage(pageReqVO); // 1.4 管理员信息 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/feedingplan/FeedingRecordPlanController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/feedingplan/FeedingRecordPlanController.java index 463347fa2..f62bdd024 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/feedingplan/FeedingRecordPlanController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/feedingplan/FeedingRecordPlanController.java @@ -88,7 +88,7 @@ public class FeedingRecordPlanController { @GetMapping("/get") @Operation(summary = "获得投料分配计划") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:feeding-record-plan:query')") + // @PreAuthorize("@ss.hasPermission('mes:feeding-record-plan:query')") public CommonResult getFeedingRecordPlan(@RequestParam("id") Long id) { FeedingRecordPlanDO feedingRecordPlan = feedingRecordPlanService.getFeedingRecordPlan(id); return success(BeanUtils.toBean(feedingRecordPlan, FeedingRecordPlanRespVO.class)); @@ -96,7 +96,7 @@ public class FeedingRecordPlanController { @GetMapping("/page") @Operation(summary = "获得投料分配计划分页") - @PreAuthorize("@ss.hasPermission('mes:feeding-record-plan:query')") + // @PreAuthorize("@ss.hasPermission('mes:feeding-record-plan:query')") public CommonResult> getFeedingRecordPlanPage(@Valid FeedingRecordPlanPageReqVO pageReqVO) { PageResult pageResult = feedingRecordPlanService.getFeedingRecordPlanPage(pageReqVO); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/feedingrecord/FeedingRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/feedingrecord/FeedingRecordController.java index f4585d8a5..36604af08 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/feedingrecord/FeedingRecordController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/feedingrecord/FeedingRecordController.java @@ -113,7 +113,7 @@ public class FeedingRecordController { @GetMapping("/get") @Operation(summary = "获得投料记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:feeding-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:feeding-record:query')") public CommonResult getFeedingRecord(@RequestParam("id") Long id) { FeedingRecordDO feedingRecord = feedingRecordService.getFeedingRecord(id); return success(BeanUtils.toBean(feedingRecord, FeedingRecordRespVO.class)); @@ -121,7 +121,7 @@ public class FeedingRecordController { @GetMapping("/page") @Operation(summary = "获得投料记录分页") - @PreAuthorize("@ss.hasPermission('mes:feeding-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:feeding-record:query')") public CommonResult> getFeedingRecordPage(@Valid FeedingRecordPageReqVO pageReqVO) { PageResult pageResult = feedingRecordService.getFeedingRecordPage(pageReqVO); // List organizationList = organizationService.getOrganizationListByOutIds(convertSet(pageResult.getList(), FeedingRecordRespVO::getFeedingPipeline)); @@ -147,7 +147,7 @@ public class FeedingRecordController { } @GetMapping("/getRecordList") @Operation(summary = "投料记录 ") - @PreAuthorize("@ss.hasPermission('mes:feeding-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:feeding-record:query')") public CommonResult> getRecordList(@Valid FeedingRecordPageReqVO pageReqVO) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); if(pageReqVO.getFeedingTime()==null || pageReqVO.getFeedingTime().length==0){ @@ -162,7 +162,7 @@ public class FeedingRecordController { @GetMapping("/feeding-record-detail/list-by-record-id") @Operation(summary = "获得投料记录明细列表") @Parameter(name = "recordId", description = "记录id") - @PreAuthorize("@ss.hasPermission('mes:feeding-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:feeding-record:query')") public CommonResult> getFeedingRecordDetailListByRecordId(@RequestParam("recordId") Long recordId) { List detailDOList = feedingRecordService.getFeedingRecordDetailListByRecordId(recordId); return success(feedingRecordService.buildVOList(detailDOList)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/goview/GoviewController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/goview/GoviewController.java index d70d21ac7..f1188e210 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/goview/GoviewController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/goview/GoviewController.java @@ -65,7 +65,7 @@ public class GoviewController { @GetMapping("/get") @Operation(summary = "获得可视化大屏") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:goview:query')") + // @PreAuthorize("@ss.hasPermission('mes:goview:query')") public CommonResult getGoview(@RequestParam("id") Long id) { GoviewDO goview = goviewService.getGoview(id); return success(BeanUtils.toBean(goview, GoviewRespVO.class)); @@ -73,7 +73,7 @@ public class GoviewController { @GetMapping("/page") @Operation(summary = "获得可视化大屏分页") - @PreAuthorize("@ss.hasPermission('mes:goview:query')") + // @PreAuthorize("@ss.hasPermission('mes:goview:query')") public CommonResult> getGoviewPage(@Valid GoviewPageReqVO pageReqVO) { PageResult pageResult = goviewService.getGoviewPage(pageReqVO); return success(BeanUtils.toBean(pageResult, GoviewRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/ItemRequisitionController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/ItemRequisitionController.java index b4f68ab17..294e1c27d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/ItemRequisitionController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/ItemRequisitionController.java @@ -98,7 +98,7 @@ public class ItemRequisitionController { @GetMapping("/get") @Operation(summary = "获得生产领料") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:item-requisition:query')") + // @PreAuthorize("@ss.hasPermission('mes:item-requisition:query')") public CommonResult getItemRequisition(@RequestParam("id") Long id) { ItemRequisitionDO itemRequisition = itemRequisitionService.getItemRequisition(id); return success(BeanUtils.toBean(itemRequisition, ItemRequisitionRespVO.class)); @@ -106,7 +106,7 @@ public class ItemRequisitionController { @GetMapping("/page") @Operation(summary = "获得生产领料分页") - @PreAuthorize("@ss.hasPermission('mes:item-requisition:query')") + // @PreAuthorize("@ss.hasPermission('mes:item-requisition:query')") public CommonResult> getItemRequisitionPage(@Valid ItemRequisitionPageReqVO pageReqVO) { PageResult pageResult = itemRequisitionService.getItemRequisitionPage(pageReqVO); return success(new PageResult<>(buildVOList(pageResult.getList()), pageResult.getTotal())); @@ -151,7 +151,7 @@ public class ItemRequisitionController { @GetMapping("/item-requisition-detail/list-by-item-requisition-id") @Operation(summary = "获得领料明细列表") @Parameter(name = "itemRequisitionId", description = "领料单ID") - @PreAuthorize("@ss.hasPermission('mes:item-requisition:query')") + // @PreAuthorize("@ss.hasPermission('mes:item-requisition:query')") public CommonResult> getItemRequisitionDetailListByItemRequisitionId(@RequestParam("itemRequisitionId") Long itemRequisitionId) { List list = itemRequisitionService.getItemRequisitionDetailListByItemRequisitionId(itemRequisitionId); ItemRequisitionDO requisitionDO = itemRequisitionService.getItemRequisition(itemRequisitionId); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/MachineComponentController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/MachineComponentController.java index eb2ea67e3..520f76df7 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/MachineComponentController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/machine/MachineComponentController.java @@ -63,7 +63,7 @@ public class MachineComponentController { @GetMapping("/get") @Operation(summary = "获得机台") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:machine-component:query')") + // @PreAuthorize("@ss.hasPermission('mes:machine-component:query')") public CommonResult getMachineComponent(@RequestParam("id") Long id) { MachineComponentDO machineComponent = machineComponentService.getMachineComponent(id); return success(BeanUtils.toBean(machineComponent, MachineComponentRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldget/MoldGetController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldget/MoldGetController.java index c047cf769..68c30baa6 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldget/MoldGetController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldget/MoldGetController.java @@ -65,7 +65,7 @@ public class MoldGetController { @GetMapping("/get") @Operation(summary = "获得模具管理-领模申请") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-get:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-get:query')") public CommonResult getMoldGet(@RequestParam("id") Long id) { MoldGetDO moldGet = moldGetService.getMoldGet(id); return success(BeanUtils.toBean(moldGet, MoldGetRespVO.class)); @@ -73,7 +73,7 @@ public class MoldGetController { @GetMapping("/page") @Operation(summary = "获得模具管理-领模申请分页") - @PreAuthorize("@ss.hasPermission('mes:mold-get:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-get:query')") public CommonResult> getMoldGetPage(@Valid MoldGetPageReqVO pageReqVO) { PageResult pageResult = moldGetService.getMoldGetPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MoldGetRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldoperate/MoldOperateController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldoperate/MoldOperateController.java index c9087f454..98fd0a97f 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldoperate/MoldOperateController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldoperate/MoldOperateController.java @@ -136,7 +136,7 @@ public class MoldOperateController { @GetMapping("/get") @Operation(summary = "获得模具上下模") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-operate:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-operate:query')") public CommonResult getMoldOperate(@RequestParam("id") Long id) { MoldOperateDO moldOperate = moldOperateService.getMoldOperate(id); MoldOperateRespVO respVO = BeanUtils.toBean(moldOperate, MoldOperateRespVO.class); @@ -146,7 +146,7 @@ public class MoldOperateController { @GetMapping("/page") @Operation(summary = "获得模具上下模分页") - @PreAuthorize("@ss.hasPermission('mes:mold-operate:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-operate:query')") public CommonResult> getMoldOperatePage(@Valid MoldOperatePageReqVO pageReqVO) { PageResult pageResult = moldOperateService.getMoldOperatePage(pageReqVO); @@ -209,7 +209,7 @@ public class MoldOperateController { @GetMapping("/getLowerMoldList") @Operation(summary = "获得模具下模列表") @Parameter(name = "id", description = "设备id", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-operate:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-operate:query')") public CommonResult> getLowerMoldList(@RequestParam("id") Long id) { return success(moldOperateService.getLowerMoldList(id)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldplanmaintenance/MoldPlanMaintenanceController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldplanmaintenance/MoldPlanMaintenanceController.java index 2bb8e3ac4..85bf1aa49 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldplanmaintenance/MoldPlanMaintenanceController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldplanmaintenance/MoldPlanMaintenanceController.java @@ -83,7 +83,7 @@ public class MoldPlanMaintenanceController { @GetMapping("/get") @Operation(summary = "获得方案维护") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-plan-maintenance:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-plan-maintenance:query')") public CommonResult getMoldPlanMaintenance(@RequestParam("id") Long id) { MoldPlanMaintenanceDO moldplanMaintenance = moldplanMaintenanceService.getMoldPlanMaintenance(id); return success(BeanUtils.toBean(moldplanMaintenance, MoldPlanMaintenanceRespVO.class)); @@ -91,7 +91,7 @@ public class MoldPlanMaintenanceController { @GetMapping("/page") @Operation(summary = "获得方案维护分页") - @PreAuthorize("@ss.hasPermission('mes:mold-plan-maintenance:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-plan-maintenance:query')") public CommonResult> getMoldPlanMaintenancePage(@Valid MoldPlanMaintenancePageReqVO pageReqVO) { PageResult pageResult = moldplanMaintenanceService.getMoldPlanMaintenancePage(pageReqVO); PageResult moldplanMaintenanceRespVOPageResult = BeanUtils.toBean(pageResult, MoldPlanMaintenanceRespVO.class); @@ -122,7 +122,7 @@ public class MoldPlanMaintenanceController { @GetMapping("/getSubjectList") @Operation(summary = "查询项目集合列表") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-plan-maintenance:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-plan-maintenance:query')") public CommonResult> getSubjectList(@RequestParam("id") Long id) { List subjectMoldPlanDOList = moldplanMaintenanceService.getSubjectList(id); return success(subjectMoldPlanDOList); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecord/MoldRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecord/MoldRecordController.java index 18096a210..f0491e748 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecord/MoldRecordController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecord/MoldRecordController.java @@ -64,7 +64,7 @@ public class MoldRecordController { @GetMapping("/get") @Operation(summary = "获得模具维保") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-record:query')") public CommonResult getMoldRecord(@RequestParam("id") Long id) { MoldRecordDO moldRecord = moldRecordService.getMoldRecord(id); return success(BeanUtils.toBean(moldRecord, MoldRecordRespVO.class)); @@ -72,7 +72,7 @@ public class MoldRecordController { @GetMapping("/page") @Operation(summary = "获得模具维保分页") - @PreAuthorize("@ss.hasPermission('mes:mold-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-record:query')") public CommonResult> getMoldRecordPage(@Valid MoldRecordPageReqVO pageReqVO) { PageResult pageResult = moldRecordService.getMoldRecordPage(pageReqVO); List list = moldRecordService.buildVOList(pageResult.getList()); @@ -98,7 +98,7 @@ public class MoldRecordController { @GetMapping("/mold-record-subject-detail/list-by-record-id") @Operation(summary = "获得模具维保明细列表") @Parameter(name = "recordId", description = "维保记录id") - @PreAuthorize("@ss.hasPermission('mes:mold-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-record:query')") public CommonResult> getMoldRecordSubjectDetailListByRecordId(@RequestParam("recordId") Long recordId) { return success(moldRecordService.getMoldRecordSubjectDetailListByRecordId(recordId)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecorditem/MoldRecordItemController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecorditem/MoldRecordItemController.java index 1b61af34b..7cf260ff1 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecorditem/MoldRecordItemController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecorditem/MoldRecordItemController.java @@ -65,7 +65,7 @@ public class MoldRecordItemController { @GetMapping("/get") @Operation(summary = "获得维保方案") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-record-item:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-record-item:query')") public CommonResult getMoldRecordItem(@RequestParam("id") Long id) { MoldRecordItemDO moldRecordItem = moldRecordItemService.getMoldRecordItem(id); return success(BeanUtils.toBean(moldRecordItem, MoldRecordItemRespVO.class)); @@ -73,7 +73,7 @@ public class MoldRecordItemController { @GetMapping("/page") @Operation(summary = "获得维保方案分页") - @PreAuthorize("@ss.hasPermission('mes:mold-record-item:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-record-item:query')") public CommonResult> getMoldRecordItemPage(@Valid MoldRecordItemPageReqVO pageReqVO) { PageResult pageResult = moldRecordItemService.getMoldRecordItemPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MoldRecordItemRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecordsubject/MoldRecordSubjectController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecordsubject/MoldRecordSubjectController.java index 3c13965c5..9710fe866 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecordsubject/MoldRecordSubjectController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrecordsubject/MoldRecordSubjectController.java @@ -63,7 +63,7 @@ public class MoldRecordSubjectController { @GetMapping("/get") @Operation(summary = "获得维保项目") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-record-subject:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-record-subject:query')") public CommonResult getMoldRecordSubject(@RequestParam("id") Long id) { MoldRecordSubjectDO moldRecordSubject = moldRecordSubjectService.getMoldRecordSubject(id); return success(BeanUtils.toBean(moldRecordSubject, MoldRecordSubjectRespVO.class)); @@ -71,7 +71,7 @@ public class MoldRecordSubjectController { @GetMapping("/page") @Operation(summary = "获得维保项目分页") - @PreAuthorize("@ss.hasPermission('mes:mold-record-subject:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-record-subject:query')") public CommonResult> getMoldRecordSubjectPage(@Valid MoldRecordSubjectPageReqVO pageReqVO) { PageResult pageResult = moldRecordSubjectService.getMoldRecordSubjectPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MoldRecordSubjectRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java index 7d75a899e..4c0687adb 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepair/MoldRepairController.java @@ -81,7 +81,7 @@ public class MoldRepairController { @GetMapping("/get") @Operation(summary = "获得模具维修记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-repair:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-repair:query')") public CommonResult getMoldRepair(@RequestParam("id") Long id) { MoldRepairDO moldRepair = moldRepairService.getMoldRepair(id); return success(BeanUtils.toBean(moldRepair, MoldRepairRespVO.class)); @@ -89,7 +89,7 @@ public class MoldRepairController { @GetMapping("/page") @Operation(summary = "获得模具维修记录分页") - @PreAuthorize("@ss.hasPermission('mes:mold-repair:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-repair:query')") public CommonResult getMoldRepairPage(@Valid MoldRepairPageReqVO pageReqVO) { MoldRepairPageRespVO respVO = moldRepairService.getMoldRepairPageWithStatistics(pageReqVO); if (respVO.getList() != null) { @@ -100,7 +100,7 @@ public class MoldRepairController { @GetMapping("/list") @Operation(summary = "获得模具维修记录列表") - @PreAuthorize("@ss.hasPermission('mes:mold-repair:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-repair:query')") public CommonResult> getMoldRepairList(@Valid MoldRepairPageReqVO pageReqVO) { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = moldRepairService.getMoldRepairPage(pageReqVO).getList(); @@ -151,7 +151,7 @@ public class MoldRepairController { @GetMapping("/mold-repair-line/list-by-repair-id") @Operation(summary = "获得模具维修记录行列表") @Parameter(name = "repairId", description = "维修单ID") - @PreAuthorize("@ss.hasPermission('mes:mold-repair:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-repair:query')") public CommonResult> getMoldRepairLineListByRepairId(@RequestParam("repairId") Long repairId) { return success(moldRepairService.getMoldRepairLineListByRepairId(repairId)); } @@ -186,7 +186,7 @@ public class MoldRepairController { @GetMapping("/getRepairListByMoldId") @Operation(summary = "根据模具Id获得维修历史记录") @Parameter(name = "moldId", description = "模具Id", required = false, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold_ticket-management:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold_ticket-management:query')") public CommonResult> getRepairListByMoldId(@RequestParam(value = "moldId", required = false) Long moldId, @RequestParam(value = "code", required = false) String code, @RequestParam(name = "startTime",required = false) String startTime, diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepairtems/MoldRepairTemsController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepairtems/MoldRepairTemsController.java index 4eac5a69a..86a3d87b5 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepairtems/MoldRepairTemsController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldrepairtems/MoldRepairTemsController.java @@ -71,7 +71,7 @@ public class MoldRepairTemsController { @GetMapping("/get") @Operation(summary = "获得维修项目") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-repair-tems:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-repair-tems:query')") public CommonResult getMoldRepairTems(@RequestParam("id") Long id) { MoldRepairTemsDO moldrepairTems = moldrepairTemsService.getMoldRepairTems(id); return success(BeanUtils.toBean(moldrepairTems, MoldRepairTemsRespVO.class)); @@ -79,7 +79,7 @@ public class MoldRepairTemsController { @GetMapping("/page") @Operation(summary = "获得维修项目分页") - @PreAuthorize("@ss.hasPermission('mes:mold-repair-tems:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-repair-tems:query')") public CommonResult> getMoldRepairTemsPage(@Valid MoldRepairTemsPageReqVO pageReqVO) { PageResult pageResult = moldrepairTemsService.getMoldRepairTemsPage(pageReqVO); return success(pageResult); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldreturn/MoldReturnController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldreturn/MoldReturnController.java index 727a41560..f3466e60c 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldreturn/MoldReturnController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldreturn/MoldReturnController.java @@ -65,7 +65,7 @@ public class MoldReturnController { @GetMapping("/get") @Operation(summary = "获得模具管理-模具入库") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-return:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-return:query')") public CommonResult getMoldReturn(@RequestParam("id") Long id) { MoldReturnDO moldReturn = moldReturnService.getMoldReturn(id); return success(BeanUtils.toBean(moldReturn, MoldReturnRespVO.class)); @@ -73,7 +73,7 @@ public class MoldReturnController { @GetMapping("/page") @Operation(summary = "获得模具管理-模具入库分页") - @PreAuthorize("@ss.hasPermission('mes:mold-return:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-return:query')") public CommonResult> getMoldReturnPage(@Valid MoldReturnPageReqVO pageReqVO) { PageResult pageResult = moldReturnService.getMoldReturnPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MoldReturnRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldsubject/MoldSubjectController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldsubject/MoldSubjectController.java index 589a2e210..24182f2e2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldsubject/MoldSubjectController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldsubject/MoldSubjectController.java @@ -89,7 +89,7 @@ public class MoldSubjectController { @GetMapping("/get") @Operation(summary = "获得维保项目") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-subject:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-subject:query')") public CommonResult getMoldSubject(@RequestParam("id") Long id) { MoldSubjectDO moldSubject = moldSubjectService.getMoldSubject(id); return success(BeanUtils.toBean(moldSubject, MoldSubjectRespVO.class)); @@ -97,7 +97,7 @@ public class MoldSubjectController { @GetMapping("/page") @Operation(summary = "获得维保项目分页") - @PreAuthorize("@ss.hasPermission('mes:mold-subject:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-subject:query')") public CommonResult> getMoldSubjectPage(@Valid MoldSubjectPageReqVO pageReqVO) { PageResult pageResult = moldSubjectService.getMoldSubjectPage(pageReqVO); PageResult moldSubjectRespVOPageResult = BeanUtils.toBean(pageResult, MoldSubjectRespVO.class); @@ -189,7 +189,7 @@ public class MoldSubjectController { @GetMapping("/getAllList") @Operation(summary = "获得模具维保项目列表") - @PreAuthorize("@ss.hasPermission('mes:mold-subject:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-subject:query')") public CommonResult> getMoldSubjectAllList() { List doList = moldSubjectService.getAllList(); return success(doList); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/MoldTaskManagementController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/MoldTaskManagementController.java index 22cb79388..5bc3ac684 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/MoldTaskManagementController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldtaskmanagement/MoldTaskManagementController.java @@ -78,7 +78,7 @@ public class MoldTaskManagementController { @GetMapping("/get") @Operation(summary = "获得任务管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-task-management:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-task-management:query')") public CommonResult getMoldTaskManagement(@RequestParam("id") Long id) { MoldTaskManagementDO moldtaskManagement = moldtaskManagementService.getMoldTaskManagement(id); return success(BeanUtils.toBean(moldtaskManagement, MoldTaskManagementRespVO.class)); @@ -86,7 +86,7 @@ public class MoldTaskManagementController { @GetMapping("/page") @Operation(summary = "获得任务管理分页") - @PreAuthorize("@ss.hasPermission('mes:mold-task-management:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-task-management:query')") public CommonResult getMoldTaskManagementPage(@Valid MoldTaskManagementPageReqVO pageReqVO) { MoldTaskManagementPageRespVO respVO = moldtaskManagementService.getMoldTaskManagementPageWithStatistics(pageReqVO); if (respVO.getList() != null) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/MoldTicketManagementController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/MoldTicketManagementController.java index 451eee0b6..f7b648a79 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/MoldTicketManagementController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketmanagement/MoldTicketManagementController.java @@ -83,7 +83,7 @@ public class MoldTicketManagementController { @GetMapping("/get") @Operation(summary = "获得工单管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-ticket-management:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-ticket-management:query')") public CommonResult getMoldTicketManagement(@RequestParam("id") Long id) { MoldTicketManagementDO moldticketManagement = moldticketManagementService.getMoldTicketManagement(id); return success(BeanUtils.toBean(moldticketManagement, MoldTicketManagementRespVO.class)); @@ -91,7 +91,7 @@ public class MoldTicketManagementController { @GetMapping("/page") @Operation(summary = "获得工单管理分页") - @PreAuthorize("@ss.hasPermission('mes:mold-ticket-management:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-ticket-management:query')") public CommonResult getMoldTicketManagementPage(@Valid MoldTicketManagementPageReqVO pageReqVO) { MoldTicketManagementPageRespVO respVO = moldticketManagementService.getMoldTicketManagementPageWithStatistics(pageReqVO); if (respVO.getList() != null) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketresults/MoldTicketResultsController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketresults/MoldTicketResultsController.java index ea3f2dac5..0ab813a71 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketresults/MoldTicketResultsController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/moldticketresults/MoldTicketResultsController.java @@ -65,7 +65,7 @@ public class MoldTicketResultsController { @GetMapping("/get") @Operation(summary = "获得工单检验结果") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:mold-ticket-results:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-ticket-results:query')") public CommonResult getMoldTicketResults(@RequestParam("id") Long id) { MoldTicketResultsDO moldticketResults = moldticketResultsService.getMoldTicketResults(id); return success(BeanUtils.toBean(moldticketResults, MoldTicketResultsRespVO.class)); @@ -73,7 +73,7 @@ public class MoldTicketResultsController { @GetMapping("/page") @Operation(summary = "获得工单检验结果分页") - @PreAuthorize("@ss.hasPermission('mes:mold-ticket-results:query')") + // @PreAuthorize("@ss.hasPermission('mes:mold-ticket-results:query')") public CommonResult> getMoldTicketResultsPage(@Valid MoldTicketResultsPageReqVO pageReqVO) { PageResult pageResult = moldticketResultsService.getMoldTicketResultsPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MoldTicketResultsRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java index 883d1d0dc..9c7a90371 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java @@ -60,21 +60,21 @@ public class OrganizationController { @GetMapping("/get") @Operation(summary = "获得产线工位") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:organization:query')") + // @PreAuthorize("@ss.hasPermission('mes:organization:query')") public CommonResult getOrganization(@RequestParam("id") Long id) { return success(organizationService.getOrganizationVO(id)); } @GetMapping("/list") @Operation(summary = "获得产线工位列表") - @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('mes:organization:query')") + // @PreAuthorize("@ss.isInnerProfile() || @ss.hasPermission('mes:organization:query')") public CommonResult> getOrganizationList(@Valid OrganizationListReqVO listReqVO) { List list = organizationService.getOrganizationList(listReqVO); return success(organizationService.buildVOList(list)); } @GetMapping("/listOrgWorker") @Operation(summary = "获得派工工位列表") - @PreAuthorize("@ss.hasPermission('mes:organization:query')") + // @PreAuthorize("@ss.hasPermission('mes:organization:query')") public CommonResult> getListOrgWorker(@Valid OrganizationListReqVO listReqVO) { List list = organizationService.getOrganizationList(listReqVO); return success(organizationService.buildWorkerVOList(list)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java index fc65646e6..eedb20a31 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java @@ -22,6 +22,7 @@ import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,7 +49,7 @@ public class OrgWorkerController { @PostMapping("/create") @Operation(summary = "创建工位安排") - //@PreAuthorize("@ss.hasPermission('mes:org-worker:create')") + @PreAuthorize("@ss.hasPermission('mes:org-worker:create')") public CommonResult createOrgWorker(@Valid @RequestBody OrgWorkerSaveReqVO createReqVO) { return success(orgWorkerService.createOrgWorker(createReqVO)); } @@ -59,7 +60,7 @@ public class OrgWorkerController { } @PutMapping("/update") @Operation(summary = "更新工位安排") - //@PreAuthorize("@ss.hasPermission('mes:org-worker:update')") + @PreAuthorize("@ss.hasPermission('mes:org-worker:update')") public CommonResult updateOrgWorker(@Valid @RequestBody OrgWorkerSaveReqVO updateReqVO) { orgWorkerService.updateOrgWorker(updateReqVO); return success(true); @@ -68,7 +69,7 @@ public class OrgWorkerController { @DeleteMapping("/delete") @Operation(summary = "删除工位安排") @Parameter(name = "id", description = "编号", required = true) - //@PreAuthorize("@ss.hasPermission('mes:org-worker:delete')") + @PreAuthorize("@ss.hasPermission('mes:org-worker:delete')") public CommonResult deleteOrgWorker(@RequestParam("id") Long id) { orgWorkerService.deleteOrgWorker(id); return success(true); @@ -92,7 +93,7 @@ public class OrgWorkerController { @GetMapping("/export-excel") @Operation(summary = "导出工位安排 Excel") - //@PreAuthorize("@ss.hasPermission('mes:org-worker:export')") + @PreAuthorize("@ss.hasPermission('mes:org-worker:export')") @ApiAccessLog(operateType = EXPORT) public void exportOrgWorkerExcel(@Valid OrgWorkerPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/paigongrecord/PaigongRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/paigongrecord/PaigongRecordController.java index c7990954f..632cc78f2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/paigongrecord/PaigongRecordController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/paigongrecord/PaigongRecordController.java @@ -77,7 +77,7 @@ public class PaigongRecordController { @GetMapping("/get") @Operation(summary = "获得计划派工记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:paigong-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:paigong-record:query')") public CommonResult getPaigongRecord(@RequestParam("id") Long id) { PaigongRecordDO paigongRecord = paigongRecordService.getPaigongRecord(id); return success(BeanUtils.toBean(paigongRecord, PaigongRecordRespVO.class)); @@ -85,7 +85,7 @@ public class PaigongRecordController { @GetMapping("/page") @Operation(summary = "获得计划派工记录分页") - @PreAuthorize("@ss.hasPermission('mes:paigong-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:paigong-record:query')") public CommonResult> getPaigongRecordPage(@Valid PaigongRecordPageReqVO pageReqVO) { PageResult pageResult = paigongRecordService.getPaigongRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PaigongRecordRespVO.class)); @@ -109,7 +109,7 @@ public class PaigongRecordController { @GetMapping("/list-by-item-plan-id") @Operation(summary = "获得派工记录明细列表") @Parameter(name = "planId", description = "计划ID") - @PreAuthorize("@ss.hasPermission('mes:paigong-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:paigong-record:query')") public CommonResult> getPaigongRecordListByPlanId(@RequestParam("planId") Long planId) { List pageResult = paigongRecordService.getPaigongRecordListByPlanId(planId); //return success(BeanUtils.toBean(pageResult, PaigongRecordRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java index 338090113..5731bd705 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java @@ -195,7 +195,7 @@ public class PlanController { @GetMapping("/get") @Operation(summary = "获得生产计划") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:plan:query')") + // @PreAuthorize("@ss.hasPermission('mes:plan:query')") public CommonResult getPlan(@RequestParam("id") Long id) { PlanDO plan = planService.getPlan(id); return success(planService.getPlanRespVO(plan)); @@ -203,7 +203,7 @@ public class PlanController { @GetMapping("/page") @Operation(summary = "获得生产计划分页") - @PreAuthorize("@ss.hasPermission('mes:plan:query')") + // @PreAuthorize("@ss.hasPermission('mes:plan:query')") public CommonResult> getPlanPage(@Valid PlanPageReqVO pageReqVO) { PageResult pageResult = planService.getPlanPage(pageReqVO); return success(new PageResult<>(buildVOList(pageResult.getList()), pageResult.getTotal())); @@ -676,7 +676,7 @@ public class PlanController { @GetMapping("/getLastSevenDaysCompletedCount") @Operation(summary = "获取过去7天每天完工数量统计") - //@PreAuthorize("@ss.hasPermission('mes:plan:query')") + @PreAuthorize("@ss.hasPermission('mes:plan:query')") @Parameter(name = "orgId", description = "产线组织Id", required = true, example = "1024") public CommonResult>> getLastSevenDaysCompletedCount( @RequestParam(name = "orgId" ,required = false) Long orgId) { List> dayCounts = planService.getLastSevenDaysCompletedCount(); @@ -692,7 +692,7 @@ public class PlanController { @GetMapping("/product-capacity-page") @Operation(summary = "按产品分组查询近半年日报工均值产能分页") - @PreAuthorize("@ss.hasPermission('mes:plan:query')") + // @PreAuthorize("@ss.hasPermission('mes:plan:query')") public CommonResult> getPlanProductCapacityPage(@Valid PlanProductCapacityPageReqVO reqVO) { return success(planService.getPlanProductCapacityPage(reqVO)); } @@ -715,7 +715,7 @@ public class PlanController { @GetMapping("/line-change-record/page") @Operation(summary = "获得生产计划换线记录分页") - @PreAuthorize("@ss.hasPermission('mes:plan:query')") + // @PreAuthorize("@ss.hasPermission('mes:plan:query')") public CommonResult> getLineChangeRecordPage(@Valid PlanLineChangeRecordPageReqVO pageReqVO) { return success(planService.getLineChangeRecordPage(pageReqVO)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planmaintenance/PlanMaintenanceController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planmaintenance/PlanMaintenanceController.java index 79454a1fd..f0d36787a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planmaintenance/PlanMaintenanceController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planmaintenance/PlanMaintenanceController.java @@ -84,7 +84,7 @@ public class PlanMaintenanceController { @GetMapping("/get") @Operation(summary = "获得方案维护") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')") + // @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')") public CommonResult getPlanMaintenance(@RequestParam("id") Long id) { PlanMaintenanceDO planMaintenance = planMaintenanceService.getPlanMaintenance(id); return success(BeanUtils.toBean(planMaintenance, PlanMaintenanceRespVO.class)); @@ -92,7 +92,7 @@ public class PlanMaintenanceController { @GetMapping("/page") @Operation(summary = "获得方案维护分页") - @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')") + // @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')") public CommonResult> getPlanMaintenancePage(@Valid PlanMaintenancePageReqVO pageReqVO) { PageResult pageResult = planMaintenanceService.getPlanMaintenancePage(pageReqVO); PageResult planMaintenanceRespVOPageResult = BeanUtils.toBean(pageResult, PlanMaintenanceRespVO.class); @@ -102,7 +102,7 @@ public class PlanMaintenanceController { @GetMapping("/list") @Operation(summary = "获得方案维护列表") - @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')") + // @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')") public CommonResult> getPlanMaintenanceList() { List planMaintenanceList = planMaintenanceService.getPlanMaintenanceList(); return success(planMaintenanceList); @@ -137,7 +137,7 @@ public class PlanMaintenanceController { @GetMapping("/getSubjectList") @Operation(summary = "查询项目集合列表") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')") + // @PreAuthorize("@ss.hasPermission('mes:plan-maintenance:query')") public CommonResult> getSubjectList(@RequestParam("id") Long id) { List subjectPlanDOList = planMaintenanceService.getSubjectList(id); return success(subjectPlanDOList); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planrecord/PlanRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planrecord/PlanRecordController.java index 62b2f3acb..672eb9edc 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planrecord/PlanRecordController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/planrecord/PlanRecordController.java @@ -65,7 +65,7 @@ public class PlanRecordController { @GetMapping("/get") @Operation(summary = "获得生产计划操作记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:plan-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:plan-record:query')") public CommonResult getPlanRecord(@RequestParam("id") Long id) { PlanRecordDO planRecord = planRecordService.getPlanRecord(id); return success(BeanUtils.toBean(planRecord, PlanRecordRespVO.class)); @@ -73,7 +73,7 @@ public class PlanRecordController { @GetMapping("/page") @Operation(summary = "获得生产计划操作记录分页") - @PreAuthorize("@ss.hasPermission('mes:plan-record:query')") + // @PreAuthorize("@ss.hasPermission('mes:plan-record:query')") public CommonResult> getPlanRecordPage(@Valid PlanRecordPageReqVO pageReqVO) { PageResult pageResult = planRecordService.getPlanRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PlanRecordRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java index 761deb687..4fbc5862d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printconfig/PrinterConfigController.java @@ -73,7 +73,7 @@ public class PrinterConfigController { @GetMapping("/get") @Operation(summary = "获得打印机配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('printer:config:query')") + // @PreAuthorize("@ss.hasPermission('printer:config:query')") public CommonResult getConfig(@RequestParam("id") Long id) { PrinterConfigDO config = configService.getConfig(id); return success(BeanUtils.toBean(config, PrinterConfigRespVO.class)); @@ -81,7 +81,7 @@ public class PrinterConfigController { @GetMapping("/page") @Operation(summary = "获得打印机配置分页") - @PreAuthorize("@ss.hasPermission('printer:config:query')") + // @PreAuthorize("@ss.hasPermission('printer:config:query')") public CommonResult> getConfigPage(@Valid PrinterConfigPageReqVO pageReqVO) throws UnknownHostException { PageResult pageResult = configService.getConfigPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PrinterConfigRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printtemplate/PrintTemplateController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printtemplate/PrintTemplateController.java index 77e584d18..4037900c7 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printtemplate/PrintTemplateController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/printtemplate/PrintTemplateController.java @@ -66,7 +66,7 @@ public class PrintTemplateController { @GetMapping("/get") @Operation(summary = "获得打印模板") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:print-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:print-template:query')") public CommonResult getPrintTemplate(@RequestParam("id") Long id) { PrintTemplateDO printTemplate = printTemplateService.getPrintTemplate(id); return success(BeanUtils.toBean(printTemplate, PrintTemplateRespVO.class)); @@ -74,7 +74,7 @@ public class PrintTemplateController { @GetMapping("/page") @Operation(summary = "获得打印模板分页") - @PreAuthorize("@ss.hasPermission('mes:print-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:print-template:query')") public CommonResult> getPrintTemplatePage(@Valid PrintTemplatePageReqVO pageReqVO) { PageResult pageResult = printTemplateService.getPrintTemplatePage(pageReqVO); return success(BeanUtils.toBean(pageResult, PrintTemplateRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/processparameter/ProcessParameterController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/processparameter/ProcessParameterController.java index 8478063f9..6eb60226e 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/processparameter/ProcessParameterController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/processparameter/ProcessParameterController.java @@ -63,7 +63,7 @@ public class ProcessParameterController { @GetMapping("/get") @Operation(summary = "获得工艺参数") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:process-parameter:query')") + // @PreAuthorize("@ss.hasPermission('mes:process-parameter:query')") public CommonResult getProcessParameter(@RequestParam("id") Long id) { ProcessParameterDO processParameter = processParameterService.getProcessParameter(id); return success(BeanUtils.toBean(processParameter, ProcessParameterRespVO.class)); @@ -71,7 +71,7 @@ public class ProcessParameterController { @GetMapping("/page") @Operation(summary = "获得工艺参数分页") - @PreAuthorize("@ss.hasPermission('mes:process-parameter:query')") + // @PreAuthorize("@ss.hasPermission('mes:process-parameter:query')") public CommonResult> getProcessParameterPage(@Valid ProcessParameterPageReqVO pageReqVO) { PageResult pageResult = processParameterService.getProcessParameterPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProcessParameterRespVO.class)); @@ -79,7 +79,7 @@ public class ProcessParameterController { @GetMapping("/list") @Operation(summary = "获得工艺参数列表") - @PreAuthorize("@ss.hasPermission('mes:process-parameter:query')") + // @PreAuthorize("@ss.hasPermission('mes:process-parameter:query')") public CommonResult> getProcessParameterList( @RequestParam(value = "isEnable", required = false) Boolean isEnable) { List list = processParameterService.getProcessParameterList(isEnable); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/processroute/ProcessRouteController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/processroute/ProcessRouteController.java index f1d8a01c0..19a453b6d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/processroute/ProcessRouteController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/processroute/ProcessRouteController.java @@ -63,14 +63,14 @@ public class ProcessRouteController { @GetMapping("/get") @Operation(summary = "获得工艺路线") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:process-route:query')") + // @PreAuthorize("@ss.hasPermission('mes:process-route:query')") public CommonResult getProcessRoute(@RequestParam("id") Long id) { return success(processRouteService.getProcessRouteResp(id)); } @GetMapping("/page") @Operation(summary = "获得工艺路线分页") - @PreAuthorize("@ss.hasPermission('mes:process-route:query')") + // @PreAuthorize("@ss.hasPermission('mes:process-route:query')") public CommonResult> getProcessRoutePage(@Valid ProcessRoutePageReqVO pageReqVO) { PageResult pageResult = processRouteService.getProcessRoutePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProcessRouteRespVO.class)); @@ -78,7 +78,7 @@ public class ProcessRouteController { @GetMapping("/list") @Operation(summary = "获得工艺路线列表") - @PreAuthorize("@ss.hasPermission('mes:process-route:query')") + // @PreAuthorize("@ss.hasPermission('mes:process-route:query')") public CommonResult> getProcessRouteList( @RequestParam(value = "isEnable", required = false) Boolean isEnable) { List list = processRouteService.getProcessRouteList(isEnable); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportController.java index 1a857b274..bbb0d90da 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportController.java @@ -18,6 +18,7 @@ import cn.iocoder.yudao.module.mes.service.workteam.WorkTeamService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -45,7 +46,7 @@ public class ProduceReportController { @PostMapping("/create") @Operation(summary = "创建生产报工单") - //@PreAuthorize("@ss.hasPermission('mes:produce-report:create')") + @PreAuthorize("@ss.hasPermission('mes:produce-report:create')") public CommonResult createProduceReport(@Valid @RequestBody ProduceReportSaveReqVO createReqVO) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime localDateTime = LocalDateTime.parse(createReqVO.getReportDateString(), formatter); @@ -55,7 +56,7 @@ public class ProduceReportController { @PutMapping("/update") @Operation(summary = "更新生产报工单") - //@PreAuthorize("@ss.hasPermission('mes:produce-report:update')") + @PreAuthorize("@ss.hasPermission('mes:produce-report:update')") public CommonResult updateProduceReport(@Valid @RequestBody ProduceReportSaveReqVO updateReqVO) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime localDateTime = LocalDateTime.parse(updateReqVO.getReportDateString(), formatter); @@ -67,7 +68,7 @@ public class ProduceReportController { @DeleteMapping("/delete") @Operation(summary = "删除生产报工单") @Parameter(name = "id", description = "编号", required = true) - //@PreAuthorize("@ss.hasPermission('mes:produce-report:delete')") + @PreAuthorize("@ss.hasPermission('mes:produce-report:delete')") public CommonResult deleteProduceReport(@RequestParam("id") Long id) { produceReportService.deleteProduceReport(id); return success(true); @@ -92,7 +93,7 @@ public class ProduceReportController { } @GetMapping("/pageDailyReport") @Operation(summary = "获得生产报工单分页") - //@PreAuthorize("@ss.hasPermission('mes:produce-report:query')") + @PreAuthorize("@ss.hasPermission('mes:produce-report:query')") public CommonResult> getPageDailyReport(@Valid ProduceReportPageReqVO pageReqVO) { PageResult pageResult = produceReportService.getProduceReportPage(pageReqVO); @@ -103,7 +104,7 @@ public class ProduceReportController { @GetMapping("/pageReplace") @Operation(summary = "获得生产报工单分页-代报工") - //@PreAuthorize("@ss.hasPermission('mes:produce-report:query')") + @PreAuthorize("@ss.hasPermission('mes:produce-report:query')") public CommonResult> getProduceReportPageReplace(@Valid ProduceReportPageReqVO pageReqVO) { Long userId = getLoginUserId(); WorkTeamDO workTeamDO = new WorkTeamDO().setTeamLeaderId(userId); @@ -123,7 +124,7 @@ public class ProduceReportController { } @GetMapping("/export-excel") @Operation(summary = "导出生产报工单 Excel") - //@PreAuthorize("@ss.hasPermission('mes:produce-report:export')") + @PreAuthorize("@ss.hasPermission('mes:produce-report:export')") @ApiAccessLog(operateType = EXPORT) public void exportProduceReportExcel(@Valid ProduceReportPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportDetailController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportDetailController.java index fa5ce3b82..eccdc382d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportDetailController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportDetailController.java @@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.mes.service.producereport.ProduceReportDetailServ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -41,7 +42,7 @@ public class ProduceReportDetailController { @PostMapping("/create") @Operation(summary = "创建生产报工明细") - //@PreAuthorize("@ss.hasPermission('mes:produce-report-detail:create')") + @PreAuthorize("@ss.hasPermission('mes:produce-report-detail:create')") public CommonResult createProduceReportDetail(@Valid @RequestBody ProduceReportDetailSaveReqVO createReqVO) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime localDateTime = LocalDateTime.parse(createReqVO.getReportDateString(), formatter); @@ -51,7 +52,7 @@ public class ProduceReportDetailController { @PutMapping("/update") @Operation(summary = "更新生产报工明细") - //@PreAuthorize("@ss.hasPermission('mes:produce-report-detail:update')") + @PreAuthorize("@ss.hasPermission('mes:produce-report-detail:update')") public CommonResult updateProduceReportDetail(@Valid @RequestBody ProduceReportDetailSaveReqVO updateReqVO) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime localDateTime = LocalDateTime.parse(updateReqVO.getReportDateString(), formatter); @@ -63,7 +64,7 @@ public class ProduceReportDetailController { @DeleteMapping("/delete") @Operation(summary = "删除生产报工明细") @Parameter(name = "id", description = "编号", required = true) - //@PreAuthorize("@ss.hasPermission('mes:produce-report-detail:delete')") + @PreAuthorize("@ss.hasPermission('mes:produce-report-detail:delete')") public CommonResult deleteProduceReportDetail(@RequestParam("id") Long id) { produceReportDetailService.deleteProduceReportDetail(id); return success(true); @@ -98,7 +99,7 @@ public class ProduceReportDetailController { } @GetMapping("/export-excel") @Operation(summary = "导出生产报工明细 Excel") - //@PreAuthorize("@ss.hasPermission('mes:produce-report-detail:export')") + @PreAuthorize("@ss.hasPermission('mes:produce-report-detail:export')") @ApiAccessLog(operateType = EXPORT) public void exportProduceReportDetailExcel(@Valid ProduceReportDetailPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereportplan/WorkReportPlanController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereportplan/WorkReportPlanController.java index a400484d1..a2a44829c 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereportplan/WorkReportPlanController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereportplan/WorkReportPlanController.java @@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.mes.service.workreportplan.WorkReportPlanService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -35,14 +36,14 @@ public class WorkReportPlanController { @PostMapping("/create") @Operation(summary = "创建报工分配计划") - //@PreAuthorize("@ss.hasPermission('mes:work-report-plan:create')") + @PreAuthorize("@ss.hasPermission('mes:work-report-plan:create')") public CommonResult createWorkReportPlan(@Valid @RequestBody WorkReportPlanSaveReqVO createReqVO) { return success(workReportPlanService.createWorkReportPlan(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新报工分配计划") - //@PreAuthorize("@ss.hasPermission('mes:work-report-plan:update')") + @PreAuthorize("@ss.hasPermission('mes:work-report-plan:update')") public CommonResult updateWorkReportPlan(@Valid @RequestBody WorkReportPlanSaveReqVO updateReqVO) { workReportPlanService.updateWorkReportPlan(updateReqVO); return success(true); @@ -51,7 +52,7 @@ public class WorkReportPlanController { @DeleteMapping("/delete") @Operation(summary = "删除报工分配计划") @Parameter(name = "id", description = "编号", required = true) - //@PreAuthorize("@ss.hasPermission('mes:work-report-plan:delete')") + @PreAuthorize("@ss.hasPermission('mes:work-report-plan:delete')") public CommonResult deleteWorkReportPlan(@RequestParam("id") Long id) { workReportPlanService.deleteWorkReportPlan(id); return success(true); @@ -75,7 +76,7 @@ public class WorkReportPlanController { } @GetMapping("/pageView") @Operation(summary = "获得报工分配计划分页") - //@PreAuthorize("@ss.hasPermission('mes:work-report-plan:query')") + @PreAuthorize("@ss.hasPermission('mes:work-report-plan:query')") public CommonResult> pageView(@Valid ReportPlanViewReqVO pageReqVO) { PageResult pageResult = workReportPlanService.getReportPlanViewPage(pageReqVO); return success(pageResult); @@ -83,7 +84,7 @@ public class WorkReportPlanController { @GetMapping("/export-excel") @Operation(summary = "导出报工分配计划 Excel") - //@PreAuthorize("@ss.hasPermission('mes:work-report-plan:export')") + @PreAuthorize("@ss.hasPermission('mes:work-report-plan:export')") @ApiAccessLog(operateType = EXPORT) public void exportWorkReportPlanExcel(@Valid WorkReportPlanPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/RecordTemplateController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/RecordTemplateController.java index 79f3f9b92..55ecab363 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/RecordTemplateController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/record/RecordTemplateController.java @@ -63,7 +63,7 @@ public class RecordTemplateController { @GetMapping("/get") @Operation(summary = "获得记录表") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult getRecordTemplate(@RequestParam("id") Long id) { RecordTemplateDO recordTemplate = recordTemplateService.getRecordTemplate(id); return success(BeanUtils.toBean(recordTemplate, RecordTemplateRespVO.class)); @@ -71,7 +71,7 @@ public class RecordTemplateController { @GetMapping("/page") @Operation(summary = "获得记录表分页") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult> getRecordTemplatePage(@Valid RecordTemplatePageReqVO pageReqVO) { PageResult pageResult = recordTemplateService.getRecordTemplatePage(pageReqVO); return success(BeanUtils.toBean(pageResult, RecordTemplateRespVO.class)); @@ -94,7 +94,7 @@ public class RecordTemplateController { @GetMapping("/record-suijiang/page") @Operation(summary = "获得碎浆记录分页") @Parameter(name = "recordId", description = "组织id") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult> getRecordSuijiangPage(PageParam pageReqVO, @RequestParam("recordId") Long recordId) { return success(recordTemplateService.getRecordSuijiangPage(pageReqVO, recordId)); @@ -127,7 +127,7 @@ public class RecordTemplateController { @GetMapping("/record-suijiang/get") @Operation(summary = "获得碎浆记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult getRecordSuijiang(@RequestParam("id") Long id) { return success(recordTemplateService.getRecordSuijiang(id)); } @@ -137,7 +137,7 @@ public class RecordTemplateController { @GetMapping("/record-chengxing/page") @Operation(summary = "获得成型记录分页") @Parameter(name = "recordId", description = "记录id") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult> getRecordChengxingPage(PageParam pageReqVO, @RequestParam("recordId") Long recordId) { return success(recordTemplateService.getRecordChengxingPage(pageReqVO, recordId)); @@ -170,7 +170,7 @@ public class RecordTemplateController { @GetMapping("/record-chengxing/get") @Operation(summary = "获得成型记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult getRecordChengxing(@RequestParam("id") Long id) { return success(recordTemplateService.getRecordChengxing(id)); } @@ -180,7 +180,7 @@ public class RecordTemplateController { @GetMapping("/record-reya/page") @Operation(summary = "获得热压记录分页") @Parameter(name = "recordId", description = "记录id") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult> getRecordReyaPage(PageParam pageReqVO, @RequestParam("recordId") Long recordId) { return success(recordTemplateService.getRecordReyaPage(pageReqVO, recordId)); @@ -213,7 +213,7 @@ public class RecordTemplateController { @GetMapping("/record-reya/get") @Operation(summary = "获得热压记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult getRecordReya(@RequestParam("id") Long id) { return success(recordTemplateService.getRecordReya(id)); } @@ -223,7 +223,7 @@ public class RecordTemplateController { @GetMapping("/record-qiebian/page") @Operation(summary = "获得切边记录分页") @Parameter(name = "recordId", description = "记录id") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult> getRecordQiebianPage(PageParam pageReqVO, @RequestParam("recordId") Long recordId) { return success(recordTemplateService.getRecordQiebianPage(pageReqVO, recordId)); @@ -256,7 +256,7 @@ public class RecordTemplateController { @GetMapping("/record-qiebian/get") @Operation(summary = "获得切边记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult getRecordQiebian(@RequestParam("id") Long id) { return success(recordTemplateService.getRecordQiebian(id)); } @@ -265,7 +265,7 @@ public class RecordTemplateController { @GetMapping("/record-dabao/page") @Operation(summary = "获得打包记录分页") @Parameter(name = "recordId", description = "记录id") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult> getRecordDabaoPage(PageParam pageReqVO, @RequestParam("recordId") Long recordId) { return success(recordTemplateService.getRecordDabaoPage(pageReqVO, recordId)); @@ -298,7 +298,7 @@ public class RecordTemplateController { @GetMapping("/record-dabao/get") @Operation(summary = "获得打包记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult getRecordDabao(@RequestParam("id") Long id) { return success(recordTemplateService.getRecordDabao(id)); } @@ -308,7 +308,7 @@ public class RecordTemplateController { @GetMapping("/record-dajiang/page") @Operation(summary = "获得打浆记录分页") @Parameter(name = "recordId", description = "记录id") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult> getRecordDajiangPage(PageParam pageReqVO, @RequestParam("recordId") Long recordId) { return success(recordTemplateService.getRecordDajiangPage(pageReqVO, recordId)); @@ -341,7 +341,7 @@ public class RecordTemplateController { @GetMapping("/record-dajiang/get") @Operation(summary = "获得打浆记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult getRecordDajiang(@RequestParam("id") Long id) { return success(recordTemplateService.getRecordDajiang(id)); } @@ -350,7 +350,7 @@ public class RecordTemplateController { @GetMapping("/record-ganzao/page") @Operation(summary = "获得干燥记录分页") @Parameter(name = "recordId", description = "记录id") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult> getRecordGanzaoPage(PageParam pageReqVO, @RequestParam("recordId") Long recordId) { return success(recordTemplateService.getRecordGanzaoPage(pageReqVO, recordId)); @@ -383,7 +383,7 @@ public class RecordTemplateController { @GetMapping("/record-ganzao/get") @Operation(summary = "获得干燥记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult getRecordGanzao(@RequestParam("id") Long id) { return success(recordTemplateService.getRecordGanzao(id)); } @@ -393,7 +393,7 @@ public class RecordTemplateController { @GetMapping("/record-jiashi/page") @Operation(summary = "获得加湿记录分页") @Parameter(name = "recordId", description = "记录id") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult> getRecordJiashiPage(PageParam pageReqVO, @RequestParam("recordId") Long recordId) { return success(recordTemplateService.getRecordJiashiPage(pageReqVO, recordId)); @@ -426,7 +426,7 @@ public class RecordTemplateController { @GetMapping("/record-jiashi/get") @Operation(summary = "获得加湿记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult getRecordJiashi(@RequestParam("id") Long id) { return success(recordTemplateService.getRecordJiashi(id)); } @@ -436,7 +436,7 @@ public class RecordTemplateController { @GetMapping("/record-pinjian/page") @Operation(summary = "获得检验记录分页") @Parameter(name = "recordId", description = "记录id") - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult> getRecordPinjianPage(PageParam pageReqVO, @RequestParam("recordId") Long recordId) { return success(recordTemplateService.getRecordPinjianPage(pageReqVO, recordId)); @@ -469,7 +469,7 @@ public class RecordTemplateController { @GetMapping("/record-pinjian/get") @Operation(summary = "获得检验记录") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:record-template:query')") + // @PreAuthorize("@ss.hasPermission('mes:record-template:query')") public CommonResult getRecordPinjian(@RequestParam("id") Long id) { return success(recordTemplateService.getRecordPinjian(id)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/repairtems/RepairTemsController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/repairtems/RepairTemsController.java index f1f29328e..db5b48a21 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/repairtems/RepairTemsController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/repairtems/RepairTemsController.java @@ -72,7 +72,7 @@ public class RepairTemsController { @GetMapping("/get") @Operation(summary = "获得维修项目") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:repair-tems:query')") + // @PreAuthorize("@ss.hasPermission('mes:repair-tems:query')") public CommonResult getRepairTems(@RequestParam("id") Long id) { RepairTemsDO repairTems = repairTemsService.getRepairTems(id); return success(BeanUtils.toBean(repairTems, RepairTemsRespVO.class)); @@ -80,7 +80,7 @@ public class RepairTemsController { @GetMapping("/page") @Operation(summary = "获得维修项目分页") - @PreAuthorize("@ss.hasPermission('mes:repair-tems:query')") + // @PreAuthorize("@ss.hasPermission('mes:repair-tems:query')") public CommonResult> getRepairTemsPage(@Valid RepairTemsPageReqVO pageReqVO) { PageResult pageResult = repairTemsService.getRepairTemsPage(pageReqVO); return success(pageResult); @@ -124,7 +124,7 @@ public class RepairTemsController { @GetMapping("/getComponentList") @Operation(summary = "获得设备关键件") @Parameter(name = "deviceId", description = "deviceId设备Id", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:repair-tems:query')") + // @PreAuthorize("@ss.hasPermission('mes:repair-tems:query')") public CommonResult> getComponentList(@RequestParam("deviceId") Long deviceId) { return success( repairTemsService.getComponentList(deviceId)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockindetail/StockInDetailController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockindetail/StockInDetailController.java index 7bed19c5e..3d8fce99f 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockindetail/StockInDetailController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockindetail/StockInDetailController.java @@ -65,7 +65,7 @@ public class StockInDetailController { @GetMapping("/get") @Operation(summary = "获得生产入库分配明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:stock-in-detail:query')") + // @PreAuthorize("@ss.hasPermission('mes:stock-in-detail:query')") public CommonResult getStockInDetail(@RequestParam("id") Long id) { StockInDetailDO stockInDetail = stockInDetailService.getStockInDetail(id); return success(BeanUtils.toBean(stockInDetail, StockInDetailRespVO.class)); @@ -73,7 +73,7 @@ public class StockInDetailController { @GetMapping("/page") @Operation(summary = "获得生产入库分配明细分页") - @PreAuthorize("@ss.hasPermission('mes:stock-in-detail:query')") + // @PreAuthorize("@ss.hasPermission('mes:stock-in-detail:query')") public CommonResult> getStockInDetailPage(@Valid StockInDetailPageReqVO pageReqVO) { PageResult pageResult = stockInDetailService.getStockInDetailPage(pageReqVO); return success(BeanUtils.toBean(pageResult, StockInDetailRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/MesStockOutController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/MesStockOutController.java index 15e5059b1..7f801cb70 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/MesStockOutController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/MesStockOutController.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.mes.service.stockworkshop.MesStockOutService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,7 +26,7 @@ public class MesStockOutController { @PutMapping("/mes-update-status") @Operation(summary = "更新其它出库单的状态") - //@PreAuthorize("@ss.hasPermission('erp:stock-out:update-status')") + @PreAuthorize("@ss.hasPermission('erp:stock-out:update-status')") public CommonResult updateMesStockOutStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) { mesStockOutService.updateMesStockOutStatus(id, status); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/StockWorkshopController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/StockWorkshopController.java index 0b9575283..f0c75ea2c 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/StockWorkshopController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/StockWorkshopController.java @@ -63,7 +63,7 @@ public class StockWorkshopController { @GetMapping("/get") @Operation(summary = "获得车间仓库存") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:stock-workshop:query')") + // @PreAuthorize("@ss.hasPermission('mes:stock-workshop:query')") public CommonResult getStockWorkshop(@RequestParam("id") Long id) { StockWorkshopDO stockWorkshop = stockWorkshopService.getStockWorkshop(id); return success(BeanUtils.toBean(stockWorkshop, StockWorkshopRespVO.class)); @@ -71,7 +71,7 @@ public class StockWorkshopController { @GetMapping("/page") @Operation(summary = "获得车间仓库存分页") - @PreAuthorize("@ss.hasPermission('mes:stock-workshop:query')") + // @PreAuthorize("@ss.hasPermission('mes:stock-workshop:query')") public CommonResult> getStockWorkshopPage(@Valid StockWorkshopPageReqVO pageReqVO) { PageResult pageResult = stockWorkshopService.getStockWorkshopPage(pageReqVO); List list = stockWorkshopService.buildVOList(pageResult.getList()); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/StockWorkshopDetailController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/StockWorkshopDetailController.java index 48ada1c80..6317ef169 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/StockWorkshopDetailController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/stockworkshop/StockWorkshopDetailController.java @@ -63,7 +63,7 @@ public class StockWorkshopDetailController { @GetMapping("/get") @Operation(summary = "获得车间仓明细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:stock-workshop-detail:query')") + // @PreAuthorize("@ss.hasPermission('mes:stock-workshop-detail:query')") public CommonResult getStockWorkshopDetail(@RequestParam("id") Long id) { StockWorkshopDetailDO stockWorkshopDetail = stockWorkshopDetailService.getStockWorkshopDetail(id); return success(BeanUtils.toBean(stockWorkshopDetail, StockWorkshopDetailRespVO.class)); @@ -71,7 +71,7 @@ public class StockWorkshopDetailController { @GetMapping("/page") @Operation(summary = "获得车间仓明细分页") - @PreAuthorize("@ss.hasPermission('mes:stock-workshop-detail:query')") + // @PreAuthorize("@ss.hasPermission('mes:stock-workshop-detail:query')") public CommonResult> getStockWorkshopDetailPage(@Valid StockWorkshopDetailPageReqVO pageReqVO) { PageResult pageResult = stockWorkshopDetailService.getStockWorkshopDetailPage(pageReqVO); List list = stockWorkshopDetailService.buildVOList(pageResult.getList()); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/subjectmoldplan/SubjectMoldPlanController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/subjectmoldplan/SubjectMoldPlanController.java index c166400b4..4604ebba2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/subjectmoldplan/SubjectMoldPlanController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/subjectmoldplan/SubjectMoldPlanController.java @@ -65,7 +65,7 @@ public class SubjectMoldPlanController { @GetMapping("/get") @Operation(summary = "获得项目方案关联") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:subject-mold-plan:query')") + // @PreAuthorize("@ss.hasPermission('mes:subject-mold-plan:query')") public CommonResult getSubjectMoldPlan(@RequestParam("id") Long id) { SubjectMoldPlanDO subjectPlan = subjectPlanService.getSubjectMoldPlan(id); return success(BeanUtils.toBean(subjectPlan, SubjectMoldPlanRespVO.class)); @@ -73,7 +73,7 @@ public class SubjectMoldPlanController { @GetMapping("/page") @Operation(summary = "获得项目方案关联分页") - @PreAuthorize("@ss.hasPermission('mes:subject-mold-plan:query')") + // @PreAuthorize("@ss.hasPermission('mes:subject-mold-plan:query')") public CommonResult> getSubjectMoldPlanPage(@Valid SubjectMoldPlanPageReqVO pageReqVO) { PageResult pageResult = subjectPlanService.getSubjectMoldPlanPage(pageReqVO); return success(BeanUtils.toBean(pageResult, SubjectMoldPlanRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/subjectplan/SubjectPlanController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/subjectplan/SubjectPlanController.java index 8e0906806..ea08c93a2 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/subjectplan/SubjectPlanController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/subjectplan/SubjectPlanController.java @@ -65,7 +65,7 @@ public class SubjectPlanController { @GetMapping("/get") @Operation(summary = "获得项目方案关联") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:subject-plan:query')") + // @PreAuthorize("@ss.hasPermission('mes:subject-plan:query')") public CommonResult getSubjectPlan(@RequestParam("id") Long id) { SubjectPlanDO subjectPlan = subjectPlanService.getSubjectPlan(id); return success(BeanUtils.toBean(subjectPlan, SubjectPlanRespVO.class)); @@ -73,7 +73,7 @@ public class SubjectPlanController { @GetMapping("/page") @Operation(summary = "获得项目方案关联分页") - @PreAuthorize("@ss.hasPermission('mes:subject-plan:query')") + // @PreAuthorize("@ss.hasPermission('mes:subject-plan:query')") public CommonResult> getSubjectPlanPage(@Valid SubjectPlanPageReqVO pageReqVO) { PageResult pageResult = subjectPlanService.getSubjectPlanPage(pageReqVO); return success(BeanUtils.toBean(pageResult, SubjectPlanRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/TaskController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/TaskController.java index bc2e1a683..1cd4ec17e 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/TaskController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/TaskController.java @@ -85,7 +85,7 @@ public class TaskController { @GetMapping("/get") @Operation(summary = "获得生产任务单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:task:query')") + // @PreAuthorize("@ss.hasPermission('mes:task:query')") public CommonResult getTask(@RequestParam("id") Long id) { TaskDO task = taskService.getTask(id); return success(BeanUtils.toBean(task, TaskRespVO.class)); @@ -164,7 +164,7 @@ public class TaskController { @GetMapping("/page") @Operation(summary = "获得生产任务单分页") - @PreAuthorize("@ss.hasPermission('mes:task:query')") + // @PreAuthorize("@ss.hasPermission('mes:task:query')") public CommonResult> getTaskPage(@Valid TaskPageReqVO pageReqVO) { PageResult pageResult = taskService.getTaskPage(pageReqVO); return success(pageResult); @@ -212,7 +212,7 @@ public class TaskController { @GetMapping("/task-detail/list-by-task-id") @Operation(summary = "获得生产任务单明细列表") @Parameter(name = "taskId", description = "task ID") - @PreAuthorize("@ss.hasPermission('mes:task:query')") + // @PreAuthorize("@ss.hasPermission('mes:task:query')") public CommonResult> getTaskDetailListByTaskId(@RequestParam("taskId") Long taskId) { return success(taskService.buildDetailVOList(taskService.getTaskDetailListByTaskId(taskId))); } @@ -230,7 +230,7 @@ public class TaskController { @GetMapping("/task-detail/page") @Operation(summary = "获得生产任务单明细分页") - @PreAuthorize("@ss.hasPermission('mes:task:query')") + // @PreAuthorize("@ss.hasPermission('mes:task:query')") public CommonResult> getTaskDetailPage(@Valid TaskDetailPageReqVO pageReqVO) { return success(taskService.getTaskDetailPage(pageReqVO)); } @@ -262,7 +262,7 @@ public class TaskController { @GetMapping("/task-detail/get") @Operation(summary = "获得生产任务单明细") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:task:query')") + // @PreAuthorize("@ss.hasPermission('mes:task:query')") public CommonResult getTaskDetail(@RequestParam("id") Long id) { return success(taskService.getTaskDetail(id)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/TaskManagementController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/TaskManagementController.java index 5530a351d..6fa53d553 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/TaskManagementController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/taskmanagement/TaskManagementController.java @@ -84,7 +84,7 @@ public class TaskManagementController { @GetMapping("/get") @Operation(summary = "获得任务管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:task-management:query')") + // @PreAuthorize("@ss.hasPermission('mes:task-management:query')") public CommonResult getTaskManagement(@RequestParam("id") Long id) { TaskManagementDO taskManagement = taskManagementService.getTaskManagement(id); return success(BeanUtils.toBean(taskManagement, TaskManagementRespVO.class)); @@ -92,7 +92,7 @@ public class TaskManagementController { @GetMapping("/page") @Operation(summary = "获得任务管理分页") - @PreAuthorize("@ss.hasPermission('mes:task-management:query')") + // @PreAuthorize("@ss.hasPermission('mes:task-management:query')") public CommonResult getTaskManagementPage(@Valid TaskManagementPageReqVO pageReqVO) { TaskManagementPageRespVO respVO = taskManagementService.getTaskManagementPageWithStatistics(pageReqVO); if (respVO.getList() != null) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/TicketManagementController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/TicketManagementController.java index a55ffd388..c903fbfe0 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/TicketManagementController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/TicketManagementController.java @@ -90,7 +90,7 @@ public class TicketManagementController { @GetMapping("/get") @Operation(summary = "获得工单管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:ticket-management:query')") + // @PreAuthorize("@ss.hasPermission('mes:ticket-management:query')") public CommonResult getTicketManagement(@RequestParam("id") Long id) { TicketManagementDO ticketManagement = ticketManagementService.getTicketManagement(id); return success(BeanUtils.toBean(ticketManagement, TicketManagementRespVO.class)); @@ -98,7 +98,7 @@ public class TicketManagementController { @GetMapping("/page") @Operation(summary = "获得工单管理分页") - @PreAuthorize("@ss.hasPermission('mes:ticket-management:query')") + // @PreAuthorize("@ss.hasPermission('mes:ticket-management:query')") public CommonResult getTicketManagementPage(@Valid TicketManagementPageReqVO pageReqVO) { TicketManagementPageRespVO respVO = ticketManagementService.getTicketManagementPageWithStatistics(pageReqVO); if (respVO.getList() != null) { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketresults/TicketResultsController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketresults/TicketResultsController.java index 3f879c6a7..65a04e109 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketresults/TicketResultsController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketresults/TicketResultsController.java @@ -65,7 +65,7 @@ public class TicketResultsController { @GetMapping("/get") @Operation(summary = "获得工单检验结果") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:ticket-results:query')") + // @PreAuthorize("@ss.hasPermission('mes:ticket-results:query')") public CommonResult getTicketResults(@RequestParam("id") Long id) { TicketResultsDO ticketResults = ticketResultsService.getTicketResults(id); return success(BeanUtils.toBean(ticketResults, TicketResultsRespVO.class)); @@ -73,7 +73,7 @@ public class TicketResultsController { @GetMapping("/page") @Operation(summary = "获得工单检验结果分页") - @PreAuthorize("@ss.hasPermission('mes:ticket-results:query')") + // @PreAuthorize("@ss.hasPermission('mes:ticket-results:query')") public CommonResult> getTicketResultsPage(@Valid TicketResultsPageReqVO pageReqVO) { PageResult pageResult = ticketResultsService.getTicketResultsPage(pageReqVO); return success(BeanUtils.toBean(pageResult, TicketResultsRespVO.class)); @@ -81,7 +81,7 @@ public class TicketResultsController { @GetMapping("/list") @Operation(summary = "获得工单检验结果分列表") - @PreAuthorize("@ss.hasPermission('mes:ticket-results:query')") + // @PreAuthorize("@ss.hasPermission('mes:ticket-results:query')") public CommonResult> getTicketResultsList(@Valid TicketResultsPageReqVO pageReqVO) { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = ticketResultsService.getTicketResultsPage(pageReqVO).getList(); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/workteam/WorkTeamController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/workteam/WorkTeamController.java index 359d428a9..1040374c3 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/workteam/WorkTeamController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/workteam/WorkTeamController.java @@ -66,7 +66,7 @@ public class WorkTeamController { @GetMapping("/get") @Operation(summary = "获得生产班组") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:work-team:query')") + // @PreAuthorize("@ss.hasPermission('mes:work-team:query')") public CommonResult getWorkTeam(@RequestParam("id") Long id) { WorkTeamDO workTeam = workTeamService.getWorkTeam(id); return success(BeanUtils.toBean(workTeam, WorkTeamRespVO.class)); @@ -74,7 +74,7 @@ public class WorkTeamController { @GetMapping("/page") @Operation(summary = "获得生产班组分页") - @PreAuthorize("@ss.hasPermission('mes:work-team:query')") + // @PreAuthorize("@ss.hasPermission('mes:work-team:query')") public CommonResult> getWorkTeamPage(@Valid WorkTeamPageReqVO pageReqVO) { PageResult pageResult = workTeamService.getWorkTeamPage(pageReqVO); return success(pageResult); @@ -82,7 +82,7 @@ public class WorkTeamController { @GetMapping("/list") @Operation(summary = "获得生产班组列表") - @PreAuthorize("@ss.hasPermission('mes:work-team:query')") + // @PreAuthorize("@ss.hasPermission('mes:work-team:query')") public CommonResult> getWorkTeamList(@Valid WorkTeamPageReqVO pageReqVO) { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); return success(workTeamService.getWorkTeamPage(pageReqVO).getList()); @@ -106,7 +106,7 @@ public class WorkTeamController { @GetMapping("/work-team-detail/page") @Operation(summary = "获得班组成员分页") @Parameter(name = "workTeamId", description = "班组id") - @PreAuthorize("@ss.hasPermission('mes:work-team:query')") + // @PreAuthorize("@ss.hasPermission('mes:work-team:query')") public CommonResult> getWorkTeamDetailPage(PageParam pageReqVO, @RequestParam("workTeamId") Long workTeamId) { return success(workTeamService.getWorkTeamDetailPage(pageReqVO, workTeamId)); @@ -139,7 +139,7 @@ public class WorkTeamController { @GetMapping("/work-team-detail/get") @Operation(summary = "获得班组成员") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:work-team:query')") + // @PreAuthorize("@ss.hasPermission('mes:work-team:query')") public CommonResult getWorkTeamDetail(@RequestParam("id") Long id) { return success(workTeamService.getWorkTeamDetail(id)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjitem/ZjItemController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjitem/ZjItemController.java index 5b221c3ee..b92eabf08 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjitem/ZjItemController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjitem/ZjItemController.java @@ -83,7 +83,7 @@ public class ZjItemController { @GetMapping("/get") @Operation(summary = "获得质量管理-检验项目") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:zj-item:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-item:query')") public CommonResult getZjItem(@RequestParam("id") Long id) { ZjItemDO zjItem = zjItemService.getZjItem(id); return success(BeanUtils.toBean(zjItem, ZjItemRespVO.class)); @@ -91,7 +91,7 @@ public class ZjItemController { @GetMapping("/page") @Operation(summary = "获得质量管理-检验项目分页") - @PreAuthorize("@ss.hasPermission('mes:zj-item:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-item:query')") public CommonResult> getZjItemPage(@Valid ZjItemPageReqVO pageReqVO) { PageResult pageResult = zjItemService.getZjItemPage(pageReqVO); return success(new PageResult<>(buildVOList(pageResult.getList()), pageResult.getTotal())); @@ -129,7 +129,7 @@ public class ZjItemController { @GetMapping("/list") @Operation(summary = "获得检验项目列表") - @PreAuthorize("@ss.hasPermission('mes:zj-item:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-item:query')") public CommonResult> getZjItemList() { List zjItemDOList = zjItemService.getZjItemList(); return success(zjItemDOList); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproduct/ZjProductController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproduct/ZjProductController.java index fab8e64db..1a9c15e8e 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproduct/ZjProductController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproduct/ZjProductController.java @@ -70,7 +70,7 @@ public class ZjProductController { @GetMapping("/get") @Operation(summary = "获得质量管理-质检参数") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:product:query')") + // @PreAuthorize("@ss.hasPermission('erp:product:query')") public CommonResult getZjProduct(@RequestParam("id") Long id) { ZjProductDO zjProduct = zjProductService.getZjProduct(id); return success(BeanUtils.toBean(zjProduct, ZjProductRespVO.class)); @@ -78,7 +78,7 @@ public class ZjProductController { @GetMapping("/page") @Operation(summary = "获得质量管理-质检参数分页") - @PreAuthorize("@ss.hasPermission('erp:product:query')") + // @PreAuthorize("@ss.hasPermission('erp:product:query')") public CommonResult> getZjProductPage(@Valid ZjProductPageReqVO pageReqVO) { PageResult pageResult = zjProductService.getZjProductPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ZjProductRespVO.class)); @@ -100,7 +100,7 @@ public class ZjProductController { @GetMapping("/list-by-item-product-id") @Operation(summary = "获得产品质检明细列表") @Parameter(name = "productId", description = "产品ID") - @PreAuthorize("@ss.hasPermission('erp:product:query')") + // @PreAuthorize("@ss.hasPermission('erp:product:query')") public CommonResult> getZjProductByPlanId(@RequestParam("productId") Long productId) { List pageResult = zjProductService.getZjProductByProductId(productId); return success(BeanUtils.toBean(pageResult, ZjProductRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/ZjProductRecordController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/ZjProductRecordController.java index 9ce5ed5f9..405118381 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/ZjProductRecordController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjproductrecord/ZjProductRecordController.java @@ -76,7 +76,7 @@ public class ZjProductRecordController { @GetMapping("/get") @Operation(summary = "获得试产质检记录") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('erp:product:query')") + // @PreAuthorize("@ss.hasPermission('erp:product:query')") public CommonResult getZjProductRecord(@RequestParam("id") Long id) { ZjProductRecordDO zjProductRecord = zjProductRecordService.getZjProductRecord(id); return success(BeanUtils.toBean(zjProductRecord, ZjProductRecordRespVO.class)); @@ -84,7 +84,7 @@ public class ZjProductRecordController { @GetMapping("/page") @Operation(summary = "获得试产质检记录分页") - @PreAuthorize("@ss.hasPermission('erp:product:query')") + // @PreAuthorize("@ss.hasPermission('erp:product:query')") public CommonResult> getZjProductRecordPage(@Valid ZjProductRecordPageReqVO pageReqVO) { PageResult pageResult = zjProductRecordService.getZjProductRecordPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ZjProductRecordRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjschema/ZjSchemaController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjschema/ZjSchemaController.java index 35ec1c028..3426472e9 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjschema/ZjSchemaController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjschema/ZjSchemaController.java @@ -86,7 +86,7 @@ public class ZjSchemaController { @GetMapping("/get") @Operation(summary = "获得检验方案") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:zj-schema:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-schema:query')") public CommonResult getZjSchema(@RequestParam("id") Long id) { ZjSchemaDO zjSchema = zjSchemaService.getZjSchema(id); return success(buildZjSchemaRespVO(zjSchema)); @@ -94,7 +94,7 @@ public class ZjSchemaController { @GetMapping("/page") @Operation(summary = "获得检验方案分页") - @PreAuthorize("@ss.hasPermission('mes:zj-schema:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-schema:query')") public CommonResult> getZjSchemaPage(@Valid ZjSchemaPageReqVO pageReqVO) { PageResult pageResult = zjSchemaService.getZjSchemaPage(pageReqVO); List list = pageResult.getList().stream() @@ -105,7 +105,7 @@ public class ZjSchemaController { @GetMapping("/list") @Operation(summary = "获得检验方案列表") - @PreAuthorize("@ss.hasPermission('mes:zj-schema:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-schema:query')") public CommonResult> getZjSchemaList(@RequestParam(value = "productId", required = false) Long productId) { List zjSchemaDOList = zjSchemaService.getZjSchemaList(productId); return success(zjSchemaDOList); @@ -127,7 +127,7 @@ public class ZjSchemaController { @GetMapping("/getItemList") @Operation(summary = "获得检验方案关联的项目列表") @Parameter(name = "id", description = "检验方案编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:zj-schema:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-schema:query')") public CommonResult> getItemList(@RequestParam("id") Long id) { // 1. 查询检验方案主记录 ZjSchemaDO zjSchema = zjSchemaService.getZjSchema(id); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java index d006f93bf..02dd03bce 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtask/ZjTaskController.java @@ -86,7 +86,7 @@ public class ZjTaskController { @GetMapping("/get") @Operation(summary = "获得质量管理-检验任务") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:zj-task:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-task:query')") public CommonResult getZjTask(@RequestParam("id") Long id) { ZjTaskDO zjTask = zjTaskService.getZjTask(id); return success(BeanUtils.toBean(zjTask, ZjTaskRespVO.class)); @@ -94,7 +94,7 @@ public class ZjTaskController { @GetMapping("/page") @Operation(summary = "获得质量管理-检验任务分页") - @PreAuthorize("@ss.hasPermission('mes:zj-task:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-task:query')") public CommonResult> getZjTaskPage(@Valid ZjTaskPageReqVO pageReqVO) { PageResult pageResult = zjTaskService.getZjTaskPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ZjTaskRespVO.class)); @@ -111,7 +111,7 @@ public class ZjTaskController { @GetMapping("/list") @Operation(summary = "获得质量管理-检验任务列表") - @PreAuthorize("@ss.hasPermission('mes:zj-task:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-task:query')") public CommonResult> getZjTaskList(@Valid ZjTaskPageReqVO pageReqVO) { List zjTaskList = zjTaskService.getZjTaskList(pageReqVO); return success(BeanUtils.toBean(zjTaskList, ZjTaskRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtaskresults/ZjTaskResultsController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtaskresults/ZjTaskResultsController.java index 796640649..ac4df62ec 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtaskresults/ZjTaskResultsController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtaskresults/ZjTaskResultsController.java @@ -85,7 +85,7 @@ public class ZjTaskResultsController { @GetMapping("/get") @Operation(summary = "获得检验任务-检验结果") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:zj-task-results:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-task-results:query')") public CommonResult getZjTaskResults(@RequestParam("id") Long id) { ZjTaskResultsDO zjTaskResults = zjTaskResultsService.getZjTaskResults(id); return success(BeanUtils.toBean(zjTaskResults, ZjTaskResultsRespVO.class)); @@ -93,7 +93,7 @@ public class ZjTaskResultsController { @GetMapping("/page") @Operation(summary = "获得检验任务-检验结果分页") - @PreAuthorize("@ss.hasPermission('mes:zj-task-results:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-task-results:query')") public CommonResult> getZjTaskResultsPage(@Valid ZjTaskResultsPageReqVO pageReqVO) { PageResult pageResult = zjTaskResultsService.getZjTaskResultsPage(pageReqVO); // return success(BeanUtils.toBean(pageResult, ZjTaskResultsRespVO.class)); diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtype/ZjTypeController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtype/ZjTypeController.java index 7f59ae4b5..7a93b8cf0 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtype/ZjTypeController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjtype/ZjTypeController.java @@ -66,7 +66,7 @@ public class ZjTypeController { @GetMapping("/get") @Operation(summary = "获得质量管理-检验类型") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:zj-type:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-type:query')") public CommonResult getZjType(@RequestParam("id") Long id) { ZjTypeDO zjType = zjTypeService.getZjType(id); return success(BeanUtils.toBean(zjType, ZjTypeRespVO.class)); @@ -74,7 +74,7 @@ public class ZjTypeController { @GetMapping("/page") @Operation(summary = "获得质量管理-检验类型分页") - @PreAuthorize("@ss.hasPermission('mes:zj-type:query')") + // @PreAuthorize("@ss.hasPermission('mes:zj-type:query')") public CommonResult> getZjTypePage(@Valid ZjTypePageReqVO pageReqVO) { PageResult pageResult = zjTypeService.getZjTypePage(pageReqVO); return success(BeanUtils.toBean(pageResult, ZjTypeRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java index 86cdeed1d..ac12f557e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java @@ -58,7 +58,7 @@ public class DeptController { @GetMapping("/list") @Operation(summary = "获取部门列表") - @PreAuthorize("@ss.hasPermission('system:dept:query')") + // @PreAuthorize("@ss.hasPermission('system:dept:query')") public CommonResult> getDeptList(DeptListReqVO reqVO) { List list = deptService.getDeptList(reqVO); return success(BeanUtils.toBean(list, DeptRespVO.class)); @@ -75,7 +75,7 @@ public class DeptController { @GetMapping("/get") @Operation(summary = "获得部门信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:dept:query')") + // @PreAuthorize("@ss.hasPermission('system:dept:query')") public CommonResult getDept(@RequestParam("id") Long id) { DeptDO dept = deptService.getDept(id); return success(BeanUtils.toBean(dept, DeptRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java index 6c4a3a9d5..49be1383e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java @@ -67,7 +67,7 @@ public class PostController { @GetMapping(value = "/get") @Operation(summary = "获得岗位信息") @Parameter(name = "id", description = "岗位编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:post:query')") + // @PreAuthorize("@ss.hasPermission('system:post:query')") public CommonResult getPost(@RequestParam("id") Long id) { PostDO post = postService.getPost(id); return success(BeanUtils.toBean(post, PostRespVO.class)); @@ -85,7 +85,7 @@ public class PostController { @GetMapping("/page") @Operation(summary = "获得岗位分页列表") - @PreAuthorize("@ss.hasPermission('system:post:query')") + // @PreAuthorize("@ss.hasPermission('system:post:query')") public CommonResult> getPostPage(@Validated PostPageReqVO pageReqVO) { PageResult pageResult = postService.getPostPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PostRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java index d7402a174..83afcd1c7 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java @@ -74,7 +74,7 @@ public class DictDataController { @GetMapping("/page") @Operation(summary = "/获得字典类型的分页列表") - @PreAuthorize("@ss.hasPermission('system:dict:query')") + // @PreAuthorize("@ss.hasPermission('system:dict:query')") public CommonResult> getDictTypePage(@Valid DictDataPageReqVO pageReqVO) { PageResult pageResult = dictDataService.getDictDataPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DictDataRespVO.class)); @@ -83,7 +83,7 @@ public class DictDataController { @GetMapping(value = "/get") @Operation(summary = "/查询字典数据详细") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:dict:query')") + // @PreAuthorize("@ss.hasPermission('system:dict:query')") public CommonResult getDictData(@RequestParam("id") Long id) { DictDataDO dictData = dictDataService.getDictData(id); return success(BeanUtils.toBean(dictData, DictDataRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java index 65f8e7dae..cfdcedb6d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java @@ -64,7 +64,7 @@ public class DictTypeController { @GetMapping("/page") @Operation(summary = "获得字典类型的分页列表") - @PreAuthorize("@ss.hasPermission('system:dict:query')") + // @PreAuthorize("@ss.hasPermission('system:dict:query')") public CommonResult> pageDictTypes(@Valid DictTypePageReqVO pageReqVO) { PageResult pageResult = dictTypeService.getDictTypePage(pageReqVO); return success(BeanUtils.toBean(pageResult, DictTypeRespVO.class)); @@ -73,7 +73,7 @@ public class DictTypeController { @Operation(summary = "/查询字典类型详细") @Parameter(name = "id", description = "编号", required = true, example = "1024") @GetMapping(value = "/get") - @PreAuthorize("@ss.hasPermission('system:dict:query')") + // @PreAuthorize("@ss.hasPermission('system:dict:query')") public CommonResult getDictType(@RequestParam("id") Long id) { DictTypeDO dictType = dictTypeService.getDictType(id); return success(BeanUtils.toBean(dictType, DictTypeRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java index 9fa4dc1b8..8270512eb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java @@ -38,7 +38,7 @@ public class LoginLogController { @GetMapping("/page") @Operation(summary = "获得登录日志分页列表") - @PreAuthorize("@ss.hasPermission('system:login-log:query')") + // @PreAuthorize("@ss.hasPermission('system:login-log:query')") public CommonResult> getLoginLogPage(@Valid LoginLogPageReqVO pageReqVO) { PageResult pageResult = loginLogService.getLoginLogPage(pageReqVO); return success(BeanUtils.toBean(pageResult, LoginLogRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java index e926f0b53..a36ded78e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java @@ -39,7 +39,7 @@ public class OperateLogController { @GetMapping("/page") @Operation(summary = "查看操作日志分页列表") - @PreAuthorize("@ss.hasPermission('system:operate-log:query')") + // @PreAuthorize("@ss.hasPermission('system:operate-log:query')") public CommonResult> pageOperateLog(@Valid OperateLogPageReqVO pageReqVO) { PageResult pageResult = operateLogService.getOperateLogPage(pageReqVO); return success(BeanUtils.toBean(pageResult, OperateLogRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java index 2e3a732f3..0d5332829 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java @@ -57,7 +57,7 @@ public class MailAccountController { @GetMapping("/get") @Operation(summary = "获得邮箱账号") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:mail-account:query')") + // @PreAuthorize("@ss.hasPermission('system:mail-account:query')") public CommonResult getMailAccount(@RequestParam("id") Long id) { MailAccountDO account = mailAccountService.getMailAccount(id); return success(BeanUtils.toBean(account, MailAccountRespVO.class)); @@ -65,7 +65,7 @@ public class MailAccountController { @GetMapping("/page") @Operation(summary = "获得邮箱账号分页") - @PreAuthorize("@ss.hasPermission('system:mail-account:query')") + // @PreAuthorize("@ss.hasPermission('system:mail-account:query')") public CommonResult> getMailAccountPage(@Valid MailAccountPageReqVO pageReqVO) { PageResult pageResult = mailAccountService.getMailAccountPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MailAccountRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java index c2669ec52..f3d2db951 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailLogController.java @@ -31,7 +31,7 @@ public class MailLogController { @GetMapping("/page") @Operation(summary = "获得邮箱日志分页") - @PreAuthorize("@ss.hasPermission('system:mail-log:query')") + // @PreAuthorize("@ss.hasPermission('system:mail-log:query')") public CommonResult> getMailLogPage(@Valid MailLogPageReqVO pageVO) { PageResult pageResult = mailLogService.getMailLogPage(pageVO); return success(BeanUtils.toBean(pageResult, MailLogRespVO.class)); @@ -40,7 +40,7 @@ public class MailLogController { @GetMapping("/get") @Operation(summary = "获得邮箱日志") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:mail-log:query')") + // @PreAuthorize("@ss.hasPermission('system:mail-log:query')") public CommonResult getMailTemplate(@RequestParam("id") Long id) { MailLogDO log = mailLogService.getMailLog(id); return success(BeanUtils.toBean(log, MailLogRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java index 00ab378ad..3e1f52536 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java @@ -57,7 +57,7 @@ public class MailTemplateController { @GetMapping("/get") @Operation(summary = "获得邮件模版") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:mail-template:query')") + // @PreAuthorize("@ss.hasPermission('system:mail-template:query')") public CommonResult getMailTemplate(@RequestParam("id") Long id) { MailTemplateDO template = mailTempleService.getMailTemplate(id); return success(BeanUtils.toBean(template, MailTemplateRespVO.class)); @@ -65,7 +65,7 @@ public class MailTemplateController { @GetMapping("/page") @Operation(summary = "获得邮件模版分页") - @PreAuthorize("@ss.hasPermission('system:mail-template:query')") + // @PreAuthorize("@ss.hasPermission('system:mail-template:query')") public CommonResult> getMailTemplatePage(@Valid MailTemplatePageReqVO pageReqVO) { PageResult pageResult = mailTempleService.getMailTemplatePage(pageReqVO); return success(BeanUtils.toBean(pageResult, MailTemplateRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java index 138f2d9ae..a7668171c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java @@ -62,7 +62,7 @@ public class NoticeController { @GetMapping("/page") @Operation(summary = "获取通知公告列表") - @PreAuthorize("@ss.hasPermission('system:notice:query')") + // @PreAuthorize("@ss.hasPermission('system:notice:query')") public CommonResult> getNoticePage(@Validated NoticePageReqVO pageReqVO) { PageResult pageResult = noticeService.getNoticePage(pageReqVO); return success(BeanUtils.toBean(pageResult, NoticeRespVO.class)); @@ -71,7 +71,7 @@ public class NoticeController { @GetMapping("/get") @Operation(summary = "获得通知公告") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:notice:query')") + // @PreAuthorize("@ss.hasPermission('system:notice:query')") public CommonResult getNotice(@RequestParam("id") Long id) { NoticeDO notice = noticeService.getNotice(id); return success(BeanUtils.toBean(notice, NoticeRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java index 53212fa2d..75bc57b79 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java @@ -38,7 +38,7 @@ public class NotifyMessageController { @GetMapping("/get") @Operation(summary = "获得站内信") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:notify-message:query')") + // @PreAuthorize("@ss.hasPermission('system:notify-message:query')") public CommonResult getNotifyMessage(@RequestParam("id") Long id) { NotifyMessageDO message = notifyMessageService.getNotifyMessage(id); return success(BeanUtils.toBean(message, NotifyMessageRespVO.class)); @@ -46,7 +46,7 @@ public class NotifyMessageController { @GetMapping("/page") @Operation(summary = "获得站内信分页") - @PreAuthorize("@ss.hasPermission('system:notify-message:query')") + // @PreAuthorize("@ss.hasPermission('system:notify-message:query')") public CommonResult> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) { PageResult pageResult = notifyMessageService.getNotifyMessagePage(pageVO); return success(BeanUtils.toBean(pageResult, NotifyMessageRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java index 81c5d3a83..36f1329c9 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java @@ -59,7 +59,7 @@ public class NotifyTemplateController { @GetMapping("/get") @Operation(summary = "获得站内信模版") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:notify-template:query')") + // @PreAuthorize("@ss.hasPermission('system:notify-template:query')") public CommonResult getNotifyTemplate(@RequestParam("id") Long id) { NotifyTemplateDO template = notifyTemplateService.getNotifyTemplate(id); return success(BeanUtils.toBean(template, NotifyTemplateRespVO.class)); @@ -67,7 +67,7 @@ public class NotifyTemplateController { @GetMapping("/page") @Operation(summary = "获得站内信模版分页") - @PreAuthorize("@ss.hasPermission('system:notify-template:query')") + // @PreAuthorize("@ss.hasPermission('system:notify-template:query')") public CommonResult> getNotifyTemplatePage(@Valid NotifyTemplatePageReqVO pageVO) { PageResult pageResult = notifyTemplateService.getNotifyTemplatePage(pageVO); return success(BeanUtils.toBean(pageResult, NotifyTemplateRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java index 7aa9bb97a..5231e1ca4 100755 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java @@ -56,7 +56,7 @@ public class OAuth2ClientController { @GetMapping("/get") @Operation(summary = "获得 OAuth2 客户端") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:oauth2-client:query')") + // @PreAuthorize("@ss.hasPermission('system:oauth2-client:query')") public CommonResult getOAuth2Client(@RequestParam("id") Long id) { OAuth2ClientDO client = oAuth2ClientService.getOAuth2Client(id); return success(BeanUtils.toBean(client, OAuth2ClientRespVO.class)); @@ -64,7 +64,7 @@ public class OAuth2ClientController { @GetMapping("/page") @Operation(summary = "获得 OAuth2 客户端分页") - @PreAuthorize("@ss.hasPermission('system:oauth2-client:query')") + // @PreAuthorize("@ss.hasPermission('system:oauth2-client:query')") public CommonResult> getOAuth2ClientPage(@Valid OAuth2ClientPageReqVO pageVO) { PageResult pageResult = oAuth2ClientService.getOAuth2ClientPage(pageVO); return success(BeanUtils.toBean(pageResult, OAuth2ClientRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java index 62827b1b9..2c7e0b2a6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java @@ -32,7 +32,7 @@ public class OAuth2TokenController { @GetMapping("/page") @Operation(summary = "获得访问令牌分页", description = "只返回有效期内的") - @PreAuthorize("@ss.hasPermission('system:oauth2-token:page')") + // @PreAuthorize("@ss.hasPermission('system:oauth2-token:page')") public CommonResult> getAccessTokenPage(@Valid OAuth2AccessTokenPageReqVO reqVO) { PageResult pageResult = oauth2TokenService.getAccessTokenPage(reqVO); return success(BeanUtils.toBean(pageResult, OAuth2AccessTokenRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.java index 7236299aa..7b9cd4eb2 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2UserController.java @@ -50,7 +50,7 @@ public class OAuth2UserController { @GetMapping("/get") @Operation(summary = "获得用户基本信息") - @PreAuthorize("@ss.hasScope('user.read')") // + // @PreAuthorize("@ss.hasScope('user.read')") // public CommonResult getUserInfo() { // 获得用户基本信息 AdminUserDO user = userService.getUser(getLoginUserId()); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java index 514973dc2..354e1646a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java @@ -60,7 +60,7 @@ public class MenuController { @GetMapping("/list") @Operation(summary = "获取菜单列表", description = "用于【菜单管理】界面") - @PreAuthorize("@ss.hasPermission('system:menu:query')") + // @PreAuthorize("@ss.hasPermission('system:menu:query')") public CommonResult> getMenuList(MenuListReqVO reqVO) { List list = menuService.getMenuList(reqVO); list.sort(Comparator.comparing(MenuDO::getSort)); @@ -82,7 +82,7 @@ public class MenuController { @GetMapping("/get") @Operation(summary = "获取菜单信息") - @PreAuthorize("@ss.hasPermission('system:menu:query')") + // @PreAuthorize("@ss.hasPermission('system:menu:query')") public CommonResult getMenu(Long id) { MenuDO menu = menuService.getMenu(id); return success(BeanUtils.toBean(menu, MenuRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java index c47f20ac8..f062f78db 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/PermissionController.java @@ -47,7 +47,7 @@ public class PermissionController { @Operation(summary = "获得角色拥有的菜单编号") @Parameter(name = "roleId", description = "角色编号", required = true) @GetMapping("/list-role-menus") - @PreAuthorize("@ss.hasPermission('system:permission:assign-role-menu')") + // @PreAuthorize("@ss.hasPermission('system:permission:assign-role-menu')") public CommonResult> getRoleMenuList( @RequestParam("roleId") Long roleId, @RequestParam(value = "clientType", required = false) Integer clientType) { @@ -82,7 +82,7 @@ public class PermissionController { @Operation(summary = "获得管理员拥有的角色编号列表") @Parameter(name = "userId", description = "用户编号", required = true) @GetMapping("/list-user-roles") - @PreAuthorize("@ss.hasPermission('system:permission:assign-user-role')") + // @PreAuthorize("@ss.hasPermission('system:permission:assign-user-role')") public CommonResult> listAdminRoles(@RequestParam("userId") Long userId) { return success(permissionService.getUserRoleIdListByUserId(userId)); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java index c667a7ee3..ba6119303 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java @@ -63,7 +63,7 @@ public class RoleController { @GetMapping("/get") @Operation(summary = "获得角色信息") - @PreAuthorize("@ss.hasPermission('system:role:query')") + // @PreAuthorize("@ss.hasPermission('system:role:query')") public CommonResult getRole(@RequestParam("id") Long id) { RoleDO role = roleService.getRole(id); return success(BeanUtils.toBean(role, RoleRespVO.class)); @@ -71,7 +71,7 @@ public class RoleController { @GetMapping("/page") @Operation(summary = "获得角色分页") - @PreAuthorize("@ss.hasPermission('system:role:query')") + // @PreAuthorize("@ss.hasPermission('system:role:query')") public CommonResult> getRolePage(RolePageReqVO pageReqVO) { PageResult pageResult = roleService.getRolePage(pageReqVO); return success(BeanUtils.toBean(pageResult, RoleRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java index 79ff7b80d..ef9ef1568 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java @@ -57,7 +57,7 @@ public class SmsChannelController { @GetMapping("/get") @Operation(summary = "获得短信渠道") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:sms-channel:query')") + // @PreAuthorize("@ss.hasPermission('system:sms-channel:query')") public CommonResult getSmsChannel(@RequestParam("id") Long id) { SmsChannelDO channel = smsChannelService.getSmsChannel(id); return success(BeanUtils.toBean(channel, SmsChannelRespVO.class)); @@ -65,7 +65,7 @@ public class SmsChannelController { @GetMapping("/page") @Operation(summary = "获得短信渠道分页") - @PreAuthorize("@ss.hasPermission('system:sms-channel:query')") + // @PreAuthorize("@ss.hasPermission('system:sms-channel:query')") public CommonResult> getSmsChannelPage(@Valid SmsChannelPageReqVO pageVO) { PageResult pageResult = smsChannelService.getSmsChannelPage(pageVO); return success(BeanUtils.toBean(pageResult, SmsChannelRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java index 10594a800..7b2739d34 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java @@ -38,7 +38,7 @@ public class SmsLogController { @GetMapping("/page") @Operation(summary = "获得短信日志分页") - @PreAuthorize("@ss.hasPermission('system:sms-log:query')") + // @PreAuthorize("@ss.hasPermission('system:sms-log:query')") public CommonResult> getSmsLogPage(@Valid SmsLogPageReqVO pageReqVO) { PageResult pageResult = smsLogService.getSmsLogPage(pageReqVO); return success(BeanUtils.toBean(pageResult, SmsLogRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java index dc587ce5e..ef4b747b0 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java @@ -62,7 +62,7 @@ public class SmsTemplateController { @GetMapping("/get") @Operation(summary = "获得短信模板") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:sms-template:query')") + // @PreAuthorize("@ss.hasPermission('system:sms-template:query')") public CommonResult getSmsTemplate(@RequestParam("id") Long id) { SmsTemplateDO template = smsTemplateService.getSmsTemplate(id); return success(BeanUtils.toBean(template, SmsTemplateRespVO.class)); @@ -70,7 +70,7 @@ public class SmsTemplateController { @GetMapping("/page") @Operation(summary = "获得短信模板分页") - @PreAuthorize("@ss.hasPermission('system:sms-template:query')") + // @PreAuthorize("@ss.hasPermission('system:sms-template:query')") public CommonResult> getSmsTemplatePage(@Valid SmsTemplatePageReqVO pageVO) { PageResult pageResult = smsTemplateService.getSmsTemplatePage(pageVO); return success(BeanUtils.toBean(pageResult, SmsTemplateRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java index 5cfde1834..ac00af8b5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java @@ -60,7 +60,7 @@ public class SocialClientController { @GetMapping("/get") @Operation(summary = "获得社交客户端") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:social-client:query')") + // @PreAuthorize("@ss.hasPermission('system:social-client:query')") public CommonResult getSocialClient(@RequestParam("id") Long id) { SocialClientDO client = socialClientService.getSocialClient(id); return success(BeanUtils.toBean(client, SocialClientRespVO.class)); @@ -68,7 +68,7 @@ public class SocialClientController { @GetMapping("/page") @Operation(summary = "获得社交客户端分页") - @PreAuthorize("@ss.hasPermission('system:social-client:query')") + // @PreAuthorize("@ss.hasPermission('system:social-client:query')") public CommonResult> getSocialClientPage(@Valid SocialClientPageReqVO pageVO) { PageResult pageResult = socialClientService.getSocialClientPage(pageVO); return success(BeanUtils.toBean(pageResult, SocialClientRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java index eb2792e6d..4eda429f3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialUserController.java @@ -53,7 +53,7 @@ public class SocialUserController { @GetMapping("/get") @Operation(summary = "获得社交用户") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:social-user:query')") + // @PreAuthorize("@ss.hasPermission('system:social-user:query')") public CommonResult getSocialUser(@RequestParam("id") Long id) { SocialUserDO socialUser = socialUserService.getSocialUser(id); return success(BeanUtils.toBean(socialUser, SocialUserRespVO.class)); @@ -61,7 +61,7 @@ public class SocialUserController { @GetMapping("/page") @Operation(summary = "获得社交用户分页") - @PreAuthorize("@ss.hasPermission('system:social-user:query')") + // @PreAuthorize("@ss.hasPermission('system:social-user:query')") public CommonResult> getSocialUserPage(@Valid SocialUserPageReqVO pageVO) { PageResult pageResult = socialUserService.getSocialUserPage(pageVO); return success(BeanUtils.toBean(pageResult, SocialUserRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java index bb7aa84f0..3e5839e40 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java @@ -81,7 +81,7 @@ public class TenantController { @GetMapping("/get") @Operation(summary = "获得租户") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:tenant:query')") + // @PreAuthorize("@ss.hasPermission('system:tenant:query')") public CommonResult getTenant(@RequestParam("id") Long id) { TenantDO tenant = tenantService.getTenant(id); return success(BeanUtils.toBean(tenant, TenantRespVO.class)); @@ -89,7 +89,7 @@ public class TenantController { @GetMapping("/page") @Operation(summary = "获得租户分页") - @PreAuthorize("@ss.hasPermission('system:tenant:query')") + // @PreAuthorize("@ss.hasPermission('system:tenant:query')") public CommonResult> getTenantPage(@Valid TenantPageReqVO pageVO) { PageResult pageResult = tenantService.getTenantPage(pageVO); return success(BeanUtils.toBean(pageResult, TenantRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java index f523d5196..4d1aa1d7f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java @@ -56,7 +56,7 @@ public class TenantPackageController { @GetMapping("/get") @Operation(summary = "获得租户套餐") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:tenant-package:query')") + // @PreAuthorize("@ss.hasPermission('system:tenant-package:query')") public CommonResult getTenantPackage(@RequestParam("id") Long id) { TenantPackageDO tenantPackage = tenantPackageService.getTenantPackage(id); return success(BeanUtils.toBean(tenantPackage, TenantPackageRespVO.class)); @@ -64,7 +64,7 @@ public class TenantPackageController { @GetMapping("/page") @Operation(summary = "获得租户套餐分页") - @PreAuthorize("@ss.hasPermission('system:tenant-package:query')") + // @PreAuthorize("@ss.hasPermission('system:tenant-package:query')") public CommonResult> getTenantPackagePage(@Valid TenantPackagePageReqVO pageVO) { PageResult pageResult = tenantPackageService.getTenantPackagePage(pageVO); return success(BeanUtils.toBean(pageResult, TenantPackageRespVO.class)); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java index 1fd74ade4..74ec4c351 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java @@ -89,7 +89,7 @@ public class UserController { @GetMapping("/page") @Operation(summary = "获得用户分页列表") - @PreAuthorize("@ss.hasPermission('system:user:query')") + // @PreAuthorize("@ss.hasPermission('system:user:query')") public CommonResult> getUserPage(@Valid UserPageReqVO pageReqVO) { // 获得用户分页列表 PageResult pageResult = userService.getUserPage(pageReqVO); @@ -125,7 +125,7 @@ public class UserController { @GetMapping("/get") @Operation(summary = "获得用户详情") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:user:query')") + // @PreAuthorize("@ss.hasPermission('system:user:query')") public CommonResult getUser(@RequestParam("id") Long id) { AdminUserDO user = userService.getUser(id); if (user == null) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/usernavmenu/UserNavMenuController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/usernavmenu/UserNavMenuController.java index efadda96d..cd309354a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/usernavmenu/UserNavMenuController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/usernavmenu/UserNavMenuController.java @@ -55,7 +55,7 @@ public class UserNavMenuController { @PutMapping("/update-list") @Operation(summary = "批量更新") - @PreAuthorize("@ss.hasPermission('system:user-nav-menu:update')") + // @PreAuthorize("@ss.hasPermission('system:user-nav-menu:update')") public CommonResult updateUserNavMenuList(@Valid @RequestBody List updateReqVOList) { userNavMenuService.updateUserNavMenuList(updateReqVOList); return success(true); @@ -73,7 +73,7 @@ public class UserNavMenuController { @GetMapping("/get") @Operation(summary = "获得App用户导航菜单配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:user-nav-menu:query')") + // @PreAuthorize("@ss.hasPermission('system:user-nav-menu:query')") public CommonResult getUserNavMenu(@RequestParam("id") Long id) { UserNavMenuDO userNavMenu = userNavMenuService.getUserNavMenu(id); return success(BeanUtils.toBean(userNavMenu, UserNavMenuRespVO.class)); @@ -81,7 +81,7 @@ public class UserNavMenuController { @GetMapping("/list") @Operation(summary = "获得App用户导航菜单配置列表") - @PreAuthorize("@ss.hasPermission('system:user-nav-menu:query')") + // @PreAuthorize("@ss.hasPermission('system:user-nav-menu:query')") public CommonResult> getUserNavMenuList(@Valid UserNavMenuPageReqVO listReqVO) { List list = userNavMenuService.getUserNavMenuList(listReqVO); return success(BeanUtils.toBean(list, UserNavMenuRespVO.class)); @@ -89,7 +89,7 @@ public class UserNavMenuController { @GetMapping("/page") @Operation(summary = "获得App用户导航菜单配置分页") - @PreAuthorize("@ss.hasPermission('system:user-nav-menu:query')") + // @PreAuthorize("@ss.hasPermission('system:user-nav-menu:query')") public CommonResult> getUserNavMenuPage(@Valid UserNavMenuPageReqVO pageReqVO) { PageResult pageResult = userNavMenuService.getUserNavMenuPage(pageReqVO); return success(BeanUtils.toBean(pageResult, UserNavMenuRespVO.class));