From 3ca932ad348e06449c63a1eeda3e4d3f5c5f9f35 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 13 八月 2024 14:13:54 +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 | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 e48a6db..99a18f1 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
@@ -1,7 +1,8 @@
package com.mes.taskcache.controller;
-import com.mes.edgglasstask.entity.request.IdentWornRequest;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.edgstoragecage.service.EdgStorageCageService;
+import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
@@ -12,9 +13,11 @@
import java.util.List;
import java.util.Map;
+import static com.mes.job.CacheGlassTask.engineerId;
+
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -29,6 +32,8 @@
private EdgStorageCageDetailsService edgStorageCageDetailsService;
@Autowired
+ private EdgStorageCageService edgStorageCageService;
+ @Autowired
private TaskCacheService taskCacheService;
@ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
@@ -37,31 +42,34 @@
public Result cutTerritory(String current) {
//engineerId=current;
List<List<Map<String, Object>>> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
- return Result.build(200, "鎴愬姛", h);
+ return Result.build(200,"鎴愬姛",h);
}
-
@ApiOperation("璇嗗埆鏄剧ず 褰撳墠鐗堝浘 鍙傛暟()")
@PostMapping("/currentCutTerritory")
@ResponseBody
public Result currentCutTerritory() {
List<Map<String, Object>> h = edgStorageCageDetailsService.selectCutTerritory();
- return Result.build(200, "鎴愬姛", h);
+ return Result.build(200,"鎴愬姛",h);
}
-
- @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[9锛氭嬁璧帮紝8:鐮存崯]锛�")
+ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[200锛氭嬁璧帮紝201:鐮存崯]锛�")
@PostMapping("/identControls")
@ResponseBody
- public Result<String> identControls(@RequestBody IdentWornRequest request) {
- return Result.build(200, "鎴愬姛", edgStorageCageDetailsService.identControls(request));
+ public Result identControls(@RequestBody Map<String, String> arguments) {
+ /* arguments.put("glassId","鐜荤拑ID");
+ arguments.put("controlsId","鍔熻兘鍙穂200鎷胯蛋/201鐮存崯]");*/
+ /*arguments.put("line","1001");
+ arguments.put("machine","璇嗗埆");*/
+ boolean issucess = edgStorageCageDetailsService.identWorn(arguments);
+ return Result.build(200,"鎴愬姛",issucess);
}
@ApiOperation("纾ㄨ竟浠诲姟 鍙傛暟()")
@PostMapping("/selectEdgTask")
@ResponseBody
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);
+ String line=arguments.get("line");
+ List<Map<String,Object>> EdgTasks = taskCacheService.selectEdgInfo(line);
+ return Result.build(200,"鎴愬姛",EdgTasks);
}
}
--
Gitblit v1.8.0