From 134c3849c93a849863ae2a7b7013fe04fc554b27 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 27 五月 2024 14:30:53 +0800
Subject: [PATCH] 1、卧式理片笼线程改造:新增层数 总层数 详情表增加工程id  按照玻璃尺寸、膜系、层数、工程等交换玻璃信息 2、websocket漏提代码

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java |    7 +++----
 1 files changed, 3 insertions(+), 4 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 fae360b..bef6b24 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
@@ -2,7 +2,6 @@
 
 import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
 import com.mes.edgstoragecage.service.EdgStorageCageService;
-import com.mes.pp.entity.OptimizeDetail;
 import com.mes.taskcache.entity.TaskCache;
 import com.mes.taskcache.service.TaskCacheService;
 import com.mes.utils.Result;
@@ -22,7 +21,7 @@
  * @author zhoush
  * @since 2024-04-07
  */
-@Api(tags = "璇嗗埆鏄剧ず")
+@Api(description = "璇嗗埆鏄剧ず")
 @RestController
 @RequestMapping("/taskCache")
 public class TaskCacheController {
@@ -39,14 +38,14 @@
     @PostMapping("/cutTerritory")
     @ResponseBody
     public Result cutTerritory(String current) {
-        List<OptimizeDetail> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
+        List<Map<String, Object>> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
         return Result.build(200,"鎴愬姛",h);
     }
     @ApiOperation("璇嗗埆鏄剧ず  褰撳墠鐗堝浘   鍙傛暟()")
     @PostMapping("/currentCutTerritory")
     @ResponseBody
     public Result currentCutTerritory() {
-        List<OptimizeDetail> h = edgStorageCageDetailsService.selectCutTerritory();
+        List<Map<String, Object>> h = edgStorageCageDetailsService.selectCutTerritory();
         return Result.build(200,"鎴愬姛",h);
     }
     @ApiOperation("璇嗗埆鎿嶄綔锛�   鐮存崯/鎷胯蛋     鍙傛暟锛圛D,鍔熻兘[200锛氭嬁璧帮紝201:鐮存崯]锛�")

--
Gitblit v1.8.0