From 34a5775085f5db40dfc80250e5185f5485eecfc2 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期五, 20 九月 2024 13:01:18 +0800 Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes --- hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java index 8d43e9b..dd22447 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java @@ -3,6 +3,9 @@ import com.mes.GlassStorageApplication; import com.mes.rawglassdetails.entity.RawGlassStorageDetails; import com.mes.rawglassdetails.service.RawGlassStorageDetailsService; +import com.mes.rawglasstask.entity.RawGlassStorageTask; +import com.mes.rawglasstask.entity.request.RawGlassTaskRequest; +import com.mes.rawglasstask.service.RawGlassStorageTaskService; import com.mes.rawusage.entity.RawUsage; import com.mes.rawusage.service.RawUsageService; import com.mes.shelfrack.service.ShelfRackService; @@ -14,7 +17,12 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; /** @@ -37,8 +45,9 @@ @Autowired private RawUsageService rawUsageService; @Autowired - private RawGlassStorageDetailsService rawGlassStorageDetailsService; - + private RawGlassStorageDetailsService rawGlassStorageDetailsService; + @Autowired + private RawGlassStorageTaskService rawGlassStorageTaskService; @Test public void testFindPath() { @@ -63,6 +72,40 @@ shelfRackService.selectshelf_rack(); } + /** + * 娴嬭瘯 + */ + @Test + public void testWebSocket() { + List<RawGlassStorageTask> list=rawGlassStorageTaskService.findAll(); + log.info("杩斿洖鍐呭锛歿}",list); + } + + /** + * 娴嬭瘯淇敼WebSocket 鍙傛暟 + */ + @Test + public void testWebSocketArgument() { + RawGlassTaskRequest request=new RawGlassTaskRequest(); + //璁剧疆鍙傛暟锛� + DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Date startDate=null; + Date endDate=null; + try { + startDate= df.parse("2022-01-01"); + endDate= df.parse("2025-01-01"); + }catch (ParseException e){ + e.printStackTrace(); + + request.setCreateTime(startDate);// + request.setPatternQuantity(endDate); + request.setEnableState(new ArrayList<Integer>()); + request.setEnableType(new ArrayList<Integer>()); + String list=rawGlassStorageTaskService.setRawGlassTaskRequest(request); + log.info("杩斿洖鍐呭锛歿}",list); + } + } + @Test -- Gitblit v1.8.0