From ac2e2b5af3726ee64dc37c3ebf26989a0346f22a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:05 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/telemetry/MesDvTelemetryController.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/telemetry/MesDvTelemetryController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/telemetry/MesDvTelemetryController.java
index 05fa244..f329e21 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/telemetry/MesDvTelemetryController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/telemetry/MesDvTelemetryController.java
@@ -3,6 +3,7 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.telemetry.vo.MesDvTelemetryCheckSummaryRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.dv.telemetry.vo.MesDvTelemetryDeviceRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.dv.telemetry.vo.MesDvTelemetryLatestReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.dv.telemetry.vo.MesDvTelemetryPageReqVO;
@@ -14,7 +15,6 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,14 +35,12 @@
@GetMapping("/pull")
@Operation(summary = "鎷夊彇鏁伴噰鏁版嵁骞跺叆搴擄紙杩� 5 鍒嗛挓璁惧鏁版嵁锛�")
- @PreAuthorize("@ss.hasPermission('mes:dv-telemetry:query')")
public CommonResult<MesDvTelemetryPullRespVO> pullTelemetry() {
return success(telemetryService.pullTelemetry());
}
@GetMapping("/page")
@Operation(summary = "鍒嗛〉鏌ヨ鏁伴噰閬ユ祴鏁版嵁")
- @PreAuthorize("@ss.hasPermission('mes:dv-telemetry:query')")
public CommonResult<PageResult<MesDvTelemetryRespVO>> getTelemetryPage(@Valid MesDvTelemetryPageReqVO pageReqVO) {
PageResult<MesDvTelemetryDO> pageResult = telemetryService.getTelemetryPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, MesDvTelemetryRespVO.class));
@@ -50,7 +48,6 @@
@GetMapping("/latest")
@Operation(summary = "鏌ヨ鍚勮澶囨渶鏂伴仴娴嬫暟鎹紙瀹炴椂鐩戞帶锛�")
- @PreAuthorize("@ss.hasPermission('mes:dv-telemetry:query')")
public CommonResult<List<MesDvTelemetryRespVO>> getLatestTelemetry(MesDvTelemetryLatestReqVO reqVO) {
List<MesDvTelemetryDO> list = telemetryService.getLatestTelemetry(reqVO);
return success(BeanUtils.toBean(list, MesDvTelemetryRespVO.class));
@@ -58,9 +55,21 @@
@GetMapping("/device-list")
@Operation(summary = "鏌ヨ鏁伴噰璁惧涓嬫媺鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mes:dv-telemetry:query')")
public CommonResult<List<MesDvTelemetryDeviceRespVO>> getDeviceList() {
return success(telemetryService.getDeviceList());
}
+ @GetMapping("/check")
+ @Operation(summary = "渚涚數鍙傛暟姣斿鏍￠獙鏄庣粏锛堝悇璁惧鏈�鏂板弬鏁� vs 鏍囧噯鍊硷級")
+ public CommonResult<List<MesDvTelemetryRespVO>> getCheckList(MesDvTelemetryLatestReqVO reqVO) {
+ List<MesDvTelemetryDO> list = telemetryService.getLatestTelemetry(reqVO);
+ return success(BeanUtils.toBean(list, MesDvTelemetryRespVO.class));
+ }
+
+ @GetMapping("/check-summary")
+ @Operation(summary = "渚涚數鍙傛暟姣斿鏍￠獙缁熻锛堟寜璁惧鑱氬悎寮傚父鐜囷級")
+ public CommonResult<List<MesDvTelemetryCheckSummaryRespVO>> getCheckSummary(MesDvTelemetryLatestReqVO reqVO) {
+ return success(telemetryService.getCheckSummary(reqVO));
+ }
+
}
--
Gitblit v1.9.3