From 3fe19c705a4b0e32096b5c39c5489ea111a10e15 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 27 八月 2024 09:58:39 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 8 ++------
1 files changed, 2 insertions(+), 6 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 8122b36..62508b2 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
@@ -41,7 +41,7 @@
@ResponseBody
public Result cutTerritory(String current) {
//engineerId=current;
- List<Map<String, Object>> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
+ List<List<Map<String, Object>>> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
return Result.build(200,"鎴愬姛",h);
}
@ApiOperation("璇嗗埆鏄剧ず 褰撳墠鐗堝浘 鍙傛暟()")
@@ -54,11 +54,7 @@
@ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[200锛氭嬁璧帮紝201:鐮存崯]锛�")
@PostMapping("/identControls")
@ResponseBody
- public Result identControls(@RequestBody Map<String, String> arguments) {
- /* arguments.put("glassId","鐜荤拑ID");
- arguments.put("controlsId","鍔熻兘鍙穂200鎷胯蛋/201鐮存崯]");*/
- /*arguments.put("line","1001");
- arguments.put("machine","璇嗗埆");*/
+ public Result identControls(@RequestBody Map<String, Object> arguments) {
boolean issucess = edgStorageCageDetailsService.identWorn(arguments);
return Result.build(200,"鎴愬姛",issucess);
}
--
Gitblit v1.8.0