From a02199fed26ff0121d742f1ebcf785adb1232690 Mon Sep 17 00:00:00 2001 From: qi Date: Tue, 11 Aug 2020 09:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/panda/code/uitl/DateUtilTest.java | 68 ------------------- .../org/panda/code/uitl/DateUtilTest.java | 67 ------------------ .../{UUIdGenerate.java => UuIdGenerate.java} | 2 +- .../org/panda/jdbc/id/IdGenerateTest.java | 2 +- 4 files changed, 2 insertions(+), 137 deletions(-) delete mode 100644 panda-aop/src/test/java/org/panda/code/uitl/DateUtilTest.java delete mode 100644 panda-code/src/tests/java/org/panda/code/uitl/DateUtilTest.java rename panda-jdbc/src/main/java/org/panda/jdbc/id/{UUIdGenerate.java => UuIdGenerate.java} (77%) diff --git a/panda-aop/src/test/java/org/panda/code/uitl/DateUtilTest.java b/panda-aop/src/test/java/org/panda/code/uitl/DateUtilTest.java deleted file mode 100644 index 009afe8..0000000 --- a/panda-aop/src/test/java/org/panda/code/uitl/DateUtilTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.panda.code.uitl; - -import org.junit.Test; - -import java.text.ParseException; -import java.util.Date; - -/** - * 核心包-日期工具类测试 - * @author qi - * - */ -public class DateUtilTest { - - /** - * 日期格式化，采用默认格式yyyy-MM-dd HH:mm:ss - */ - @Test - public void getDateToStr() { - String dateToStr = DateUtil.getDateToStr(new Date()); - System.out.println(dateToStr); - String dateToStr2 = DateUtil.getDateToStr(null); - System.out.println(dateToStr2); - - } - - /** - *日期格式化 - */ - @Test - public void getDateToStr1() { - String dateToStr = DateUtil.getDateToStr(new Date(),"yyyy-MM-dd HH:mm"); - System.out.println(dateToStr); - } - - /** - * 字符串转日期 - */ - @Test - public void strToDate() { - try { - Date date = DateUtil.strToDate("2020-01-20 22:51","yyyy-MM-dd HH:mm"); - System.out.println(date); - } catch (ParseException e) { - e.printStackTrace(); - } - - } - - @Test - public void disparityDay() { - try { - Date starDate = DateUtil.strToDate("2019-01-22","yyyy-MM-dd"); - Date endDate = DateUtil.strToDate("2019-02-24","yyyy-MM-dd"); - System.out.println(endDate); - int day = DateUtil.disparityDay(starDate,endDate); - System.out.println(day); - } catch (ParseException e) { - e.printStackTrace(); - } - - - } - - @Test - public void dataFormat() { - } -} diff --git a/panda-code/src/tests/java/org/panda/code/uitl/DateUtilTest.java b/panda-code/src/tests/java/org/panda/code/uitl/DateUtilTest.java deleted file mode 100644 index 231ac80..0000000 --- a/panda-code/src/tests/java/org/panda/code/uitl/DateUtilTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.panda.code.uitl; - -import org.apache.commons.lang3.time.DateUtils; -import org.junit.Test; - -import java.text.ParseException; -import java.util.Date; - -public class DateUtilTest { - - /** - * 日期格式化，采用默认格式yyyy-MM-dd HH:mm:ss - */ - @Test - public void getDateToStr() { - String dateToStr = DateUtil.getDateToStr(new Date()); - System.out.println(dateToStr); - String dateToStr2 = DateUtil.getDateToStr(null); - System.out.println(dateToStr2); - - } - - /** - *日期格式化 - */ - @Test - public void getDateToStr1() { - String dateToStr = DateUtil.getDateToStr(new Date(),"yyyy-MM-dd HH:mm"); - System.out.println(dateToStr); - } - - /** - * 字符串转日期 - */ - @Test - public void strToDate() { - try { - Date date = DateUtil.strToDate("2020-01-20 22:51","yyyy-MM-dd HH:mm"); - System.out.println(date); - } catch (ParseException e) { - e.printStackTrace(); - } - - } - - @Test - public void disparityDay() { - try { - Date starDate = DateUtil.strToDate("2019-01-22","yyyy-MM-dd"); - Date endDate = DateUtil.strToDate("2020-02-24","yyyy-MM-dd"); - System.out.println((endDate.getTime()-starDate.getTime())/(24*60*60*1000)) ; - - System.out.println((24*60*60*1000)); - int day = DateUtil.disparityDay(starDate,endDate); - System.out.println(day); - } catch (ParseException e) { - e.printStackTrace(); - } - - - } - - @Test - public void dataFormat() { - - } -} diff --git a/panda-jdbc/src/main/java/org/panda/jdbc/id/UUIdGenerate.java b/panda-jdbc/src/main/java/org/panda/jdbc/id/UuIdGenerate.java similarity index 77% rename from panda-jdbc/src/main/java/org/panda/jdbc/id/UUIdGenerate.java rename to panda-jdbc/src/main/java/org/panda/jdbc/id/UuIdGenerate.java index f6035f2..1cf429b 100644 --- a/panda-jdbc/src/main/java/org/panda/jdbc/id/UUIdGenerate.java +++ b/panda-jdbc/src/main/java/org/panda/jdbc/id/UuIdGenerate.java @@ -6,7 +6,7 @@ import java.util.UUID; * @Description uuid主键生成 * @Author qi **/ -public class UUIdGenerate implements IdGenerate { +public class UuIdGenerate implements IdGenerate { @Override public String nextId() { return UUID.randomUUID().toString(); diff --git a/panda-jdbc/src/test/java/org/panda/jdbc/id/IdGenerateTest.java b/panda-jdbc/src/test/java/org/panda/jdbc/id/IdGenerateTest.java index a36ed36..ffafe79 100644 --- a/panda-jdbc/src/test/java/org/panda/jdbc/id/IdGenerateTest.java +++ b/panda-jdbc/src/test/java/org/panda/jdbc/id/IdGenerateTest.java @@ -6,7 +6,7 @@ public class IdGenerateTest extends TestCase { public void testNextId() { - IdGenerate stringIdGenerate = new UUIdGenerate(); + IdGenerate stringIdGenerate = new UuIdGenerate(); for (int i=0;i<10000;i++){ System.out.println(stringIdGenerate.nextId()); }