From 4c42d82f177b24f21dee14dd041035fb6c1ce7ee Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 06 八月 2024 08:11:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 132 ++++++++++++++++++++++++++++++++++---------
1 files changed, 104 insertions(+), 28 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 1931f0a..8264682 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -1,21 +1,22 @@
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.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.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.job.CacheGlassTask;
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 com.mes.taskcache.service.TaskCacheService;
+import com.mes.taskcache.service.impl.TaskCacheServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -23,7 +24,9 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
+import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -34,86 +37,159 @@
*/
@Slf4j
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = CacheGlassModuleApplication.class)
+@SpringBootTest(classes = CacheGlassModuleApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
public class CacheGlassModuleApplicationTest {
@Autowired
EdgStorageCageService edgStorageCageService;
@Autowired
EdgStorageCageDetailsService edgStorageCageDetailsService;
+ @Resource
+ TaskCacheMapper taskCacheMapper;
@Autowired
- TaskCacheMapper taskCacheMapper;
+ TaskCacheServiceImpl taskCacheServiceImpl;
@Autowired
OptimizeDetailMapper optimizeDetailMapper;
@Autowired
GlassInfoService glassInfoService;
+ @Autowired
+ CacheGlassTask cacheGlassTask;
+
+ @Autowired
+ TaskCacheService taskCacheService;
@Test
public void testFindPath() {
- String url=getClass().getResource("").getPath();
+ String url = getClass().getResource("").getPath();
log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url));
}
@Test
+ public void queryChangeGlassInfo() {
+ cacheGlassTask.queryChangeGlassInfo(Const.A10_OUT_TARGET_POSITION, "");
+ }
+
+ @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
public void testSqlServer() {
- List<TaskCache> list=taskCacheMapper.selectList(null);
- log.info("鏁版嵁{}",list);
+ 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));
+ public void testEdgtask() {
+ List<Map<String,Object>> list=taskCacheServiceImpl.selectEdgInfo("2001");
+ log.info("鏁版嵁{}",list);
+ log.info("Sql鏁版嵁锛歿}", Arrays.asList(list));
}
+
@Test
public void testCacheGlass() {
- List<Map<String, Object>> map= edgStorageCageService.selectEdgStorageCages();
+ 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));
+// List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty();
+// log.info("绗煎唴绌烘牸锛歿}", Arrays.asList(map));
}
+
@Test
public void testScan() {
- List<Map<String, Object>> map= edgStorageCageDetailsService.selectCutTerritory();
+ List<Map<String, Object>> map = edgStorageCageDetailsService.selectCutTerritory();
log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
}
@Test
+ public void testEngineerCutTerritory() {
+ List<Map<String, Object>> map = edgStorageCageDetailsService.selectCurrentCutTerritory("P24051806");
+ 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);
+ log.info("璇嗗埆鍙般�愮牬鎹�/鎷胯蛋銆戯細{}", 1);
+ }
+
+ @Test
public void testPpOptimizeDetail() {
- List<OptimizeDetail> optimizeDetail=optimizeDetailMapper.selectList(new QueryWrapper<OptimizeDetail>()
+ List<OptimizeDetail> optimizeDetail = optimizeDetailMapper.selectList(new QueryWrapper<OptimizeDetail>()
.eq("project_no", "P24032204")
- .eq("stock_id",5)
+ .eq("stock_id", 5)
);
log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅锛歿}", Arrays.asList(optimizeDetail));
}
+
@Test
public void testOptimizeDetail() {
-
- List<Map<String, Object>> map2=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ 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)
+ .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);
+ EdgStorageCageDetails edgStorageCageDetails = edgStorageCageDetailsService.selectConformGlass("1", 3);
- log.info("鍒囧壊褰撳墠鐗堝浘淇℃伅1锛歿}", Arrays.asList(edgStorageCageDetails));
+ 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