From 52b61fce22f188e37a88c20740e005ff109637a7 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 15:02:27 +0800
Subject: [PATCH] dos: 新增表：mes_pro_task_pause_record
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java | 130 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 130 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
new file mode 100644
index 0000000..332d12d
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/meteringcheck/MesDvMeteringCheckController.java
@@ -0,0 +1,130 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dv.meteringcheck;
+
+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.dv.meteringcheck.vo.MesDvMeteringCheckPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.meteringcheck.vo.MesDvMeteringCheckRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.meteringcheck.vo.MesDvMeteringCheckSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.metering.MesDvMeteringDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.meteringcheck.MesDvMeteringCheckDO;
+import cn.iocoder.yudao.module.mes.service.dv.metering.MesDvMeteringService;
+import cn.iocoder.yudao.module.mes.service.dv.meteringcheck.MesDvMeteringCheckService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import 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.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+
+@Tag(name = "绠＄悊鍚庡彴 - MES 璁￠噺妫�娴嬭褰�")
+@RestController
+@RequestMapping("/mes/dv/metering-check")
+@Validated
+public class MesDvMeteringCheckController {
+
+ @Resource
+ private MesDvMeteringCheckService meteringCheckService;
+ @Resource
+ private MesDvMeteringService meteringService;
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓璁￠噺妫�娴嬭褰�")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering-check:create')")
+ public CommonResult<Long> createMeteringCheck(@Valid @RequestBody MesDvMeteringCheckSaveReqVO createReqVO) {
+ return success(meteringCheckService.createMeteringCheck(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊璁￠噺妫�娴嬭褰�")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering-check:update')")
+ public CommonResult<Boolean> updateMeteringCheck(@Valid @RequestBody MesDvMeteringCheckSaveReqVO updateReqVO) {
+ meteringCheckService.updateMeteringCheck(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎璁￠噺妫�娴嬭褰�")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering-check:delete')")
+ public CommonResult<Boolean> deleteMeteringCheck(@RequestParam("id") Long id) {
+ meteringCheckService.deleteMeteringCheck(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱璁￠噺妫�娴嬭褰�")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering-check:query')")
+ public CommonResult<MesDvMeteringCheckRespVO> getMeteringCheck(@RequestParam("id") Long id) {
+ MesDvMeteringCheckDO check = meteringCheckService.getMeteringCheck(id);
+ if (check == null) {
+ return success(null);
+ }
+ return success(buildMeteringCheckRespVOList(Collections.singletonList(check)).get(0));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱璁￠噺妫�娴嬭褰曞垎椤�")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering-check:query')")
+ public CommonResult<PageResult<MesDvMeteringCheckRespVO>> getMeteringCheckPage(
+ @Valid MesDvMeteringCheckPageReqVO pageReqVO) {
+ PageResult<MesDvMeteringCheckDO> pageResult = meteringCheckService.getMeteringCheckPage(pageReqVO);
+ return success(new PageResult<>(buildMeteringCheckRespVOList(pageResult.getList()), pageResult.getTotal()));
+ }
+
+ @GetMapping("/export-excel")
+ @Operation(summary = "瀵煎嚭璁￠噺妫�娴嬭褰� Excel")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering-check:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportMeteringCheckExcel(@Valid MesDvMeteringCheckPageReqVO pageReqVO,
+ HttpServletResponse response) throws IOException {
+ pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ List<MesDvMeteringCheckDO> list = meteringCheckService.getMeteringCheckPage(pageReqVO).getList();
+ ExcelUtils.write(response, "璁￠噺妫�娴嬭褰�.xls", "鏁版嵁", MesDvMeteringCheckRespVO.class,
+ buildMeteringCheckRespVOList(list));
+ }
+
+ // ==================== 鎷兼帴 VO ====================
+
+ @SuppressWarnings("DuplicatedCode")
+ private List<MesDvMeteringCheckRespVO> buildMeteringCheckRespVOList(List<MesDvMeteringCheckDO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ // 1. 鎵归噺鑾峰彇鍏宠仈鏁版嵁
+ Map<Long, MesDvMeteringDO> meteringMap = meteringService.getMeteringMap(
+ convertSet(list, MesDvMeteringCheckDO::getMeteringId));
+ Map<Long, AdminUserRespDTO> userMap = CollUtil.isNotEmpty(convertSet(list, MesDvMeteringCheckDO::getCheckUserId))
+ ? adminUserApi.getUserMap(convertSet(list, MesDvMeteringCheckDO::getCheckUserId)) : Collections.emptyMap();
+ // 2. 鎷兼帴 VO
+ return BeanUtils.toBean(list, MesDvMeteringCheckRespVO.class, vo -> {
+ MapUtils.findAndThen(meteringMap, vo.getMeteringId(),
+ metering -> vo.setMeteringCode(metering.getCode()).setMeteringName(metering.getName()));
+ MapUtils.findAndThen(userMap, vo.getCheckUserId(),
+ user -> vo.setCheckUserNickname(user.getNickname()));
+ });
+ }
+
+}
--
Gitblit v1.9.3