From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 80 ++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 43 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 cb8fb57..feefee2 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,11 +1,14 @@
package com.mes.taskcache.controller;
-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.edgglasstask.entity.request.IdentWornRequest;
+import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
+import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+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;
@@ -13,66 +16,57 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
* @since 2024-04-07
*/
+@Api(tags = "璇嗗埆鏄剧ず")
@RestController
@RequestMapping("/taskCache")
public class TaskCacheController {
@Autowired
- private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
+ private EdgStorageCageDetailsService edgStorageCageDetailsService;
@Autowired
- private EdgStorageCageDetailsServiceImpl edgStorageCageDetailsServiceImpl;
+ private TaskCacheService taskCacheService;
- @Autowired
- private HangzhoumesService hangzhoumesService;
-
- @PostMapping("/cutTerritory") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
- @ResponseBody
- public Result cutTerritory(String current) {
- List<Map> h = edgStorageCageDetailsServiceImpl.selectCurrentCutTerritory(current);
- return Result.build(200,"鎴愬姛",h);
+ @ApiOperation("鏌ヨ閽㈠寲鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
+ @PostMapping("/temperingTerritory")
+ public Result temperingTerritory(String current) {
+ List<Map<String, Object>> h = edgStorageCageDetailsService.selectTemperingTerritory(current);
+ return Result.build(200, "鎴愬姛", h);
}
- @PostMapping("/currentCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
- @ResponseBody
- public Result currentCutTerritory() {
- List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory();
- return Result.build(200,"鎴愬姛",h);
+ @ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁宸ョ▼鍙峰強鐗堝簭锛岀増搴忛粯璁や负1")
+ @PostMapping("/queryCutDrawingByEngineerId")
+ public Result queryCutDrawingByEngineerId(String engineerId, int patternSequence) {
+// List<List<Map<String, Object>>> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
+ Map<String, Object> map = edgStorageCageDetailsService.queryCutDrawingByEngineerId(engineerId, patternSequence);
+ return Result.build(200, "鎴愬姛", map);
}
- @PostMapping("/selectCutTerritory") // 璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘
- @ResponseBody
- public Result selectCutTerritory(String TerritoryId) {
- List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory();
- return Result.build(200,"鎴愬姛",h);
+ @ApiOperation("璇嗗埆鏄剧ず:褰撳墠鐗堝浘,闇�瑕佸綋鍓嶅崸寮忕悊鐗囪澶噄d銆佷笂鐗囩嚎璺�")
+ @PostMapping("/queryCurrentCutDrawing")
+ public Result queryCurrentCutDrawing(int deviceId, int stationCell) {
+ List<CutDrawingVO> cutDrawingVOS = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
+ return Result.build(200, "鎴愬姛", cutDrawingVOS);
}
- @PostMapping("/identControls") // 璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D锛屽姛鑳絒0:鐮存崯锛�1锛氭嬁璧癩锛�
- @ResponseBody
- public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) {
-
- boolean issucess = edgStorageCageDetailsServiceImpl.identWorn(identId,controlsId);
- return Result.build(200,"鎴愬姛",issucess);
+ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[9锛氭嬁璧帮紝8:鐮存崯]锛�")
+ @PostMapping("/identControls")
+ public Result<String> identControls(@RequestBody @Validated IdentWornRequest request) {
+ return Result.build(200, "鎴愬姛", edgStorageCageDetailsService.identControls(request));
}
- @PostMapping("/selectCageInfo") // 鏌ヨ绗煎唴淇℃伅
- @ResponseBody
- public Result selectCageInfo(String ProcessId) {
- List<Map> h = hangzhoumesService.SelectCageInfo();
- return Result.build(200,"鎴愬姛",h);
- }
-
- @PostMapping("/selectEdgTask") //纾ㄨ竟浠诲姟
- @ResponseBody
- public Result selectEdgTask(String ProcessId) {
- List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1");
- return Result.build(200,"鎴愬姛",EdgTasks);
+ @ApiOperation("纾ㄨ竟浠诲姟 鍙傛暟()")
+ @PostMapping("/selectEdgTask")
+ 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