From 051613aa73be3e75af5a6dfdb86a722bcb5af094 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 八月 2024 16:46:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 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 0f57394..233e6f1 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;
@@ -25,6 +26,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -53,6 +55,9 @@
GlassInfoService glassInfoService;
@Autowired
CacheGlassTask cacheGlassTask;
+
+ @Autowired
+ TaskCacheService taskCacheService;
@Test
public void testFindPath() {
@@ -112,11 +117,6 @@
log.info("Sql鏁版嵁锛歿}", Arrays.asList(list));
}
- @Test
- public void testglassinfo() {
- List<GlassInfo> glassInfos = glassInfoService.selectId("7");
- log.info("鐜荤拑鏁版嵁鏁版嵁锛歿}", Arrays.asList(glassInfos));
- }
@Test
public void testCacheGlass() {
@@ -126,14 +126,31 @@
@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
public void testScan() {
List<Map<String, Object>> map = edgStorageCageDetailsService.selectCutTerritory();
log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
+ }
+
+ @Test
+ public void testEngineerCutTerritory() {
+ List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectCurrentCutTerritory("P24051806");
+ log.info("鍒囧壊宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
+ }
+
+ @Test
+ public void testidentWorn() {
+ 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("workingProcedure","璇嗗埆"); //璁惧鍚嶇О锛�
+ edgStorageCageDetailsService.identWorn(arguments);
+ log.info("璇嗗埆鍙般�愮牬鎹�/鎷胯蛋銆戯細{}", 1);
}
@Test
@@ -168,4 +185,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