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 | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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 8b10bb1..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,7 +1,7 @@
package com.mes.rawglasstask.controller;
-import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+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;
@@ -14,24 +14,47 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍘熺墖浠诲姟鎺у埗鍣�
* </p>
*
* @author wf
* @since 2024-09-10
*/
@RestController
-@RequestMapping("/raw_glass_storage_task")
+@RequestMapping("/rawGlassStorageTask")
public class RawGlassStorageTaskController {
+
@Autowired
- private RawGlassStorageTaskService rwService; //杩欓噷鏄綘瀹氫箟璋冪敤鐨剆ervice锛岃繖涓槸鎶ュ伐鐨�
- @ApiOperation("鍘熺墖浠撳偍鏁版嵁鏌ヨ")
- @PostMapping("/selectRawglasstask")
- public Result selectDamage(@RequestBody RawGlassTaskRequest rw) {
- return Result.build(200,"鏌ヨ鎴愬姛", rwService.setRawGlassTaskRequest(rw));
+ private RawGlassStorageTaskService rawGlassStorageTaskService;
+
+ @ApiOperation("璁剧疆鍘熺墖浠撳偍鏌ヨ鏉′欢")
+ @PostMapping("/setRawGlassTaskRequest")
+ public Result setRawGlassTaskRequest(@RequestBody RawGlassTaskRequest request) {
+ 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