From 9075785a9e14f6220783d052d231f915c6930b87 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:21:45 +0800
Subject: [PATCH] revert(collect): 撤销 collect 数采模块（新高设备管理已有自己的采集方式）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java
index 990d82d..497deb5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java
@@ -71,7 +71,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱褰掓。鍙拌处")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pd-archive:query')")
public CommonResult<MesPdArchiveRespVO> getArchive(@RequestParam("id") Long id) {
MesPdArchiveDO archive = archiveService.getArchive(id);
if (archive == null) {
@@ -82,9 +81,8 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱褰掓。鍙拌处鍒嗛〉锛堟寜椤圭洰/浜у搧鑱氬悎锛�")
- @PreAuthorize("@ss.hasPermission('mes:pd-archive:query')")
- public CommonResult<PageResult<MesPdArchiveRespVO>> getArchivePage(@Valid MesPdArchivePageReqVO pageReqVO,
- Page<MesPdArchiveGroupRespVO> page) {
+ public CommonResult<PageResult<MesPdArchiveRespVO>> getArchivePage(@Valid MesPdArchivePageReqVO pageReqVO) {
+ Page<MesPdArchiveGroupRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, page);
return CommonResult.success(new PageResult<>(
buildArchiveRespVOList(archivePage.getRecords()), archivePage.getTotal()));
@@ -93,7 +91,6 @@
@GetMapping("/detail-by-product")
@Operation(summary = "鑾峰緱褰掓。鍙拌处璇︽儏锛堟寜浜у搧锛�")
@Parameter(name = "productCode", description = "浜у搧缂栧彿", required = true, example = "1")
- @PreAuthorize("@ss.hasPermission('mes:pd-archive:query')")
public CommonResult<List<MesPdArchiveDetailRespVO>> getArchiveDetailByProduct(@RequestParam("productCode") String productCode) {
return success(archiveService.getArchiveDetailByProductCode(productCode));
}
@@ -105,7 +102,9 @@
public void exportArchiveExcel(@Valid MesPdArchivePageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, null);
+ // 娉ㄦ剰锛歁apper 杩斿洖 IPage锛屽繀椤讳紶鍏ラ潪绌虹殑鍒嗛〉瀵硅薄锛泂ize=-1 琛ㄧず涓嶅垎椤碉紝searchCount=false 璺宠繃 count 鏌ヨ
+ Page<MesPdArchiveGroupRespVO> page = new Page<>(1, PageParam.PAGE_SIZE_NONE, false);
+ IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, page);
ExcelUtils.write(response, "褰掓。鍙拌处.xls", "鏁版嵁", MesPdArchiveRespVO.class,
buildArchiveRespVOList(archivePage.getRecords()));
}
--
Gitblit v1.9.3