From b6480bb8991e83a2efd5e4835ccc8ed0e87c067a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 22 七月 2024 14:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index 85e1ef5..58a0dfd 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -2,7 +2,6 @@
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.edgstoragecage.service.EdgStorageCageService;
-import com.mes.pp.entity.OptimizeDetail;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
import com.mes.utils.Result;
@@ -22,7 +21,7 @@
* @author zhoush
* @since 2024-04-07
*/
-@Api(tags = "璇嗗埆鏄剧ず")
+@Api(description = "璇嗗埆鏄剧ず")
@RestController
@RequestMapping("/taskCache")
public class TaskCacheController {
@@ -53,7 +52,6 @@
@PostMapping("/identControls")
@ResponseBody
public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) {
-
boolean issucess = edgStorageCageDetailsService.identWorn(identId,controlsId);
return Result.build(200,"鎴愬姛",issucess);
}
@@ -61,8 +59,9 @@
@ApiOperation("纾ㄨ竟浠诲姟 鍙傛暟()")
@PostMapping("/selectEdgTask")
@ResponseBody
- public Result selectEdgTask(String line) {
- List<TaskCache> EdgTasks = taskCacheService.selectEdgInfo(line);
+ public Result selectEdgTask(@RequestBody Map<String, String> arguments) {
+ String line=arguments.get("line");
+ List<Map<String,Object>> EdgTasks = taskCacheService.selectEdgInfo(line);
return Result.build(200,"鎴愬姛",EdgTasks);
}
--
Gitblit v1.8.0