From 051613aa73be3e75af5a6dfdb86a722bcb5af094 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 八月 2024 16:46:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 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 cf3d9d1..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
@@ -1,7 +1,19 @@
package com.mes.taskcache.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.mes.job.CacheGlassTask.engineerId;
/**
* <p>
@@ -11,9 +23,50 @@
* @author zhoush
* @since 2024-04-07
*/
+@Api(description = "璇嗗埆鏄剧ず")
@RestController
@RequestMapping("/taskCache")
public class TaskCacheController {
+ @Autowired
+ private EdgStorageCageDetailsService edgStorageCageDetailsService;
+
+ @Autowired
+ private EdgStorageCageService edgStorageCageService;
+ @Autowired
+ private TaskCacheService taskCacheService;
+
+ @ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
+ @PostMapping("/cutTerritory")
+ @ResponseBody
+ public Result cutTerritory(String current) {
+ //engineerId=current;
+ List<List<Map<String, Object>>> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
+ return Result.build(200,"鎴愬姛",h);
+ }
+ @ApiOperation("璇嗗埆鏄剧ず 褰撳墠鐗堝浘 鍙傛暟()")
+ @PostMapping("/currentCutTerritory")
+ @ResponseBody
+ public Result currentCutTerritory() {
+ List<Map<String, Object>> h = edgStorageCageDetailsService.selectCutTerritory();
+ return Result.build(200,"鎴愬姛",h);
+ }
+ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[200锛氭嬁璧帮紝201:鐮存崯]锛�")
+ @PostMapping("/identControls")
+ @ResponseBody
+ public Result identControls(@RequestBody Map<String, Object> arguments) {
+ 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);
+ }
+
}
--
Gitblit v1.8.0