From e0699feb382ad3c01040f135f53698ac5c6ec84e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 10:42:24 +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 | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 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 37ad945..cb8fb57 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,5 +1,7 @@
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.utils.Result;
@@ -11,7 +13,7 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -22,59 +24,55 @@
public class TaskCacheController {
@Autowired
- private PpService ppService;
+ private EdgStorageCageServiceImpl edgStorageCageServiceImpl;
+
+ @Autowired
+ private EdgStorageCageDetailsServiceImpl edgStorageCageDetailsServiceImpl;
@Autowired
private HangzhoumesService hangzhoumesService;
-// @GetMapping("/SelectTerritoryInfo") // 鏌ヨ閽㈠寲鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
-// @ResponseBody
-// public Result SelectTerritoryInfo(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
-// List<Tempered> h = ppService.selectTemperedTerritory(ProcessId);
-// return Result.seccess(h);
-// }
-
- @GetMapping("/CutTerritory") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
+ @PostMapping("/cutTerritory") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
@ResponseBody
- public Result CutTerritory(String ProcessId) {
- List<Map> h = ppService.selectCutTerritory(ProcessId);
- return Result.build(200, "鎴愬姛", h);
+ public Result cutTerritory(String current) {
+ List<Map> h = edgStorageCageDetailsServiceImpl.selectCurrentCutTerritory(current);
+ return Result.build(200,"鎴愬姛",h);
}
- @GetMapping("/CurrentCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
+ @PostMapping("/currentCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
@ResponseBody
- public Result CurrentCutTerritory() {
- List<Map> h = ppService.selectCutTerritory();
- System.out.println(h);
- return Result.build(200, "鎴愬姛", h);
+ public Result currentCutTerritory() {
+ List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory();
+ return Result.build(200,"鎴愬姛",h);
}
- @GetMapping("/SelectCutTerritory") // 璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘
+ @PostMapping("/selectCutTerritory") // 璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘
@ResponseBody
- public Result SelectCutTerritory(String TerritoryId) {
- List<Map> h = ppService.selectCutTerritory(TerritoryId);
- return Result.build(200, "鎴愬姛", h);
+ public Result selectCutTerritory(String TerritoryId) {
+ List<Map> h = edgStorageCageDetailsServiceImpl.selectCutTerritory();
+ return Result.build(200,"鎴愬姛",h);
}
- @GetMapping("/IdentControls") // 璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D锛屽姛鑳絒0:鐮存崯锛�1锛氭嬁璧癩锛�
+ @PostMapping("/identControls") // 璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D锛屽姛鑳絒0:鐮存崯锛�1锛氭嬁璧癩锛�
@ResponseBody
- public Result Ident(@RequestParam(name = "IdentId", required = false) String ProcessId, @RequestParam(name = "ControlsId", required = false) String ControlsId) {
- List<Map> h = ppService.selectCutTerritory("P24032508");
- return Result.build(200, "鎴愬姛", h);
+ 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);
}
- @GetMapping("/SelectCageInfo") // 鏌ヨ绗煎唴淇℃伅
+ @PostMapping("/selectCageInfo") // 鏌ヨ绗煎唴淇℃伅
@ResponseBody
- public Result SelectCageInfo(String ProcessId) {
+ public Result selectCageInfo(String ProcessId) {
List<Map> h = hangzhoumesService.SelectCageInfo();
- return Result.build(200, "鎴愬姛", h);
+ return Result.build(200,"鎴愬姛",h);
}
- @GetMapping("/SelectEdgTask") //纾ㄨ竟浠诲姟
+ @PostMapping("/selectEdgTask") //纾ㄨ竟浠诲姟
@ResponseBody
- public Result SelectEdgTask(String ProcessId) {
+ public Result selectEdgTask(String ProcessId) {
List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1");
- return Result.build(200, "鎴愬姛", EdgTasks);
+ return Result.build(200,"鎴愬姛",EdgTasks);
}
}
--
Gitblit v1.8.0