linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:去掉controller下分页列表及详情权限

Browse Source
main
HuangHuiKang 3 days ago
parent 626604a6dc
commit b280e8d35d
176 changed files with 475 additions and 469 deletions
Show Stats Download Patch File Download Diff File

4
yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/qrcoderecord/QrcodeRecordController.java
Unescape Escape View File

@ -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<QrcodeRecordRespVO> 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<PageResult<QrcodeRecordRespVO>> getRecordPage(@Valid QrcodeRecordPageReqVO pageReqVO) {
PageResult<QrcodeRecordDO> pageResult = qrcodeRecordService.getRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, QrcodeRecordRespVO.class));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodePartController.java
Unescape Escape View File

@ -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<AutocodePartRespVO> 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<PageResult<AutocodePartRespVO>> getAutocodePartPage(@Valid AutocodePartPageReqVO pageReqVO) {
PageResult<AutocodePartDO> pageResult = autocodePartService.getAutocodePartPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, AutocodePartRespVO.class));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRecordController.java
Unescape Escape View File

@ -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<AutocodeRecordRespVO> 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<PageResult<AutocodeRecordRespVO>> getAutocodeRecordPage(@Valid AutocodeRecordPageReqVO pageReqVO) {
PageResult<AutocodeRecordDO> pageResult = autocodeRecordService.getAutocodeRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, AutocodeRecordRespVO.class));

6
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/autocode/AutocodeRuleController.java
Unescape Escape View File

@ -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<AutocodeRuleRespVO> 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<PageResult<AutocodeRuleRespVO>> getAutocodeRulePage(@Valid AutocodeRulePageReqVO pageReqVO) {
PageResult<AutocodeRuleDO> 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<List<AutocodePartDO>> getAutocodePartListByRuleId(@RequestParam("ruleId") Long ruleId) {
return success(autocodeRuleService.getAutocodePartListByRuleId(ruleId));
}

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java
Unescape Escape View File

@ -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<ErpAccountRespVO> 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<PageResult<ErpAccountRespVO>> getAccountPage(@Valid ErpAccountPageReqVO pageReqVO) {
PageResult<ErpAccountDO> pageResult = accountService.getAccountPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErpAccountRespVO.class));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
Unescape Escape View File

