From bacec153f688bcee10795bd38f61b2406c20e488 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 24 九月 2024 16:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
index dd22447..5905cdc 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
@@ -75,36 +75,36 @@
/**
* 娴嬭瘯
*/
- @Test
- public void testWebSocket() {
- List<RawGlassStorageTask> list=rawGlassStorageTaskService.findAll();
- log.info("杩斿洖鍐呭锛歿}",list);
- }
+// @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
+// 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);
+// }
+// }
--
Gitblit v1.8.0