From e8d3676793d4194485afec7940aaf355af594901 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 18 四月 2024 14:24:52 +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 | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 be55022..37ad945 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
@@ -11,7 +11,7 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -38,7 +38,7 @@
@ResponseBody
public Result CutTerritory(String ProcessId) {
List<Map> h = ppService.selectCutTerritory(ProcessId);
- return Result.build(200,"鎴愬姛",h);
+ return Result.build(200, "鎴愬姛", h);
}
@GetMapping("/CurrentCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
@@ -46,35 +46,35 @@
public Result CurrentCutTerritory() {
List<Map> h = ppService.selectCutTerritory();
System.out.println(h);
- return Result.build(200,"鎴愬姛",h);
+ return Result.build(200, "鎴愬姛", h);
}
@GetMapping("/SelectCutTerritory") // 璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘
@ResponseBody
public Result SelectCutTerritory(String TerritoryId) {
List<Map> h = ppService.selectCutTerritory(TerritoryId);
- return Result.build(200,"鎴愬姛",h);
+ return Result.build(200, "鎴愬姛", h);
}
@GetMapping("/IdentControls") // 璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D锛屽姛鑳絒0:鐮存崯锛�1锛氭嬁璧癩锛�
@ResponseBody
- public Result Ident(@RequestParam(name = "IdentId", required = false) String ProcessId,@RequestParam(name = "ControlsId", required = false) String ControlsId) {
+ 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);
+ return Result.build(200, "鎴愬姛", h);
}
@GetMapping("/SelectCageInfo") // 鏌ヨ绗煎唴淇℃伅
@ResponseBody
public Result SelectCageInfo(String ProcessId) {
List<Map> h = hangzhoumesService.SelectCageInfo();
- return Result.build(200,"鎴愬姛",h);
+ return Result.build(200, "鎴愬姛", h);
}
@GetMapping("/SelectEdgTask") //纾ㄨ竟浠诲姟
@ResponseBody
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