From 9ae0e3d68b255dd6df31ea55d9b6eda1a61708dd Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期三, 15 一月 2025 10:13:17 +0800 Subject: [PATCH] 1、测试类报错删除 2、修改opc配置 --- hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 51 +++++++++++++++------------------------------------ 1 files changed, 15 insertions(+), 36 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 19a87ce..4578a6f 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java @@ -3,11 +3,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.yulichang.toolkit.JoinWrappers; import com.mes.common.config.Const; -import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; import com.mes.edgstoragecage.service.EdgStorageCageService; -import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.service.GlassInfoService; import com.mes.job.CacheGlassTask; import com.mes.pp.entity.OptimizeDetail; @@ -49,7 +47,7 @@ @Autowired TaskCacheServiceImpl taskCacheServiceImpl; - @Autowired + @Resource OptimizeDetailMapper optimizeDetailMapper; @Autowired GlassInfoService glassInfoService; @@ -72,35 +70,22 @@ @Test public void testChangeCellSize() { -// String url=getClass().getResource("").getPath(); -// log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url)); cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, ""); } @Test public void testCellSize() { -// String url=getClass().getResource("").getPath(); -// log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url)); cacheGlassTask.outTo(0, 0, "", "NG24051802A001|1|1|1|1", 0); } @Test public void testinTo() { -// String url=getClass().getResource("").getPath(); -// log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url)); -// NG24051802A001|1|4|1|4 -// cacheGlassTask.inTo("NG24051802A001|1|1|1|1", "1", "1"); -// cacheGlassTask.inTo("NG24051802A001|1|4|1|4", "1", "1"); cacheGlassTask.inTo("NG24051802A001|1|1|2|1", "1", "1"); } @Test public void testChangeGlassInfo() { -// String url=getClass().getResource("").getPath(); -// log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url)); -// NG24051802A001|1|4|1|4 cacheGlassTask.queryAndChangeGlass("NG24051802A001|1|1|1|1"); -// cacheGlassTask.queryAndChangeGlass("NG24051802A001|1|4|1|4"); } @Test @@ -118,34 +103,28 @@ } - @Test - public void testCacheGlass() { - List<Map<String, Object>> map = edgStorageCageService.selectEdgStorageCages(); - log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map)); - } @Test - public void testSelectCacheEmpty() { -// 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)); + 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","P24060403|3|6");//鐜荤拑ID - arguments.put("controlsId","300"); //鎷胯蛋锛�200/鐮存崯锛�201 - arguments.put("line","2001"); //绾胯矾锛� - arguments.put("machine","鍐峰姞宸�"); //璁惧鍚嶇О锛� - edgStorageCageDetailsService.identWorn(arguments); + 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 + public void testInToVerify() { + boolean result=edgStorageCageDetailsService.inToVerify("P24060405|30|1"); + log.info("鏄惁瀛樺湪閲嶅ID 銆嬪厑璁歌繘鐗囷細{}", result); + } @Test public void testPpOptimizeDetail() { -- Gitblit v1.8.0