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 | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 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 422b941..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,16 +1,14 @@
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 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 javax.annotation.Resource;
+
import java.util.Arrays;
import java.util.List;
@@ -25,13 +23,21 @@
public class TemperingApplicationTest {
@Autowired
- private TemperingAgoService temperingAgoService;
+ private TemperingGlassInfoService temperingAgoService;
@Test
public void testFindPa() {
- List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass();
- log.info("杩涚倝涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+ 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() {
@@ -47,6 +53,6 @@
@Test
public void testFindPa4() {
List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
- log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+ log.info("閽㈠寲鍚庣殑鐜荤拑锛歿}", Arrays.asList(glass));
}
}
--
Gitblit v1.8.0