From 00bbe3cdbb88edc0126064b3366a4191cf56222c Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 26 九月 2024 15:04:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 55 ++++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 33 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 9634f19..850789e 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,14 +1,13 @@
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.edgstoragecage.service.impl.EdgStorageCageDetailsServiceImpl;
-import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
-import com.mes.taskcache.service.HangzhoumesService;
-import com.mes.taskcache.service.PpService;
+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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -16,12 +15,13 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
* @since 2024-04-07
*/
+@Api(description = "璇嗗埆鏄剧ず")
@RestController
@RequestMapping("/taskCache")
public class TaskCacheController {
@@ -30,50 +30,39 @@
private EdgStorageCageDetailsService edgStorageCageDetailsService;
@Autowired
- private HangzhoumesService hangzhoumesService;
+ private TaskCacheService taskCacheService;
@ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
@PostMapping("/cutTerritory")
@ResponseBody
public Result cutTerritory(String current) {
- List<Map> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
- return Result.build(200,"鎴愬姛",h);
+ //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> h = edgStorageCageDetailsService.selectCutTerritory();
- return Result.build(200,"鎴愬姛",h);
+ List<Map<String, Object>> h = edgStorageCageDetailsService.selectCutTerritory();
+ return Result.build(200, "鎴愬姛", h);
}
- @ApiOperation("璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘 鍙傛暟(鐗堝浘缂栧彿)")
- @PostMapping("/selectCutTerritory")
- @ResponseBody
- public Result selectCutTerritory(String TerritoryId) {
- List<Map> h = edgStorageCageDetailsService.selectCutTerritory();
- return Result.build(200,"鎴愬姛",h);
- }
- @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[0:鐮存崯锛�1锛氭嬁璧癩锛�")
+
+ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[9锛氭嬁璧帮紝8:鐮存崯]锛�")
@PostMapping("/identControls")
@ResponseBody
- public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) {
+ public Result<String> identControls(@RequestBody @Validated IdentWornRequest request) {
+ return Result.build(200, "鎴愬姛", edgStorageCageDetailsService.identControls(request));
+ }
- boolean issucess = edgStorageCageDetailsService.identWorn(identId,controlsId);
- return Result.build(200,"鎴愬姛",issucess);
- }
- @ApiOperation("鏌ヨ绗煎唴淇℃伅 鍙傛暟()")
- @PostMapping("/selectCageInfo")
- @ResponseBody
- public Result selectCageInfo() {
- List<Map> h = hangzhoumesService.SelectCageInfo();
- return Result.build(200,"鎴愬姛",h);
- }
@ApiOperation("纾ㄨ竟浠诲姟 鍙傛暟()")
@PostMapping("/selectEdgTask")
@ResponseBody
- public Result selectEdgTask(String ProcessId) {
- List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1");
- return Result.build(200,"鎴愬姛",EdgTasks);
+ 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