From 93e36c526fe445c14d5fb19f3653f8a8e55e3a6c Mon Sep 17 00:00:00 2001 From: wang <3597712270@qq.com> Date: 星期四, 09 五月 2024 15:49:34 +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 | 77 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 72 insertions(+), 5 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 2cb20e5..1931f0a 100644 --- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java @@ -1,8 +1,21 @@ package com.mes; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.yulichang.query.MPJLambdaQueryWrapper; +import com.github.yulichang.query.MPJQueryWrapper; +import com.github.yulichang.toolkit.JoinWrappers; +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.edgstoragecage.service.impl.EdgStorageCageServiceImpl; +import com.mes.glassinfo.entity.GlassInfo; +import com.mes.glassinfo.service.GlassInfoService; +import com.mes.pp.entity.OptimizeDetail; +import com.mes.pp.entity.OptimizeLayout; +import com.mes.pp.mapper.OptimizeDetailMapper; +import com.mes.taskcache.entity.TaskCache; +import com.mes.taskcache.mapper.TaskCacheMapper; import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; @@ -29,24 +42,78 @@ @Autowired EdgStorageCageDetailsService edgStorageCageDetailsService; + @Autowired + TaskCacheMapper taskCacheMapper; + @Autowired + OptimizeDetailMapper optimizeDetailMapper; + @Autowired + GlassInfoService glassInfoService; + @Test public void testFindPath() { - log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123")); + String url=getClass().getResource("").getPath(); + log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url)); + } + + @Test + public void testSqlServer() { + List<TaskCache> list=taskCacheMapper.selectList(null); + log.info("鏁版嵁{}",list); + 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() { - List<Map> map= edgStorageCageService.selectEdgStorageCages(); + List<Map<String, Object>> map= edgStorageCageService.selectEdgStorageCages(); log.info("绗煎唴淇℃伅锛歿}", Arrays.asList(map)); } @Test - public void testselectCacheEmpty() { - List<Map> map= edgStorageCageService.selectCacheEmpty(); + public void testSelectCacheEmpty() { + List<EdgStorageCage> map= edgStorageCageService.selectCacheEmpty(); log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map)); } @Test public void testScan() { - List<Map> map= edgStorageCageDetailsService.selectCutTerritory(); + List<Map<String, Object>> map= edgStorageCageDetailsService.selectCutTerritory(); log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(map)); } + + @Test + public void testPpOptimizeDetail() { + List<OptimizeDetail> optimizeDetail=optimizeDetailMapper.selectList(new QueryWrapper<OptimizeDetail>() + .eq("project_no", "P24032204") + .eq("stock_id",5) + ); + log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(optimizeDetail)); + + } + @Test + public void testOptimizeDetail() { + + List<Map<String, Object>> map2=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class) + .selectAll(OptimizeDetail.class) + .selectAs(OptimizeLayout::getWidth,"olWidth") + .selectAs(OptimizeLayout::getWidth,"olHeight") + .select(OptimizeLayout::getWidth,OptimizeLayout::getHeight) + .leftJoin(OptimizeLayout.class,on-> on.eq(OptimizeLayout::getProjectNo,OptimizeDetail::getProjectNo) + .eq(OptimizeLayout::getStockId,OptimizeDetail::getStockId)) + .eq(OptimizeDetail::getProjectNo,"P24032204" ) + .eq(OptimizeDetail::getStockId,5) + ); + log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅1锛歿}", Arrays.asList(map2)); + } + + @Test + public void testOutTask() { + EdgStorageCageDetails edgStorageCageDetails=edgStorageCageDetailsService.selectConformGlass("1",3); + + log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅1锛歿}", Arrays.asList(edgStorageCageDetails)); + } + } -- Gitblit v1.8.0