From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java |  118 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
index e5e4608..c567a90 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
@@ -1,60 +1,58 @@
-//package com.mes;
-//
-//import com.mes.temperingglass.entity.TemperingGlassInfo;
-//import com.mes.temperingglass.service.TemperingAgoService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.junit.Test;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringRunner;
-//
-//import java.util.Arrays;
-//import java.util.List;
-//
-///**
-// * @Author : zhoush
-// * @Date: 2024/3/27 16:37
-// * @Description:
-// */
-//@Slf4j
-//@RunWith(SpringRunner.class)
-//@SpringBootTest(classes = TemperingGlassModuleApplication.class)
-//public class TemperingApplicationTest {
-//
-//    @Autowired
-//    private TemperingAgoService temperingAgoService;
-//
-//
-//    @Test
-//    public void testFindPa() {
-//        List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass(12);
-//        log.info("杩涚倝涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-//    }
-//    @Test
-//    public void testFindPa2() {
-//        List<TemperingGlassInfo> glass = temperingAgoService.selectOutGlass();
-//        log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-//    }
-//
-//    @Test
-//    public void testFindPa3() {
-//        List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass();
-//        log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-//    }
-//    @Test
-//    public void testFindPa4() {
-//        List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
-//        log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-//    }
-//    @Test
-//    public void testFindPa5() {
-//        List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
-//        //杩涚倝涓殑鐜荤拑
-//        log.info("鐗堝浘id锛歿}", Arrays.asList(layoutId.get(0).getTemperingLayoutId()));
-//        List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0).getTemperingLayoutId());
-//        log.info("鐜荤拑鐗堝浘id锛歿}", Arrays.asList(intoGlass));
-//        List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1).getTemperingLayoutId());
-//        log.info("鐜荤拑鐗堝浘id锛歿}", Arrays.asList(intoGlass2));
-//    }
-//}
+package com.mes;
+
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/3/27 16:37
+ * @Description:
+ */
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = TemperingGlassModuleApplication.class)
+public class TemperingApplicationTest {
+
+    @Autowired
+    private TemperingGlassInfoService temperingAgoService;
+
+
+    @Test
+    public void testFindPa() {
+        List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
+        if(!layoutId.isEmpty()) {
+            List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0));
+            log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(intoGlass));
+            //杩涚倝涓殑绗簩涓増鍥�
+            if (layoutId.size() > 1) {
+                List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1));
+                log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(intoGlass2));
+            }
+        }
+    }
+    @Test
+    public void testFindPa2() {
+        List<TemperingGlassInfo> glass = temperingAgoService.selectOutGlass();
+        log.info("宸插嚭涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+    }
+
+    @Test
+    public void testFindPa3() {
+        List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass();
+        log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+    }
+    @Test
+    public void testFindPa4() {
+        List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
+        log.info("閽㈠寲鍚庣殑鐜荤拑锛歿}", Arrays.asList(glass));
+    }
+}

--
Gitblit v1.8.0