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/metering/MesDvMeteringController.java | 145 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 145 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
new file mode 100644
index 0000000..531ccb3
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/metering/MesDvMeteringController.java
@@ -0,0 +1,145 @@
+package cn.iocoder.yudao.module.mes.controller.admin.dv.metering;
+
+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.metering.vo.MesDvMeteringPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.metering.vo.MesDvMeteringRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.metering.vo.MesDvMeteringSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.dv.metering.MesDvMeteringDO;
+import cn.iocoder.yudao.module.mes.enums.dv.MesDvMeteringExpireStatusEnum;
+import cn.iocoder.yudao.module.mes.service.dv.metering.MesDvMeteringService;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+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.time.LocalDate;
+import java.time.temporal.ChronoUnit;
+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")
+@Validated
+public class MesDvMeteringController {
+
+ @Resource
+ private MesDvMeteringService meteringService;
+ @Resource
+ private DeptApi deptApi;
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓璁￠噺鍣ㄥ叿")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering:create')")
+ public CommonResult<Long> createMetering(@Valid @RequestBody MesDvMeteringSaveReqVO createReqVO) {
+ return success(meteringService.createMetering(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊璁￠噺鍣ㄥ叿")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering:update')")
+ public CommonResult<Boolean> updateMetering(@Valid @RequestBody MesDvMeteringSaveReqVO updateReqVO) {
+ meteringService.updateMetering(updateReqVO);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎璁￠噺鍣ㄥ叿")
+ @Parameter(name = "id", description = "缂栧彿", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering:delete')")
+ public CommonResult<Boolean> deleteMetering(@RequestParam("id") Long id) {
+ meteringService.deleteMetering(id);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱璁￠噺鍣ㄥ叿")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering:query')")
+ public CommonResult<MesDvMeteringRespVO> getMetering(@RequestParam("id") Long id) {
+ MesDvMeteringDO metering = meteringService.getMetering(id);
+ if (metering == null) {
+ return success(null);
+ }
+ return success(buildMeteringRespVOList(Collections.singletonList(metering)).get(0));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱璁￠噺鍣ㄥ叿鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering:query')")
+ public CommonResult<PageResult<MesDvMeteringRespVO>> getMeteringPage(@Valid MesDvMeteringPageReqVO pageReqVO) {
+ PageResult<MesDvMeteringDO> pageResult = meteringService.getMeteringPage(pageReqVO);
+ return success(new PageResult<>(buildMeteringRespVOList(pageResult.getList()), pageResult.getTotal()));
+ }
+
+ @GetMapping("/export-excel")
+ @Operation(summary = "瀵煎嚭璁￠噺鍣ㄥ叿 Excel")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportMeteringExcel(@Valid MesDvMeteringPageReqVO pageReqVO,
+ HttpServletResponse response) throws IOException {
+ pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ List<MesDvMeteringDO> list = meteringService.getMeteringPage(pageReqVO).getList();
+ ExcelUtils.write(response, "璁￠噺鍣ㄥ叿.xls", "鏁版嵁", MesDvMeteringRespVO.class,
+ buildMeteringRespVOList(list));
+ }
+
+ @GetMapping("/simple-list")
+ @Operation(summary = "鑾峰緱璁￠噺鍣ㄥ叿绮剧畝鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勪笅鎷夐�夐」")
+ @PreAuthorize("@ss.hasPermission('mes:dv-metering:query')")
+ public CommonResult<List<MesDvMeteringRespVO>> getMeteringSimpleList() {
+ List<MesDvMeteringDO> list = meteringService.getMeteringList();
+ return success(buildMeteringRespVOList(list));
+ }
+
+ // ==================== 鎷兼帴 VO ====================
+
+ @SuppressWarnings("DuplicatedCode")
+ private List<MesDvMeteringRespVO> buildMeteringRespVOList(List<MesDvMeteringDO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return Collections.emptyList();
+ }
+ // 1. 鎵归噺鑾峰彇鍏宠仈鏁版嵁
+ int remindDays = meteringService.getRemindDays();
+ Map<Long, DeptRespDTO> deptMap = CollUtil.isNotEmpty(convertSet(list, MesDvMeteringDO::getDeptId))
+ ? deptApi.getDeptMap(convertSet(list, MesDvMeteringDO::getDeptId)) : Collections.emptyMap();
+ Map<Long, AdminUserRespDTO> userMap = CollUtil.isNotEmpty(convertSet(list, MesDvMeteringDO::getChargeUserId))
+ ? adminUserApi.getUserMap(convertSet(list, MesDvMeteringDO::getChargeUserId)) : Collections.emptyMap();
+ // 2. 鎷兼帴 VO
+ return BeanUtils.toBean(list, MesDvMeteringRespVO.class, vo -> {
+ // 璁＄畻鍒版湡鐘舵�佷笌鍓╀綑澶╂暟
+ vo.setExpireStatus(MesDvMeteringExpireStatusEnum.compute(vo.getNextCheckDate(), remindDays));
+ if (vo.getNextCheckDate() != null) {
+ vo.setExpireDays(ChronoUnit.DAYS.between(LocalDate.now(), vo.getNextCheckDate()));
+ }
+ MapUtils.findAndThen(deptMap, vo.getDeptId(), dept -> vo.setDeptName(dept.getName()));
+ MapUtils.findAndThen(userMap, vo.getChargeUserId(),
+ user -> vo.setChargeUserNickname(user.getNickname()));
+ });
+ }
+
+}
--
Gitblit v1.9.3