@ -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<ErpFinancePaymentRespVO> 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<PageResult<ErpFinancePaymentRespVO>> getFinancePaymentPage(@Valid ErpFinancePaymentPageReqVO pageReqVO) {
PageResult<ErpFinancePaymentDO> pageResult = financePaymentService.getFinancePaymentPage(pageReqVO);
return success(buildFinancePaymentVOPageResult(pageResult));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinanceReceiptController.java
Unescape Escape View File

@ -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<ErpFinanceReceiptRespVO> 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<PageResult<ErpFinanceReceiptRespVO>> getFinanceReceiptPage(@Valid ErpFinanceReceiptPageReqVO pageReqVO) {
PageResult<ErpFinanceReceiptDO> pageResult = financeReceiptService.getFinanceReceiptPage(pageReqVO);
return success(buildFinanceReceiptVOPageResult(pageResult));

18
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldBrandController.java
Unescape Escape View File

@ -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<MoldBrandRespVO> 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<List<MoldBrandRespVO>> getBrandList(MoldBrandPageReqVO pageReqVO) {
PageResult<MoldBrandRespVO> 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<MoldBrandPageRespVO> 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<List<MoldBrandTreeRespVO>> getDeviceTypeTree() {
List<MoldBrandTreeRespVO> 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<PageResult<MoldRespVO>> 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<List<MoldDO>> getMoldList(@Valid MoldPageReqVO pageReqVO) {
List<MoldDO> 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<MoldDO> 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<PageResult<MoldProductRespVO>> getMoldBrandProductPage(PageParam pageReqVO,
@RequestParam("brandId") Long brandId) {
PageResult<MoldBrandProductDO> 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<MoldBrandProductDO> getMoldBrandProduct(@RequestParam("id") Long id) {
return success(moldBrandService.getMoldBrandProduct(id));
}

6
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldController.java
Unescape Escape View File

@ -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<MoldRespVO> 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<PageResult<MoldRespVO>> getMoldPage(@Valid MoldPageReqVO pageReqVO) {
PageResult<MoldDO> 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<List<MoldDO>> getMoldListByStatus(@RequestParam("status") Long status) {
List<MoldDO> moldDO = moldService.getMoldListByStatus(status);
return success(moldDO);

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/mold/MoldPressureNetRecordController.java
Unescape Escape View File

@ -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<MoldPressureNetRecordRespVO> 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<PageResult<MoldPressureNetRecordRespVO>> getMoldPressureNetRecordPage(@Valid MoldPressureNetRecordPageReqVO pageReqVO) {
PageResult<MoldPressureNetRecordDO> pageResult = moldPressureNetRecordService.getMoldPressureNetRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MoldPressureNetRecordRespVO.class));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/pallet/ErpPalletController.java
Unescape Escape View File

@ -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<ErpPalletRespVO> 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<ErpPalletPageRespVO> getPalletPage(@Valid ErpPalletPageReqVO pageReqVO) {
ErpPalletPageRespVO respVO = palletService.getPalletPageWithStatistics(pageReqVO);
PageResult<ErpPalletDO> doPage = new PageResult<>(BeanUtils.toBean(respVO.getList(), ErpPalletDO.class), respVO.getTotal());

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpPackagingSchemeController.java
Unescape Escape View File

@ -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<ErpPackagingSchemeRespVO> 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<PageResult<ErpPackagingSchemeRespVO>> getPackagingSchemePage(@Valid ErpPackagingSchemePageReqVO pageReqVO) {
PageResult<ErpPackagingSchemeDO> pageResult = packagingSchemeService.getPackagingSchemePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErpPackagingSchemeRespVO.class));

6
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java
Unescape Escape View File

@ -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<ErpProductCategoryRespVO> 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<List<ErpProductCategoryRespVO>> getProductCategoryList(@Valid ErpProductCategoryListReqVO listReqVO) {
List<ErpProductCategoryDO> 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<List<ErpProductCategoryTypeGroupRespVO>> getProductCategoryGroupTree(@Valid ErpProductCategoryListReqVO listReqVO) {
List<ErpProductCategoryDO> list = productCategoryService.getProductCategoryList(listReqVO);
Map<Integer, List<ErpProductCategoryDO>> typeMap = new LinkedHashMap<>();

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java
Unescape Escape View File

@ -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<ErpProductRespVO> 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<PageResult<ErpProductRespVO>> getProductPage(@Valid ErpProductPageReqVO pageReqVO) {
return success(productService.getProductVOPage(pageReqVO));
}

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java
Unescape Escape View File

@ -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<ErpProductUnitRespVO> 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<PageResult<ErpProductUnitRespVO>> getProductUnitPage(@Valid ErpProductUnitPageReqVO pageReqVO) {
PageResult<ErpProductUnitDO> pageResult = productUnitService.getProductUnitPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErpProductUnitRespVO.class));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/productdevicerel/ProductDeviceRelController.java
Unescape Escape View File

@ -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<ProductDeviceRelRespVO> 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<PageResult<ProductDeviceRelRespVO>> getProductDeviceRelPage(@Valid ProductDeviceRelPageReqVO pageReqVO) {
PageResult<ProductDeviceRelDO> pageResult = productDeviceRelService.getProductDeviceRelPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ProductDeviceRelRespVO.class));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/productmoldrel/ProductMoldRelController.java
Unescape Escape View File

@ -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<ProductMoldRelRespVO> 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<PageResult<ProductMoldRelRespVO>> getProductMoldRelPage(@Valid ProductMoldRelPageReqVO pageReqVO) {
PageResult<ProductMoldRelDO> pageResult = productMoldRelService.getProductMoldRelPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ProductMoldRelRespVO.class));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java
Unescape Escape View File

@ -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<ErpPurchaseInRespVO> 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<PageResult<ErpPurchaseInRespVO>> getPurchaseInPage(@Valid ErpPurchaseInPageReqVO pageReqVO) {
PageResult<ErpPurchaseInDO> pageResult = purchaseInService.getPurchaseInPage(pageReqVO);
return success(buildPurchaseInVOPageResult(pageResult));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
Unescape Escape View File

@ -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<ErpPurchaseOrderRespVO> 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<PageResult<ErpPurchaseOrderRespVO>> getPurchaseOrderPage(@Valid ErpPurchaseOrderPageReqVO pageReqVO) {
PageResult<ErpPurchaseOrderDO> pageResult = purchaseOrderService.getPurchaseOrderPage(pageReqVO);
return success(buildPurchaseOrderVOPageResult(pageResult));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java
Unescape Escape View File

@ -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<ErpPurchaseReturnRespVO> 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<PageResult<ErpPurchaseReturnRespVO>> getPurchaseReturnPage(@Valid ErpPurchaseReturnPageReqVO pageReqVO) {
PageResult<ErpPurchaseReturnDO> pageResult = purchaseReturnService.getPurchaseReturnPage(pageReqVO);
return success(buildPurchaseReturnVOPageResult(pageResult));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java
Unescape Escape View File

@ -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<ErpSupplierRespVO> 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<PageResult<ErpSupplierRespVO>> getSupplierPage(@Valid ErpSupplierPageReqVO pageReqVO) {
PageResult<ErpSupplierDO> pageResult = supplierService.getSupplierPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErpSupplierRespVO.class));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpCustomerController.java
Unescape Escape View File

@ -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<ErpCustomerRespVO> 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<PageResult<ErpCustomerRespVO>> getCustomerPage(@Valid ErpCustomerPageReqVO pageReqVO) {
PageResult<ErpCustomerDO> pageResult = customerService.getCustomerPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErpCustomerRespVO.class));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
Unescape Escape View File

@ -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<ErpSaleOrderRespVO> 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<PageResult<ErpSaleOrderRespVO>> getSaleOrderPage(@Valid ErpSaleOrderPageReqVO pageReqVO) {
PageResult<ErpSaleOrderDO> pageResult = saleOrderService.getSaleOrderPage(pageReqVO);
return success(buildSaleOrderVOPageResult(pageResult));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOutController.java
Unescape Escape View File

@ -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<ErpSaleOutRespVO> 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<PageResult<ErpSaleOutRespVO>> getSaleOutPage(@Valid ErpSaleOutPageReqVO pageReqVO) {
PageResult<ErpSaleOutDO> pageResult = saleOutService.getSaleOutPage(pageReqVO);
return success(buildSaleOutVOPageResult(pageResult));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleReturnController.java
Unescape Escape View File

@ -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<ErpSaleReturnRespVO> 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<PageResult<ErpSaleReturnRespVO>> getSaleReturnPage(@Valid ErpSaleReturnPageReqVO pageReqVO) {
PageResult<ErpSaleReturnDO> pageResult = saleReturnService.getSaleReturnPage(pageReqVO);
return success(buildSaleReturnVOPageResult(pageResult));

8
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCheckController.java
Unescape Escape View File

@ -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<List<ErpStockCheckApproveRecordRespVO>> 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<ErpStockCheckRespVO> 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<ErpStockCheckPageRespVO> getStockCheckPage(@Valid ErpStockCheckPageReqVO pageReqVO) {
ErpStockCheckPageRespVO respVO = stockCheckService.getStockCheckPageWithStatistics(pageReqVO);
PageResult<ErpStockCheckDO> 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<PageResult<ErpStockCheckRecordRespVO>> getStockCheckRecordPage(
@Valid ErpStockCheckRecordPageReqVO pageReqVO) {
return success(buildStockCheckRecordVOPageResult(stockCheckService.getStockCheckRecordPage(pageReqVO)));

2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockController.java
Unescape Escape View File

@ -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<PageResult<ErpStockRespVO>> getStockPage(@Valid ErpStockPageReqVO pageReqVO) {
ErpStockPageReqVO queryReqVO = BeanUtils.toBean(pageReqVO, ErpStockPageReqVO.class);
queryReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);

6
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java
Unescape Escape View File

@ -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<List<ErpStockInApproveRecordRespVO>> 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<ErpStockInRespVO> 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<ErpStockInPageRespVO> getStockInPage(@Valid ErpStockInPageReqVO pageReqVO) {
fillPageReqDefault(pageReqVO);
ErpStockInPageRespVO respVO = stockInService.getStockInPageWithStatistics(pageReqVO);

8
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockMoveController.java
Unescape Escape View File

@ -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<List<ErpStockMoveApproveRecordRespVO>> 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<List<ErpStockMoveProductStockRespVO>> 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<ErpStockMoveRespVO> 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<ErpStockMovePageRespVO> getStockMovePage(@Valid ErpStockMovePageReqVO pageReqVO) {
ErpStockMovePageRespVO respVO = stockMoveService.getStockMovePageWithStatistics(pageReqVO);
PageResult<ErpStockMoveDO> doPage = new PageResult<>(BeanUtils.toBean(respVO.getList(), ErpStockMoveDO.class), respVO.getTotal());

6
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockOutController.java
Unescape Escape View File

@ -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<List<ErpStockOutApproveRecordRespVO>> 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<ErpStockOutRespVO> 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<ErpStockOutPageRespVO> getStockOutPage(@Valid ErpStockOutPageReqVO pageReqVO) {
fillPageReqDefault(pageReqVO);
applyItemFilter(pageReqVO);

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockRecordController.java
Unescape Escape View File

@ -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<ErpStockRecordRespVO> 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<PageResult<ErpStockRecordRespVO>> getStockRecordPage(@Valid ErpStockRecordPageReqVO pageReqVO) {
PageResult<ErpStockRecordDO> pageResult = stockRecordService.getStockRecordPage(pageReqVO);
return success(buildStockRecrodVOPageResult(pageResult));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseController.java
Unescape Escape View File

@ -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<ErpWarehouseRespVO> 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<PageResult<ErpWarehouseRespVO>> getWarehousePage(@Valid ErpWarehousePageReqVO pageReqVO) {
PageResult<ErpWarehouseDO> pageResult = warehouseService.getWarehousePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErpWarehouseRespVO.class));

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/warehousearea/WarehouseAreaController.java
Unescape Escape View File

@ -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<WarehouseAreaRespVO> 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<PageResult<WarehouseAreaRespVO>> getWarehouseAreaPage(@Valid WarehouseAreaPageReqVO pageReqVO) {
PageResult<WarehouseAreaDO> pageResult = warehouseAreaService.getWarehouseAreaPage(pageReqVO);
PageResult<WarehouseAreaRespVO> result = BeanUtils.toBean(pageResult, WarehouseAreaRespVO.class);

4
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/warehouselocation/WarehouseLocationController.java
Unescape Escape View File

@ -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<WarehouseLocationRespVO> 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<PageResult<WarehouseLocationRespVO>> getWarehouseLocationPage(@Valid WarehouseLocationPageReqVO pageReqVO) {
PageResult<WarehouseLocationDO> pageResult = warehouseLocationService.getWarehouseLocationPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, WarehouseLocationRespVO.class));

8
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java
Unescape Escape View File

@ -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<List<CodegenTableRespVO>> getCodegenTableList(@RequestParam(value = "dataSourceConfigId") Long dataSourceConfigId) {
List<CodegenTableDO> 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<PageResult<CodegenTableRespVO>> getCodegenTablePage(@Valid CodegenTablePageReqVO pageReqVO) {
PageResult<CodegenTableDO> 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<CodegenDetailRespVO> getCodegenDetail(@RequestParam("tableId") Long tableId) {
CodegenTableDO table = codegenService.getCodegenTable(tableId);
List<CodegenColumnDO> 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<List<Long>> createCodegenList(@Valid @RequestBody CodegenCreateListReqVO reqVO) {
return success(codegenService.createCodegenList(getLoginUserId(), reqVO));
}

4
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
Unescape Escape View File

@ -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<ConfigRespVO> 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<PageResult<ConfigRespVO>> getConfigPage(@Valid ConfigPageReqVO pageReqVO) {
PageResult<ConfigDO> page = configService.getConfigPage(pageReqVO);
return success(ConfigConvert.INSTANCE.convertPage(page));

4
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DataSourceConfigController.java
Unescape Escape View File

@ -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<DataSourceConfigRespVO> 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<List<DataSourceConfigRespVO>> getDataSourceConfigList() {
List<DataSourceConfigDO> list = dataSourceConfigService.getDataSourceConfigList();
return success(BeanUtils.toBean(list, DataSourceConfigRespVO.class));

4
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
Unescape Escape View File

@ -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<Demo01ContactRespVO> 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<PageResult<Demo01ContactRespVO>> getDemo01ContactPage(@Valid Demo01ContactPageReqVO pageReqVO) {
PageResult<Demo01ContactDO> pageResult = demo01ContactService.getDemo01ContactPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, Demo01ContactRespVO.class));

4
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java
Unescape Escape View File

@ -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<Demo02CategoryRespVO> 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<List<Demo02CategoryRespVO>> getDemo02CategoryList(@Valid Demo02CategoryListReqVO listReqVO) {
List<Demo02CategoryDO> list = demo02CategoryService.getDemo02CategoryList(listReqVO);
return success(BeanUtils.toBean(list, Demo02CategoryRespVO.class));

14
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java
Unescape Escape View File

@ -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<Demo03StudentRespVO> 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<PageResult<Demo03StudentRespVO>> getDemo03StudentPage(@Valid Demo03StudentPageReqVO pageReqVO) {
PageResult<Demo03StudentDO> 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<PageResult<Demo03CourseDO>> 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<Demo03CourseDO> 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<List<Demo03CourseDO>> 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<PageResult<Demo03GradeDO>> 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<Demo03GradeDO> getDemo03Grade(@RequestParam("id") Long id) {
return success(demo03StudentService.getDemo03Grade(id));
}

4
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java
Unescape Escape View File

@ -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<FileConfigRespVO> 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<PageResult<FileConfigRespVO>> getFileConfigPage(@Valid FileConfigPageReqVO pageVO) {
PageResult<FileConfigDO> pageResult = fileConfigService.getFileConfigPage(pageVO);
return success(BeanUtils.toBean(pageResult, FileConfigRespVO.class));

2
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
Unescape Escape View File

@ -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<PageResult<FileRespVO>> getFilePage(@Valid FilePageReqVO pageVO) {
PageResult<FileDO> pageResult = fileService.getFilePage(pageVO);
return success(BeanUtils.toBean(pageResult, FileRespVO.class));

4
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java
Unescape Escape View File

@ -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<JobRespVO> 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<PageResult<JobRespVO>> getJobPage(@Valid JobPageReqVO pageVO) {
PageResult<JobDO> pageResult = jobService.getJobPage(pageVO);
return success(BeanUtils.toBean(pageResult, JobRespVO.class));

4
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java
Unescape Escape View File

@ -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<JobLogRespVO> 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<PageResult<JobLogRespVO>> getJobLogPage(@Valid JobLogPageReqVO pageVO) {
PageResult<JobLogDO> pageResult = jobLogService.getJobLogPage(pageVO);
return success(BeanUtils.toBean(pageResult, JobLogRespVO.class));

2
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiAccessLogController.java
Unescape Escape View File

@ -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<PageResult<ApiAccessLogRespVO>> getApiAccessLogPage(@Valid ApiAccessLogPageReqVO pageReqVO) {
PageResult<ApiAccessLogDO> pageResult = apiAccessLogService.getApiAccessLogPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ApiAccessLogRespVO.class));

2
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/ApiErrorLogController.java
Unescape Escape View File

@ -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<PageResult<ApiErrorLogRespVO>> getApiErrorLogPage(@Valid ApiErrorLogPageReqVO pageReqVO) {
PageResult<ApiErrorLogDO> pageResult = apiErrorLogService.getApiErrorLogPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ApiErrorLogRespVO.class));

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alert/AlertController.java
Unescape Escape View File

@ -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<AlertRespVO> 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<PageResult<AlertRespVO>> getAlertPage(@Valid AlertPageReqVO pageReqVO) {
PageResult<AlertDO> 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<PageResult<AlertRecordDO>> 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<AlertRecordDO> getAlertRecord(@RequestParam("id") Long id) {
return success(alertService.getAlertRecord(id));
}

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/alertrecord/AlertRecordController.java
Unescape Escape View File

@ -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<AlertRecordRespVO> 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<PageResult<AlertRecordRespVO>> getAlertRecordPage(@Valid AlertRecordPageReqVO pageReqVO) {
PageResult<AlertRecordDO> pageResult = alertRecordService.getAlertRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, AlertRecordRespVO.class));

26
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/DeviceController.java
Unescape Escape View File

@ -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<DeviceRespVO> 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<PageResult<DeviceRespVO>> getDevicePage(@Valid DevicePageReqVO pageReqVO) {
PageResult<DeviceRespVO> 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<List<DeviceSelectRespVO>> getAvailableDeviceList() {
return success(deviceService.getDeviceSelectList());
}
@GetMapping("/available-page")
@Operation(summary = "获取设备分页列表（全量+是否已选+已删除标识）")
@PreAuthorize("@ss.hasPermission('iot:device:query')")
// @PreAuthorize("@ss.hasPermission('iot:device:query')")
public CommonResult<PageResult<DeviceSelectRespVO>> getAvailableDevicePage(@Valid DevicePageReqVO pageReqVO) {
PageResult<DeviceSelectRespVO> 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<PageResult<DeviceProductionDailyReportRespVO>> 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<List<DeviceRespVO>> 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<List<DeviceRespVO>> 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<PageResult<DeviceContactModelDO>> 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<List<Map<String, Object>>> 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<List<DeviceContactModelDO>> 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<DeviceAttributeDO> 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<String> 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<List<DevicePointRespVO>> devicePointList() {
return success( deviceService.devicePointList());
}

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceattributetype/DeviceAttributeTypeController.java
Unescape Escape View File

@ -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<DeviceAttributeTypeRespVO> 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<PageResult<DeviceAttributeTypeRespVO>> getDeviceAttributeTypePage(@Valid DeviceAttributeTypePageReqVO pageReqVO) {
PageResult<DeviceAttributeTypeDO> pageResult = deviceAttributeTypeService.getDeviceAttributeTypePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DeviceAttributeTypeRespVO.class));

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicecontactmodel/DeviceContactModelController.java
Unescape Escape View File

@ -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<DeviceContactModelRespVO> 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<PageResult<DeviceContactModelRespVO>> getDeviceContactModelPage(@Valid DeviceContactModelPageReqVO pageReqVO) {
PageResult<DeviceContactModelDO> 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<List<DeviceContactModelDO>> getDeviceContactModelList(@RequestParam("id") Long id) {
List<DeviceContactModelDO> deviceModelAttribute = deviceContactModelService.getDeviceContactModelList(id);
return success(deviceModelAttribute);

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodel/DeviceModelController.java
Unescape Escape View File

@ -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<DeviceModelRespVO> 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<PageResult<DeviceModelRespVO>> getDeviceModelPage(@Valid DeviceModelPageReqVO pageReqVO) {
PageResult<DeviceModelDO> pageResult = deviceModelService.getDeviceModelPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DeviceModelRespVO.class));

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelattribute/DeviceModelAttributeController.java
Unescape Escape View File

@ -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<DeviceModelAttributeRespVO> 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<List<DeviceModelAttributeDO>> getDeviceModelAttributeList(@RequestParam("id") Long id) {
List<DeviceModelAttributeDO> 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<PageResult<DeviceModelAttributeRespVO>> getDeviceModelAttributePage(@Valid DeviceModelAttributePageReqVO pageReqVO) {
PageResult<DeviceModelAttributeRespVO> pageResult = deviceModelAttributeService.getDeviceModelAttributePage(pageReqVO);
return success(pageResult);

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicemodelrules/DeviceModelRulesController.java
Unescape Escape View File

@ -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<DeviceModelRulesRespVO> 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<PageResult<DeviceModelRulesRespVO>> getDeviceModelRulesPage(@Valid DeviceModelRulesPageReqVO pageReqVO) {
PageResult<DeviceModelRulesDO> pageResult = deviceModelRulesService.getDeviceModelRulesPage(pageReqVO);
PageResult<DeviceModelRulesRespVO> modelRulesRespVOPageResult = BeanUtils.toBean(pageResult, DeviceModelRulesRespVO.class);

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/deviceoperationrecord/DeviceOperationRecordController.java
Unescape Escape View File

@ -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<DeviceOperationRecordRespVO> 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<PageResult<DeviceOperationRecordRespVO>> getDeviceOperationRecordPage(@Valid DeviceOperationRecordPageReqVO pageReqVO) {
PageResult<DeviceOperationRecordDO> 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<List<DeviceTotalTimeRecordRespVO>> 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<List<DeviceTotalTimeRecordRespVO>> deviceOperationList(@Valid DeviceTotalTimeRecordReqVO pageReqVO) {
return success(deviceOperationRecordService.deviceOperationList(pageReqVO));
}

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicepointrules/DevicePointRulesController.java
Unescape Escape View File

@ -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<DevicePointRulesRespVO> 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<PageResult<DevicePointRulesRespVO>> getDevicePointRulesPage(@Valid DevicePointRulesPageReqVO pageReqVO) {
PageResult<DevicePointRulesDO> pageResult = devicePointRulesService.getDevicePointRulesPage(pageReqVO);
PageResult<DevicePointRulesRespVO> 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<List<DevicePointRulesDO>> getList(@RequestParam("id") Long id) {
List<DevicePointRulesDO> devicePointRules = devicePointRulesService.getList(id);
return success(devicePointRules);

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/devicewarinningrecord/DeviceWarinningRecordController.java
Unescape Escape View File

@ -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<DeviceWarinningRecordRespVO> 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<PageResult<DeviceWarinningRecordRespVO>> getDeviceWarinningRecordPage(@Valid DeviceWarinningRecordPageReqVO pageReqVO) {
PageResult<DeviceWarinningRecordDO> 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<List<Map<String, Object>>> getLastSevenHoursCount( @RequestParam(name = "orgId" ,required = false) Long orgId) {
List<Map<String, Object>> hourCounts = deviceWarinningRecordService.getLastSevenHoursCount();
return success(hourCounts);

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/feedback/FeedbackController.java
Unescape Escape View File

@ -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<FeedbackRespVO> 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<PageResult<FeedbackRespVO>> getFeedbackPage(@Valid FeedbackPageReqVO pageReqVO) {
PageResult<FeedbackDO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, FeedbackRespVO.class));

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaController.java
Unescape Escape View File

@ -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<FormulaRespVO> 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<PageResult<FormulaRespVO>> getFormulaPage(@Valid FormulaPageReqVO pageReqVO) {
PageResult<FormulaDO> 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<PageResult<FormulaDetailDO>> 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<FormulaDetailDO> getFormulaDetail(@RequestParam("id") Long id) {
return success(formulaService.getFormulaDetail(id));
}

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/formula/FormulaRecordController.java
Unescape Escape View File

@ -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<FormulaRecordRespVO> 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<PageResult<FormulaRecordRespVO>> getFormulaRecordPage(@Valid FormulaRecordPageReqVO pageReqVO) {
PageResult<FormulaRecordDO> pageResult = formulaRecordService.getFormulaRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, FormulaRecordRespVO.class));

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java
Unescape Escape View File

@ -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<FrpcProxyServerRespVO> 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<PageResult<FrpcProxyServerRespVO>> getFrpcProxyServerPage(@Valid FrpcProxyServerPageReqVO pageReqVO) {
PageResult<FrpcProxyServerDO> pageResult = frpcProxyServerService.getFrpcProxyServerPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, FrpcProxyServerRespVO.class));

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java
Unescape Escape View File

@ -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<FrpsServerRespVO> 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<PageResult<FrpsServerRespVO>> getFrpsServerPage(@Valid FrpsServerPageReqVO pageReqVO) {
PageResult<FrpsServerDO> pageResult = frpsServerService.getFrpsServerPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, FrpsServerRespVO.class));

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/gateway/GatewayController.java
Unescape Escape View File

@ -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<GatewayRespVO> 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<PageResult<GatewayRespVO>> getGatewayPage(@Valid GatewayPageReqVO pageReqVO) {
PageResult<GatewayDO> 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<PageResult<DeviceDO>> 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<DeviceDO> getDevice(@RequestParam("id") Long id) {
return success(gatewayService.getDevice(id));
}

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/iotorganization/IotOrganizationController.java
Unescape Escape View File

@ -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<IotOrganizationRespVO> 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<List<IotOrganizationRespVO>> getOrganizationList(@Valid IotOrganizationListReqVO listReqVO) {
List<IotOrganizationDO> list = organizationService.getOrganizationList(listReqVO);
return success(BeanUtils.toBean(list, IotOrganizationRespVO.class));

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/kanban/KanbanController.java
Unescape Escape View File

@ -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<KanbanRespVO> 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<PageResult<KanbanRespVO>> getKanbanPage(@Valid KanbanPageReqVO pageReqVO) {
PageResult<KanbanDO> pageResult = kanbanService.getKanbanPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, KanbanRespVO.class));

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/MqttDataRecordController.java
Unescape Escape View File

@ -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<MqttDataRecordRespVO> 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<PageResult<MqttDataRecordRespVO>> getMqttDataRecordPage(@Valid MqttDataRecordPageReqVO pageReqVO) {
PageResult<MqttDataRecordDO> pageResult = mqttDataRecordService.getMqttDataRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MqttDataRecordRespVO.class));

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttrecord/MqttRecordController.java
Unescape Escape View File

@ -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<MqttRecordRespVO> 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<PageResult<MqttRecordRespVO>> getMqttRecordPage(@Valid MqttRecordPageReqVO pageReqVO) {
PageResult<MqttRecordDO> pageResult = mqttRecordService.getMqttRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MqttRecordRespVO.class));

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipe/RecipeController.java
Unescape Escape View File

@ -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<RecipeRespVO> 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<PageResult<RecipeRespVO>> getRecipePage(@Valid RecipePageReqVO pageReqVO) {
// 直接调用实现类的方法，无类型转换

2
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedeviceattribute/RecipeDeviceAttributeController.java
Unescape Escape View File

@ -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<RecipeDeviceAttributeRespVO> getRecipeDeviceAttribute(@RequestParam("id") Long id) {
RecipeDeviceAttributeDO recipeDeviceAttribute = recipeDeviceAttributeService.getRecipeDeviceAttribute(id);
return success(BeanUtils.toBean(recipeDeviceAttribute, RecipeDeviceAttributeRespVO.class));

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java
Unescape Escape View File

@ -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<RecipeDeviceRecordRespVO> 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<PageResult<RecipeDeviceRecordRespVO>> getRecipeDeviceRecordPage(@Valid RecipeDeviceRecordPageReqVO pageReqVO) {
PageResult<RecipeDeviceRecordDO> pageResult = recipeDeviceRecordService.getRecipeDeviceRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, RecipeDeviceRecordRespVO.class));

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipeplandetail/RecipePlanDetailController.java
Unescape Escape View File

@ -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<RecipePlanDetailRespVO> 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<PageResult<RecipePlanDetailPageRespDTO>> pageRecipePlanDetail(RecipePlanDetailPageReqVO reqVO) {
PageResult<RecipePlanDetailPageRespDTO> pageResult = recipePlanDetailService.pageRecipePlanDetail(reqVO);
return CommonResult.success(pageResult);

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepoint/RecipePointController.java
Unescape Escape View File

@ -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<RecipePointRespVO> 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<PageResult<RecipePointRespVO>> getRecipePointPage(@Valid RecipePointPageReqVO pageReqVO) {
PageResult<RecipePointDO> 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<List<RecipePointRespVO>> getRecipePointList(@RequestParam("id") Long recipeId) {
List<RecipePointDO> list = recipePointService.getRecipePointPageList(recipeId);

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipepointrecord/RecipePointRecordController.java
Unescape Escape View File

@ -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<RecipePointRecordRespVO> 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<PageResult<RecipePointRecordRespVO>> getRecipePointRecordPage(@Valid RecipePointRecordPageReqVO pageReqVO) {
PageResult<RecipePointRecordDO> pageResult = recipePointRecordService.getRecipePointRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, RecipePointRecordRespVO.class));

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipetype/RecipeTypeController.java
Unescape Escape View File

@ -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<RecipeTypeRespVO> 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<PageResult<RecipeTypeRespVO>> getRecipeTypePage(@Valid RecipeTypePageReqVO pageReqVO) {
PageResult<RecipeTypeDO> pageResult = recipeTypeService.getRecipeTypePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, RecipeTypeRespVO.class));

3
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/app/AppOrgWorkerController.java
Unescape Escape View File

@ -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<Long> createReport(@Valid @RequestBody AppReportSaveReqVO appSaveVo) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime localDateTime = LocalDateTime.parse(appSaveVo.getReportDateString(), formatter);

6
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/baogongrecord/BaogongRecordController.java
Unescape Escape View File

@ -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<BaogongRecordRespVO> 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<PageResult<BaogongRecordRespVO>> getBaogongRecordPage(@Valid BaogongRecordPageReqVO pageReqVO) {
PageResult<BaogongRecordDO> 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<PageResult<BaogongRecordStatRespVO>> getBaogongRecordStatPage(@Valid BaogongRecordStatPageReqVO reqVO) {
return success(baogongRecordService.getBaogongRecordStatPage(reqVO));
}

6
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/bom/BomController.java
Unescape Escape View File

@ -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<BomRespVO> 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<PageResult<BomRespVO>> getBomPage(@Valid BomPageReqVO pageReqVO) {
PageResult<BomRespVO> 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<List<BomDetailRespVO>> getBomDetailListByBomId(@RequestParam("bomId") Long bomId) {
return success(bomService.getBomDetailListByBomId(bomId));
}

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/calholiday/CalHolidayController.java
Unescape Escape View File

@ -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<CalHolidayRespVO> 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<PageResult<CalHolidayRespVO>> getCalHolidayPage(@Valid CalHolidayPageReqVO pageReqVO) {
PageResult<CalHolidayDO> pageResult = calHolidayService.getCalHolidayPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, CalHolidayRespVO.class));

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/changerecord/ProduceReportChangeRecordController.java
Unescape Escape View File

@ -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<ProduceReportChangeRecordRespVO> 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<PageResult<ProduceReportChangeRecordRespVO>> getProduceReportChangeRecordPage(@Valid ProduceReportChangeRecordPageReqVO pageReqVO) {
PageResult<ProduceReportChangeRecordDO> pageResult = produceReportChangeRecordService.getProduceReportChangeRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ProduceReportChangeRecordRespVO.class));

6
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/criticalcomponent/CriticalComponentController.java
Unescape Escape View File

@ -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<CriticalComponentRespVO> 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<PageResult<CriticalComponentRespVO>> getCriticalComponentPage(@Valid CriticalComponentPageReqVO pageReqVO) {
PageResult<CriticalComponentDO> 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<List<CriticalComponentDO>> getCriticalComponentList() {
List<CriticalComponentDO> criticalComponentList= criticalComponentService.getCriticalComponentList();
return success(criticalComponentList);

6
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/customer/CrmCustomerController.java
Unescape Escape View File

@ -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<CrmCustomerRespVO> 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<PageResult<CrmCustomerRespVO>> getCustomerPage(@Valid CrmCustomerPageReqVO pageVO) {
// 1. 查询客户分页
PageResult<CrmCustomerDO> 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<PageResult<CrmCustomerRespVO>> getPutPoolRemindCustomerPage(@Valid CrmCustomerPageReqVO pageVO) {
// 1. 查询客户分页
PageResult<CrmCustomerDO> pageResult = customerService.getPutPoolRemindCustomerPage(pageVO, getLoginUserId());

2
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java
Unescape Escape View File

@ -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<EventStatisticsVO> getTaskStatistics(@RequestParam(name = "orgId") Long orgId) {
EventStatisticsVO vo = new EventStatisticsVO();

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/devicecriticalcomponent/DeviceCriticalComponentController.java
Unescape Escape View File

@ -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<DeviceCriticalComponentRespVO> 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<PageResult<DeviceCriticalComponentRespVO>> getDeviceCriticalComponentPage(@Valid DeviceCriticalComponentPageReqVO pageReqVO) {
PageResult<DeviceCriticalComponentDO> pageResult = deviceCriticalComponentService.getDeviceCriticalComponentPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, DeviceCriticalComponentRespVO.class));

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerComponentRelController.java
Unescape Escape View File

@ -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<DeviceLedgerComponentRelDO> 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<List<DeviceLedgerComponentRelDO>> listByDeviceLedgerId(@RequestParam("deviceLedgerId") Long deviceLedgerId) {
return success(deviceLedgerComponentRelService.getListByDeviceLedgerId(deviceLedgerId));
}

12
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java
Unescape Escape View File

@ -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<DeviceLedgerRespVO> 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<DeviceLedgerPageRespVO> 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<List<DeviceLedgerDO>> getDeviceLedgerList(@Valid DeviceLedgerPageReqVO pageReqVO) {
List<DeviceLedgerDO> 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<List<DeviceLedgerDO>> getDeviceLedgerListByNoUsed() {
List<DeviceLedgerDO> 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<List<DeviceLedgerDO>> getDeviceLedgerList2ByNoUsed(@RequestParam("id") Long id) {
List<DeviceLedgerDO> 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<PageResult<DeviceCapacityReportRespVO>> getDeviceCapacityReportPage(@Valid DeviceCapacityReportPageReqVO pageReqVO) {
return success(deviceLedgerService.getDeviceCapacityReportPage(pageReqVO));
}

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerSpareRelController.java
Unescape Escape View File

@ -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<DeviceLedgerSpareRelDO> 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<List<DeviceLedgerSpareRelDO>> listByDeviceLedgerId(@RequestParam("deviceLedgerId") Long deviceLedgerId) {
return success(deviceLedgerSpareRelService.getListByDeviceLedgerId(deviceLedgerId));
}

8
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceline/DeviceLineController.java
Unescape Escape View File

@ -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<DeviceLineRespVO> 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<PageResult<DeviceLineRespVO>> getDeviceLinePage(@Valid DeviceLinePageReqVO pageReqVO) {
PageResult<DeviceLineDO> pageResult = deviceLineService.getDeviceLinePage(pageReqVO);
PageResult<DeviceLineRespVO> 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<List<DeviceLineRespVO>> getDeviceLineList(@Valid DeviceLineListReqVO listReqVO) {
List<DeviceLineDO> 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<List<DeviceLineTreeRespVO>> getDeviceLineTree(@Valid DeviceLineListReqVO pageReqVO) {
List<DeviceLineTreeRespVO> tree = deviceLineService.getDeviceLineTree(pageReqVO);

8
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/devicetype/DeviceTypeController.java
Unescape Escape View File

@ -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<DeviceTypeRespVO> 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<PageResult<DeviceTypeRespVO>> getDeviceTypePage(@Valid DeviceTypePageReqVO pageReqVO) {
PageResult<DeviceTypeDO> 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<List<DeviceTypeRespVO>> getDeviceTypeList(@Valid DeviceTypeListReqVO listReqVO) {
List<DeviceTypeDO> 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<List<DeviceTypeTreeRespVO>> getDeviceTypeTree(@Valid DeviceTypeListReqVO pageReqVO) {
List<DeviceTypeTreeRespVO> tree = deviceTypeService.getDeviceTypeTree(pageReqVO);
return success(tree);

8
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvcheck/DvCheckController.java
Unescape Escape View File

@ -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<DvCheckRespVO> 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<PageResult<DvCheckRespVO>> getDvCheckPage(@Valid DvCheckPageReqVO pageReqVO) {
PageResult<DvCheckDO> 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<List<DvCheckDeviceDO>> 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<List<DvCheckSubjectDO>> getDvCheckSubjectListByPlanId(@RequestParam("planId") Long planId) {
return success(dvCheckService.getDvCheckSubjectListByPlanId(planId));
}

10
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvrepair/DvRepairController.java
Unescape Escape View File

@ -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<DvRepairRespVO> 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<DvRepairPageRespVO> 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<List<DvRepairRespVO>> getDvRepairList(@Valid DvRepairPageReqVO pageReqVO) {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<DvRepairDO> 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<List<DvRepairLineDO>> 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<List<DvRepairDO>> getRepairListByDeviceId(@RequestParam(value = "deviceId", required = false) Long deviceId,
@RequestParam(value = "code", required = false) String code,
@RequestParam(name = "startTime",required = false) String startTime,

6
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dvsubject/DvSubjectController.java
Unescape Escape View File

@ -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<DvSubjectRespVO> 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<PageResult<DvSubjectRespVO>> getDvSubjectPage(@Valid DvSubjectPageReqVO pageReqVO) {
PageResult<DvSubjectDO> pageResult = dvSubjectService.getDvSubjectPage(pageReqVO);
PageResult<DvSubjectRespVO> 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<List<DvSubjectDO>> getDvSubjectList() {
List<DvSubjectDO> dvSubjectDOList = dvSubjectService.getDvSubjectList();
return success(dvSubjectDOList);

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceCheckRecordController.java
Unescape Escape View File

@ -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<EnergyDeviceCheckRecordRespVO> 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<PageResult<EnergyDeviceCheckRecordRespVO>> getEnergyDeviceCheckRecordPage(@Valid EnergyDeviceCheckRecordPageReqVO pageReqVO) {
PageResult<EnergyDeviceCheckRecordDO> pageResult = energyDeviceCheckRecordService.getEnergyDeviceCheckRecordPage(pageReqVO);
PageResult<EnergyDeviceCheckRecordRespVO> pageResult1 =

12
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceController.java
Unescape Escape View File

@ -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<EnergyDeviceRespVO> 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<PageResult<EnergyDeviceRespVO>> getEnergyDevicePage(@Valid EnergyDevicePageReqVO pageReqVO) {
PageResult<EnergyDeviceDO> 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<PageResult<EnergyDeviceCheckRecordDO>> 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<EnergyDeviceCheckRecordDO> 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<List<HourEnergyValueVO>> 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<List<DayEnergyValueVO>> latestSevenDaysStatistics(
@RequestParam Long deviceTypeId,
@RequestParam Long orgId) {

2
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energydevice/EnergyDeviceReportController.java
Unescape Escape View File

@ -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<PageResult<EnergyDeviceReportRespVO>> getEnergyDeviceReportPage(@Valid EnergyDeviceReportPageReqVO pageReqVO) {
PageResult<EnergyDeviceReportDO> pageResult = energyDeviceReportService.getEnergyDeviceReportPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, EnergyDeviceReportRespVO.class));

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energyrecord/EnergyRecordController.java
Unescape Escape View File

@ -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<EnergyRecordRespVO> 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<PageResult<EnergyRecordRespVO>> getEnergyRecordPage(@Valid EnergyRecordPageReqVO pageReqVO) {
PageResult<EnergyRecordDO> pageResult = energyRecordService.getEnergyRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, EnergyRecordRespVO.class));

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energytype/EnergyTypeController.java
Unescape Escape View File

@ -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<EnergyTypeRespVO> 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<PageResult<EnergyTypeRespVO>> getEnergyTypePage(@Valid EnergyTypePageReqVO pageReqVO) {
PageResult<EnergyTypeDO> pageResult = energyTypeService.getEnergyTypePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, EnergyTypeRespVO.class));

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/errorrecord/ErrorRecordController.java
Unescape Escape View File

@ -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<ErrorRecordRespVO> 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<PageResult<ErrorRecordRespVO>> getErrorRecordPage(@Valid ErrorRecordPageReqVO pageReqVO) {
PageResult<ErrorRecordDO> pageResult = errorRecordService.getErrorRecordPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErrorRecordRespVO.class));

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/esopFile/EsopFileController.java
Unescape Escape View File

@ -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<EsopFileRespVO> 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<PageResult<EsopFileRespVO>> getFilePage(@Valid EsopFilePageReqVO pageReqVO) {
PageResult<EsopFileDO> pageResult = fileService.getFilePage(pageReqVO);
// 1.4 管理员信息

4
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/feedingplan/FeedingRecordPlanController.java
Unescape Escape View File

@ -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<FeedingRecordPlanRespVO> 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<PageResult<FeedingRecordPlanRespVO>> getFeedingRecordPlanPage(@Valid FeedingRecordPlanPageReqVO pageReqVO) {
PageResult<FeedingRecordPlanDO> pageResult = feedingRecordPlanService.getFeedingRecordPlanPage(pageReqVO);

8
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/feedingrecord/FeedingRecordController.java
Unescape Escape View File

@ -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<FeedingRecordRespVO> 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<PageResult<FeedingRecordRespVO>> getFeedingRecordPage(@Valid FeedingRecordPageReqVO pageReqVO) {
PageResult<FeedingRecordRespVO> pageResult = feedingRecordService.getFeedingRecordPage(pageReqVO);
// List<OrganizationDO> 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<List<FeedingRecordRespVO>> 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<List<FeedingRecordDetailRespVO>> getFeedingRecordDetailListByRecordId(@RequestParam("recordId") Long recordId) {
List<FeedingRecordDetailDO> detailDOList = feedingRecordService.getFeedingRecordDetailListByRecordId(recordId);
return success(feedingRecordService.buildVOList(detailDOList));

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save