From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表,界面添加查询流程卡个数,调整推送数据到前端的间隔

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java |   47 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index 8a15f1b..38e391f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -15,6 +15,7 @@
 import com.mes.pp.mapper.OptimizeDetailMapper;
 import com.mes.taskcache.entity.TaskCache;
 import com.mes.taskcache.mapper.TaskCacheMapper;
+import com.mes.taskcache.service.TaskCacheService;
 import com.mes.taskcache.service.impl.TaskCacheServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -48,12 +49,15 @@
 
     @Autowired
     TaskCacheServiceImpl taskCacheServiceImpl;
-    @Autowired
+    @Resource
     OptimizeDetailMapper optimizeDetailMapper;
     @Autowired
     GlassInfoService glassInfoService;
     @Autowired
     CacheGlassTask cacheGlassTask;
+
+    @Autowired
+    TaskCacheService taskCacheService;
 
     @Test
     public void testFindPath() {
@@ -70,7 +74,8 @@
     public void testChangeCellSize() {
 //        String url=getClass().getResource("").getPath();
 //        log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url));
-        cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, "");
+//        cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, "");
+        cacheGlassTask.inTo("P24110503|26|2","","2");
     }
 
     @Test
@@ -122,8 +127,8 @@
 
     @Test
     public void testSelectCacheEmpty() {
-        List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty();
-        log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
+//        List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty();
+//        log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
     }
 
     @Test
@@ -133,14 +138,31 @@
     }
 
     @Test
+    public void testEngineerCutTerritory() {
+        List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectCurrentCutTerritory("P24051806");
+        log.info("鍒囧壊宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
+    }
+
+    @Test
+    public void testEngineerTerritory() {
+        List<Map<String, Object>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203");
+        log.info("閽㈠寲宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
+    }
+
+    @Test
     public void testidentWorn() {
-        Map<String, String> arguments=new HashMap<>();
-        arguments.put("glassId","P24060405|30|1");//鐜荤拑ID
-        arguments.put("controlsId","200");        //鎷胯蛋锛�200/鐮存崯锛�201
+        Map<String, Object> arguments=new HashMap<>();
+        arguments.put("glassId","NG24051802A002-1-4-2-4");//鐜荤拑ID
+        arguments.put("state","8");        //鎷胯蛋锛�200/鐮存崯锛�201
         arguments.put("line","1001");             //绾胯矾锛�
-        arguments.put("machine","璇嗗埆");           //璁惧鍚嶇О锛�
-        edgStorageCageDetailsService.identWorn(arguments);
+        arguments.put("workingProcedure","璇嗗埆");           //璁惧鍚嶇О锛�
+//        edgStorageCageDetailsService.identWorn(arguments);
         log.info("璇嗗埆鍙般�愮牬鎹�/鎷胯蛋銆戯細{}", 1);
+    }
+    @Test
+    public void testInToVerify() {
+        boolean result=edgStorageCageDetailsService.inToVerify("P24060405|30|1");
+        log.info("鏄惁瀛樺湪閲嶅ID 銆嬪厑璁歌繘鐗囷細{}", result);
     }
 
     @Test
@@ -175,4 +197,11 @@
         log.info("鍑虹墖浠诲姟锛歿}", Arrays.asList(edgStorageCageDetails));
     }
 
+    @Test
+    public void testedgTask() {
+        List<Map<String,Object>> EdgTasks = taskCacheService.selectEdgInfo("2001");
+
+        log.info("纾ㄨ竟浠诲姟锛歿}", Arrays.asList(EdgTasks));
+    }
+
 }

--
Gitblit v1.8.0