From e776dcaa5aa2416634644c2c7ac333ee95738b95 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期一, 17 三月 2025 15:57:31 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after --- system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java index 5840ba6..6b8370a 100644 --- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java +++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java @@ -1,11 +1,15 @@ package com.yuanchu.mom; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.yuanchu.mom.exception.ErrorException; +import com.yuanchu.mom.utils.DianLuUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.el.lang.ExpressionBuilder; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import javax.annotation.Resource; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import java.math.BigDecimal; @@ -16,6 +20,7 @@ import java.time.temporal.TemporalAdjusters; import java.time.temporal.WeekFields; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Locale; import java.util.regex.Matcher; @@ -26,16 +31,12 @@ @SpringBootTest class SystemRunApplicationTest { + @Resource + DianLuUtils dianLuUtils; + @Test void contextLoads() { - String b=null; - BigDecimal decimal1 = new BigDecimal("20"); - BigDecimal decimal2 = new BigDecimal(b == null ?"0":b); - BigDecimal decimal3 = new BigDecimal("10"); - if (decimal1.compareTo(decimal2)>0 && decimal1.compareTo(decimal3)>0){ - System.out.println("鈭�"); - } - + //dianLuUtils.readDianLuFile2(); } -- Gitblit v1.9.3