From 3123dbd3a5be75999f368fbe4aa722e3877074ab Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 14 六月 2024 15:52:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java |  112 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 60 insertions(+), 52 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 42f2cd9..e5e4608 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
@@ -1,52 +1,60 @@
-package com.mes;
-
-import com.mes.glassinfo.service.GlassInfoService;
-import com.mes.pp.mapper.OptimizeProjectMapper;
-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 javax.annotation.Resource;
-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();
-        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() {
-        TemperingGlassInfo glass = temperingAgoService.selectOverGlass();
-        log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
-    }
-}
+//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));
+//    }
+//}

--
Gitblit v1.8.0