From b4ff04d7dd22f0e48bf386cd422e885aef08fed7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 22 五月 2025 15:03:10 +0800
Subject: [PATCH] OPC通讯修改为S7通讯
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
index e5aea4c..67097d1 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
@@ -1,15 +1,20 @@
package com.mes.rawglasstask.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* <p>
@@ -32,5 +37,24 @@
return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.setRawGlassTaskRequest(request));
}
+ @ApiOperation("鎸夌収鏉′欢鏌ョ湅浠撳偍鍘嗗彶浠诲姟")
+ @PostMapping("/queryRawGlassHistoryTask")
+ public Result<Page<RawGlassStorageTask>> queryRawGlassHistoryTask(@RequestBody @Validated RawGlassTaskRequest request) {
+ return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.queryRawGlassHistoryTask(request));
+ }
+
+ @ApiOperation("浠诲姟鎴愬姛澶勭悊")
+ @PostMapping("/taskSuccess")
+ public Result<Boolean> taskSuccess(Long taskId) {
+ return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.taskSuccess(taskId));
+ }
+
+ @ApiOperation("浠诲姟澶辫触澶勭悊")
+ @PostMapping("/taskError")
+ public Result<Boolean> taskError(Long taskId) {
+ return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageTaskService.taskError(taskId));
+ }
+
+
}
--
Gitblit v1.8.0