From 865e425cdf7395fece0a53a6def75e2c84d6dbf0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 15 十月 2024 09:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
index cc4935b..ca0f4f2 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
@@ -1,9 +1,17 @@
package com.mes.md.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.mes.md.entity.Machine;
+import com.mes.md.entity.PrimitiveTask;
+import com.mes.md.entity.Tasking;
+import com.mes.md.service.PrimitiveTaskService;
+import com.mes.md.service.TaskingService;
+import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
/**
* <p>
@@ -16,6 +24,22 @@
@RestController
@RequestMapping("/primitiveTask")
public class PrimitiveTaskController {
+ @Autowired
+ private PrimitiveTaskService primitiveTaskService;
+ @ApiOperation("鏌ヨ褰撳墠璁惧锛屾湭瀹屽伐鐘舵�佺殑绾夸笂浠诲姟")
+ @PostMapping("/selectPrimitiveTask")
+ @ResponseBody
+ public Result findMachineTask(@RequestBody PrimitiveTask primitiveTask) {
+ List<PrimitiveTask> list =primitiveTaskService.selectPrimitiveTask(primitiveTask);
+ return Result.build(200,"鎴愬姛",list);
+ }
+ @ApiOperation("鏍规嵁鎵规鍙疯繘琛屾墜鍔ㄦ姤宸�")
+ @PostMapping("/updatePrimitiveTask")
+ @ResponseBody
+ public Result updatePrimitiveTask(@RequestBody PrimitiveTask primitiveTask) {
+ boolean list =primitiveTaskService.updatePrimitiveTask(primitiveTask);
+ return Result.build(200,"鎴愬姛",list);
+ }
}
--
Gitblit v1.8.0