From 84ea4ef19e5a4945f336dfdd788081510477dfc1 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 12 十月 2024 14:21:10 +0800
Subject: [PATCH] 1.卧式缓存前的扫码-增加重复ID验证，2.增加钢化版图查询工程功能
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 e4bbd40..a5a966a 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,13 +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.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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -15,7 +15,7 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -30,39 +30,47 @@
private EdgStorageCageDetailsService edgStorageCageDetailsService;
@Autowired
- private EdgStorageCageService edgStorageCageService;
- @Autowired
private TaskCacheService taskCacheService;
+
+ @ApiOperation("鏌ヨ閽㈠寲鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
+ @PostMapping("/temperingTerritory")
+ @ResponseBody
+ public Result temperingTerritory(String current) {
+ List<List<Map<String, Object>>> h = edgStorageCageDetailsService.selectTemperingTerritory(current);
+ return Result.build(200, "鎴愬姛", h);
+ }
@ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
@PostMapping("/cutTerritory")
@ResponseBody
public Result cutTerritory(String current) {
- List<Map<String, Object>> 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<String, Object>> h = edgStorageCageDetailsService.selectCutTerritory();
- return Result.build(200,"鎴愬姛",h);
+ return Result.build(200, "鎴愬姛", h);
}
- @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[200锛氭嬁璧帮紝201:鐮存崯]锛�")
+
+ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[9锛氭嬁璧帮紝8:鐮存崯]锛�")
@PostMapping("/identControls")
@ResponseBody
- public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) {
-
- boolean issucess = edgStorageCageDetailsService.identWorn(identId,controlsId);
- return Result.build(200,"鎴愬姛",issucess);
+ public Result<String> identControls(@RequestBody @Validated IdentWornRequest request) {
+ return Result.build(200, "鎴愬姛", edgStorageCageDetailsService.identControls(request));
}
@ApiOperation("纾ㄨ竟浠诲姟 鍙傛暟()")
@PostMapping("/selectEdgTask")
@ResponseBody
- public Result selectEdgTask(String line) {
- List<Map<String,Object>> EdgTasks = taskCacheService.selectEdgInfo(line);
- 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