From daed20c553f77fc48695f8523cd57bc56fb5a0fd Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 10 四月 2024 08:35:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java b/CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java
index 99d6d28..70b4c5c 100644
--- a/CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java
+++ b/CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java
@@ -1,6 +1,6 @@
package com.mes.controller;
-import com.mes.mapper.SelectInfo;
+import com.mes.mapper.PpMapper;
import java.util.List;
import java.util.Map;
@@ -9,7 +9,7 @@
import org.springframework.web.bind.annotation.*;
import com.mes.common.Result;
import com.mes.entity.Tempered;
-import com.mes.service.pp.SelectdppService;
+import com.mes.service.pp.PpService;
import com.mes.service.hangzhoumes.*;
@RestController
@@ -17,45 +17,53 @@
// TidyUpGlassModule 鐞嗙墖妯″潡
public class TidyUpGlassModuleController {
- @Autowired
- private SelectInfo SelectInfo;
+
@Autowired
- private SelectdppService SelectppService;
+ private PpService ppService;
@Autowired
- private hangzhoumesService hangzhoumesService;
+ private HangzhoumesService hangzhoumesService;
@GetMapping("/SelectTerritoryInfo") // 鏌ヨ閽㈠寲鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
@ResponseBody
public Result SelectTerritoryInfo(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
- List<Tempered> h = SelectppService.SelectTemperedTerritory(ProcessId);
- System.out.println(h.size()+":"+ProcessId);
+ List<Tempered> h = ppService.selectTemperedTerritory(ProcessId);
return Result.seccess(h);
}
@GetMapping("/CutTerritory") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
@ResponseBody
public Result CutTerritory(String ProcessId) {
- List<Map> h = SelectppService.SelectCutTerritory(ProcessId);
- System.out.println(h.size());
+ List<Map> h = ppService.selectCutTerritory(ProcessId);
return Result.seccess(h);
}
- @GetMapping("/SelectCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
+ @GetMapping("/CurrentCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
@ResponseBody
- public Result SelectCutTerritory(String ProcessId) {
- List<Map> h = SelectppService.SelectCutTerritory("P24032508");
- System.out.println(h.size());
+ public Result CurrentCutTerritory() {
+ List<Map> h = ppService.selectCutTerritory();
return Result.seccess(h);
}
+ @GetMapping("/SelectCutTerritory") // 璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘
+ @ResponseBody
+ public Result SelectCutTerritory(String TerritoryId) {
+ List<Map> h = ppService.selectCutTerritory(TerritoryId);
+ return Result.seccess(h);
+ }
+
+ @GetMapping("/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.seccess(h);
+ }
@GetMapping("/SelectCageInfo") // 鏌ヨ绗煎唴淇℃伅
@ResponseBody
public Result SelectCageInfo(String ProcessId) {
- List<Map> h = SelectppService.SelectCutTerritory("P24032508");
- System.out.println(h.size());
+ List<Map> h = hangzhoumesService.SelectCageInfo();
return Result.seccess(h);
}
@@ -64,7 +72,6 @@
@ResponseBody
public Result SelectEdgTask(String ProcessId) {
List<Map> EdgTasks = hangzhoumesService.SelectEdgInfo("1");
- System.out.println(EdgTasks.size());
return Result.seccess(EdgTasks);
}
--
Gitblit v1.8.0