From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
index a0cca8c..259df32 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
@@ -12,6 +12,8 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.GanttDataRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskAutoGeneratePreviewRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskAutoGenerateReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskPauseReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskResumeReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskSaveReqVO;
@@ -48,6 +50,11 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
import cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum;
import cn.iocoder.yudao.module.mes.service.pro.feedback.MesProFeedbackService;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskPauseRecordDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskPauseRecordMapper;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskPauseRecordRespVO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import java.io.IOException;
import java.math.BigDecimal;
@@ -83,6 +90,10 @@
private MesProRouteProcessService routeProcessService;
@Resource
private MesProFeedbackService feedbackService;
+ @Resource
+ private MesProTaskPauseRecordMapper pauseRecordMapper;
+ @Resource
+ private AdminUserApi adminUserApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鐢熶骇浠诲姟")
@@ -105,7 +116,6 @@
@Parameter(name = "workstationId", description = "宸ヤ綔绔欑紪鍙�", required = true),
@Parameter(name = "quantity", description = "鎺掍骇鏁伴噺", required = true)
})
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<java.util.Map<String, Object>> calculateDuration(
@RequestParam("workstationId") Long workstationId,
@RequestParam("quantity") BigDecimal quantity) {
@@ -119,6 +129,22 @@
@PreAuthorize("@ss.hasPermission('mes:pro-task:delete')")
public CommonResult<Boolean> deleteTask(@RequestParam("id") Long id) {
taskService.deleteTask(id);
+ return success(true);
+ }
+
+ @PutMapping("/pause")
+ @Operation(summary = "鐢熶骇浠诲姟鍋滃伐")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:update')")
+ public CommonResult<Boolean> pauseTask(@Valid @RequestBody MesProTaskPauseReqVO pauseReqVO) {
+ taskService.pauseTask(pauseReqVO);
+ return success(true);
+ }
+
+ @PutMapping("/resume")
+ @Operation(summary = "鐢熶骇浠诲姟澶嶅伐")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:update')")
+ public CommonResult<Boolean> resumeTask(@Valid @RequestBody MesProTaskResumeReqVO resumeReqVO) {
+ taskService.resumeTask(resumeReqVO);
return success(true);
}
@@ -142,7 +168,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐢熶骇浠诲姟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<MesProTaskRespVO> getTask(@RequestParam("id") Long id) {
MesProTaskDO task = taskService.getTask(id);
if (task == null) {
@@ -153,7 +178,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐢熶骇浠诲姟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getTaskPage(@Valid MesProTaskPageReqVO pageReqVO) {
PageResult<MesProTaskDO> pageResult = taskService.getTaskPage(pageReqVO);
return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -161,15 +185,47 @@
@GetMapping("/pending-feedback-page")
@Operation(summary = "鑾峰緱寰呮姤宸ュ彴璐﹀垎椤�", description = "宸叉帓浜т笖浠嶆湁寰呮姤宸ユ暟閲忕殑浠诲姟锛堢姸鎬�=杩涜涓級")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<PageResult<MesProTaskRespVO>> getPendingFeedbackPage(@Valid MesProTaskPageReqVO pageReqVO) {
PageResult<MesProTaskDO> pageResult = taskService.getPendingFeedbackPage(pageReqVO);
- return success(new PageResult<>(buildTaskRespVOList(pageResult.getList()), pageResult.getTotal()));
+ List<MesProTaskRespVO> respVOList = buildTaskRespVOList(pageResult.getList());
+
+ if (CollUtil.isNotEmpty(respVOList)) {
+ Set<Long> taskIds = convertSet(respVOList, MesProTaskRespVO::getId);
+ List<MesProTaskPauseRecordDO> records = pauseRecordMapper.selectListByTaskIds(taskIds);
+ if (CollUtil.isNotEmpty(records)) {
+ Set<Long> userIds = new HashSet<>();
+ records.forEach(r -> {
+ if (r.getPauseUserId() != null) userIds.add(r.getPauseUserId());
+ if (r.getResumeUserId() != null) userIds.add(r.getResumeUserId());
+ });
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+
+ Map<Long, List<MesProTaskPauseRecordRespVO>> pauseRecordMap = new HashMap<>();
+ for (MesProTaskPauseRecordDO record : records) {
+ MesProTaskPauseRecordRespVO vo = BeanUtils.toBean(record, MesProTaskPauseRecordRespVO.class);
+ if (record.getPauseUserId() != null && userMap.containsKey(record.getPauseUserId())) {
+ vo.setPauseUserName(userMap.get(record.getPauseUserId()).getNickname());
+ }
+ if (record.getResumeUserId() != null && userMap.containsKey(record.getResumeUserId())) {
+ vo.setResumeUserName(userMap.get(record.getResumeUserId()).getNickname());
+ }
+ pauseRecordMap.computeIfAbsent(record.getTaskId(), k -> new ArrayList<>()).add(vo);
+ }
+ respVOList.forEach(vo -> vo.setPauseRecords(pauseRecordMap.get(vo.getId())));
+ }
+ }
+
+ return success(new PageResult<>(respVOList, pageResult.getTotal()));
+ }
+
+ @GetMapping("/pending-count-by-workstation")
+ @Operation(summary = "鎸夊伐浣滅珯鑾峰緱寰呮姤宸ヤ换鍔℃暟", description = "宸ヤ綔鍙伴�夋嫨宸ヤ綔绔欏崱鐗囧睍绀猴紝鍙ｅ緞鍚屽緟鎶ュ伐鍙拌处")
+ public CommonResult<Map<Long, Long>> getPendingFeedbackCountByWorkstation() {
+ return success(taskService.getPendingFeedbackCountByWorkstation());
}
@GetMapping("/gantt-list")
@Operation(summary = "鑾峰緱鐢樼壒鍥句换鍔″垪琛�", description = "鍚庣缁勮宸ュ崟=project + 浠诲姟=task 鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
public CommonResult<List<GanttDataRespVO>> listGanttTaskList(@Valid MesProWorkOrderPageReqVO reqVO) {
// 1.1 鏌ヨ鍖归厤鐨勫伐鍗曪紙涓嶅垎椤碉級
reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
--
Gitblit v1.9.3