From bee96a1d36c86068cd5a7eb69f4e3294a8123b04 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 03 七月 2026 18:02:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java | 146 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 146 insertions(+), 0 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
new file mode 100644
index 0000000..990d82d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/archive/MesPdArchiveController.java
@@ -0,0 +1,146 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pd.archive;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.archive.vo.*;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pd.archive.MesPdArchiveDO;
+import cn.iocoder.yudao.module.mes.service.pd.archive.MesPdArchiveService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "绠＄悊鍚庡彴 - MES 褰掓。鍙拌处")
+@RestController
+@RequestMapping("/mes/pd/archive")
+@Validated
+public class MesPdArchiveController {
+
+ @Resource
+ private MesPdArchiveService archiveService;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓褰掓。鍙拌处")
+ @PreAuthorize("@ss.hasPermission('mes:pd-archive:create')")
+ public CommonResult<Long> createArchive(@Valid @RequestBody MesPdArchiveSaveReqVO createReqVO) {
+ return success(archiveService.createArchive(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊褰掓。鍙拌处")
+ @PreAuthorize("@ss.hasPermission('mes:pd-archive:update')")
+ public CommonResult<Boolean> updateArchive(@Valid @RequestBody MesPdArchiveSaveReqVO updateReqVO) {
+ archiveService.updateArchive(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎褰掓。鍙拌处")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:pd-archive:delete')")
+ public CommonResult<Boolean> deleteArchive(@RequestParam("id") Long id) {
+ archiveService.deleteArchive(id);
+ return success(true);
+ }
+
+ @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) {
+ return success(null);
+ }
+ return success(BeanUtils.toBean(archive, MesPdArchiveRespVO.class));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱褰掓。鍙拌处鍒嗛〉锛堟寜椤圭洰/浜у搧鑱氬悎锛�")
+ @PreAuthorize("@ss.hasPermission('mes:pd-archive:query')")
+ public CommonResult<PageResult<MesPdArchiveRespVO>> getArchivePage(@Valid MesPdArchivePageReqVO pageReqVO,
+ Page<MesPdArchiveGroupRespVO> page) {
+ IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, page);
+ return CommonResult.success(new PageResult<>(
+ buildArchiveRespVOList(archivePage.getRecords()), archivePage.getTotal()));
+ }
+
+ @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));
+ }
+
+ @GetMapping("/export-excel")
+ @Operation(summary = "瀵煎嚭褰掓。鍙拌处 Excel")
+ @PreAuthorize("@ss.hasPermission('mes:pd-archive:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportArchiveExcel(@Valid MesPdArchivePageReqVO pageReqVO,
+ HttpServletResponse response) throws IOException {
+ pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ IPage<MesPdArchiveGroupRespVO> archivePage = archiveService.getArchivePageGroupByProject(pageReqVO, null);
+ ExcelUtils.write(response, "褰掓。鍙拌处.xls", "鏁版嵁", MesPdArchiveRespVO.class,
+ buildArchiveRespVOList(archivePage.getRecords()));
+ }
+
+ // ==================== 鎷兼帴 VO ====================
+
+ private List<MesPdArchiveRespVO> buildArchiveRespVOList(List<MesPdArchiveGroupRespVO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ // 1. 鎵归噺鑾峰彇鏇存柊浜烘樀绉帮紙updater 鏄� String 绫诲瀷鐨勭敤鎴稩D锛�
+ Set<String> updaterIds = list.stream()
+ .map(MesPdArchiveGroupRespVO::getUpdater)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+ Map<Long, AdminUserRespDTO> userMap = Collections.emptyMap();
+ if (!updaterIds.isEmpty()) {
+ Set<Long> userIds = updaterIds.stream()
+ .filter(id -> id.matches("\\d+"))
+ .map(Long::parseLong)
+ .collect(Collectors.toSet());
+ if (!userIds.isEmpty()) {
+ userMap = adminUserApi.getUserMap(userIds);
+ }
+ }
+ // 2. 鎷兼帴 VO
+ Map<Long, AdminUserRespDTO> finalUserMap = userMap;
+ return BeanUtils.toBean(list, MesPdArchiveRespVO.class, vo -> {
+ // productCode銆乸roductName銆乤rchiveCount 宸蹭粠 XML 鏌ヨ鏄犲皠鍒� GroupRespVO
+ // 鏇存柊浜烘樀绉�
+ if (vo.getUpdater() != null && vo.getUpdater().matches("\\d+")) {
+ MapUtils.findAndThen(finalUserMap, Long.parseLong(vo.getUpdater()),
+ user -> vo.setUpdaterNickname(user.getNickname()));
+ }
+ });
+ }
+
+}
--
Gitblit v1.9.3