From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 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 577dd92..b99bef0 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,6 +1,8 @@
package com.mes.taskcache.controller;
-import com.mes.edgglasstask.entity.request.IdentWornRequest;
+import cn.hutool.json.JSONObject;
+import com.mes.damage.entity.request.DamageRequest;
+import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.taskcache.service.TaskCacheService;
import com.mes.utils.Result;
@@ -34,39 +36,34 @@
@ApiOperation("鏌ヨ閽㈠寲鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
@PostMapping("/temperingTerritory")
- @ResponseBody
public Result temperingTerritory(String current) {
List<Map<String, Object>> h = edgStorageCageDetailsService.selectTemperingTerritory(current);
return Result.build(200, "鎴愬姛", h);
}
- @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("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁宸ョ▼鍙峰強鐗堝簭锛岀増搴忛粯璁や负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);
}
- @ApiOperation("璇嗗埆鏄剧ず 褰撳墠鐗堝浘 鍙傛暟()")
- @PostMapping("/currentCutTerritory")
- @ResponseBody
- public Result currentCutTerritory() {
- List<Map<String, Object>> h = edgStorageCageDetailsService.selectCutTerritory();
- return Result.build(200, "鎴愬姛", h);
+ @ApiOperation("璇嗗埆鏄剧ず:褰撳墠鐗堝浘,闇�瑕佸綋鍓嶅崸寮忕悊鐗囪澶噄d銆佷笂鐗囩嚎璺�")
+ @PostMapping("/queryCurrentCutDrawing")
+ public Result<JSONObject> queryCurrentCutDrawing(int deviceId, int stationCell) {
+ JSONObject jsonObject = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
+ return Result.build(200, "鎴愬姛", jsonObject);
}
@ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[9锛氭嬁璧帮紝8:鐮存崯]锛�")
@PostMapping("/identControls")
- @ResponseBody
- public Result<String> identControls(@RequestBody @Validated IdentWornRequest request) {
+ public Result<String> identControls(@RequestBody @Validated DamageRequest request) {
return Result.build(200, "鎴愬姛", edgStorageCageDetailsService.identControls(request));
}
@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);
--
Gitblit v1.8.0