From 9c48f032ad2ae70d74a98e442b25edccf510f164 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Mon, 14 Oct 2019 11:07:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=8E=A5=E5=8F=A3=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fanruan/api/report/PrintKit.java | 17 +++++++++ .../java/com/fanruan/api/report/UnitKit.java | 38 +++++++++++++++++++ .../java/com/fanruan/api/util/CodeKit.java | 18 ++++++++- .../java/com/fanruan/api/util/GeneralKit.java | 35 +++++++++++------ src/main/java/com/fanruan/api/util/IOKit.java | 13 +++++++ 5 files changed, 109 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/fanruan/api/report/UnitKit.java diff --git a/src/main/java/com/fanruan/api/report/PrintKit.java b/src/main/java/com/fanruan/api/report/PrintKit.java index de8476f..10858ac 100644 --- a/src/main/java/com/fanruan/api/report/PrintKit.java +++ b/src/main/java/com/fanruan/api/report/PrintKit.java @@ -2,6 +2,8 @@ package com.fanruan.api.report; import com.fanruan.api.log.LogKit; import com.fr.base.Margin; +import com.fr.general.DeclareRecordType; +import com.fr.log.LogUtils; import com.fr.main.FineBook; import com.fr.page.ClippedPageProvider; import com.fr.page.PaperSettingProvider; @@ -11,10 +13,12 @@ import com.fr.report.cell.CellElement; import com.fr.report.cell.cellattr.CellGUIAttr; import com.fr.report.stable.ReportSettings; import com.fr.stable.Constants; +import com.fr.stable.web.SessionProvider; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @author richie @@ -109,4 +113,17 @@ public class PrintKit { CellGUIAttr gui = cell.getCellGUIAttr(); return gui == null || gui.isPrintContent(); } + + /** + * 记录打印信息 + * + * @param templateName 模板名 + * @param parameterMap 参数 + * @param printType 打印类型 + * @param session 会话 + */ + public static void recordPrintInformation(String templateName, Map parameterMap, + DeclareRecordType printType, SessionProvider session) { + LogUtils.recordPrintInformation(templateName, parameterMap, printType, session); + } } diff --git a/src/main/java/com/fanruan/api/report/UnitKit.java b/src/main/java/com/fanruan/api/report/UnitKit.java new file mode 100644 index 0000000..eac2914 --- /dev/null +++ b/src/main/java/com/fanruan/api/report/UnitKit.java @@ -0,0 +1,38 @@ +package com.fanruan.api.report; + +import com.fr.stable.unit.UNIT; +import com.fr.stable.unit.UnitUtils; + +public class UnitKit { + + /** + * 数值转化成英尺单位 + * + * @param doubleString + * @return 转化后的单位 + */ + public static UNIT unit4CompatibleInchDV(String doubleString) { + return UnitUtils.unit4CompatibleInchDV(doubleString); + } + + /** + * 数值转化成毫米单位 + * + * @param doubleString + * @return 转化后的单位 + */ + public static UNIT unit4CompatibleMMDV(String doubleString) { + return UnitUtils.unit4CompatibleMMDV(doubleString); + } + + /** + * 两个单位相减取绝对值 + * + * @param a 单位a + * @param b 单位b + * @return 两个单位差值的绝对值 + */ + public static UNIT abs(UNIT a, UNIT b) { + return UnitUtils.abs(a, b); + } +} diff --git a/src/main/java/com/fanruan/api/util/CodeKit.java b/src/main/java/com/fanruan/api/util/CodeKit.java index 4f1265c..5336e8d 100644 --- a/src/main/java/com/fanruan/api/util/CodeKit.java +++ b/src/main/java/com/fanruan/api/util/CodeKit.java @@ -1,28 +1,33 @@ package com.fanruan.api.util; +import com.fr.base.BaseUtils; import com.fr.stable.CodeUtils; import com.fr.stable.CommonCodeUtils; public class CodeKit { /** * 给字符串解密 + * * @param passwordText 待解密的字符串 * @return 解密后的字符串 */ public static String passwordDecode(String passwordText) { return CodeUtils.passwordDecode(passwordText); } + /** * 将普通的java字符串编码成javascript代码 + * * @param string4javascript 待编码的字符串 * @return 编码后的代码 - * */ + */ public static String javascriptEncode(String string4javascript) { return CommonCodeUtils.javascriptEncode(string4javascript); } /** * 将经过处理的中日韩文字符串解码成原先的中日韩文 + * * @param text 经过处理的中日韩文字 * @return 中日韩文字 * @throws Exception @@ -33,6 +38,7 @@ public class CodeKit { /** * 将经过处理字符串解码成原先字符串 + * * @param text 经过处理的字符串 * @return 字符串 * @throws Exception @@ -40,4 +46,14 @@ public class CodeKit { public static String encodeURIComponent(String text) { return CommonCodeUtils.encodeURIComponent(text); } + + /** + * 将对象转化成JSON字符串 + * + * @param obj 待处理的对象 + * @return 字符串 + */ + public static String jsonEncode(Object obj) { + return BaseUtils.jsonEncode(obj); + } } diff --git a/src/main/java/com/fanruan/api/util/GeneralKit.java b/src/main/java/com/fanruan/api/util/GeneralKit.java index 9c6dc15..77d75f3 100644 --- a/src/main/java/com/fanruan/api/util/GeneralKit.java +++ b/src/main/java/com/fanruan/api/util/GeneralKit.java @@ -3,20 +3,12 @@ package com.fanruan.api.util; import com.fr.base.FRContext; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralUtils; -import com.fr.general.xml.GeneralXMLTools; -import com.fr.stable.CommonUtils; -import com.fr.stable.StringUtils; -import com.fr.stable.xml.XMLPrintWriter; -import com.fr.stable.xml.XMLable; -import com.fr.stable.xml.XMLableReader; -import com.fr.third.guava.base.Objects; import com.fr.stable.StableUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.util.Locale; -import java.util.Map; /** * @author richie @@ -35,6 +27,7 @@ public class GeneralKit { /** * 任意对象转换为文本值 + * * @param obj 待转换的对象 * @return 文本值 */ @@ -44,6 +37,7 @@ public class GeneralKit { /** * 任意对象转换为数值，如果无法转换为数值，就返回0 + * * @param obj 待转换的对象 * @return 数值 */ @@ -53,7 +47,8 @@ public class GeneralKit { /** * 任意对象转换为数值，如果无法转换为数值，根据returnNull参数决定，返回0或者返回null - * @param obj 待转换的对象 + * + * @param obj 待转换的对象 * @param returnNull 无法转换时，是否返回null * @return 数值对象或者null */ @@ -63,6 +58,7 @@ public class GeneralKit { /** * 读取jar的版本号 + * * @return 返回jar版本号 */ public static @Nullable String readBuildNO() { @@ -71,6 +67,7 @@ public class GeneralKit { /** * 返回两个对象比较的大小 + * * @param obj1 源对象 * @param obj2 待比较对象 * @return 若相等返回0，obj1小于obj2返回负数，否则返回正数 @@ -79,28 +76,44 @@ public class GeneralKit { return ComparatorUtils.compare(obj1, obj2); } + /** + * 判断两个对象是否相等 + * + * @param var1 源对象 + * @param var2 待比较对象 + * @return 如果两个对象相等，则返回true，否则返回false + */ + public static boolean equals(Object var1, Object var2) { + return ComparatorUtils.equals(var1, var2); + } + /** * 将一个数组中的元素按照给定的连接符连接成一个字符串 + * * @param array 数组 - * @param se 连接符 + * @param se 连接符 * @return 连接后的字符串 */ public static String join(Object[] array, String se) { return StableUtils.join(array, se); } + /** * 返回国际化区属 + * * @return 国际化后区域属性 */ @Deprecated public static Locale getLocale() { return FRContext.getLocale(); } + /** * 将路径节点数组用路径分隔符"/"连接起来 + * * @param nodes 路径节点数组 * @return 连接后的路径 - * */ + */ public static String pathJoin(String... nodes) { return StableUtils.pathJoin(nodes); } diff --git a/src/main/java/com/fanruan/api/util/IOKit.java b/src/main/java/com/fanruan/api/util/IOKit.java index acc311c..ce37a3f 100644 --- a/src/main/java/com/fanruan/api/util/IOKit.java +++ b/src/main/java/com/fanruan/api/util/IOKit.java @@ -3,8 +3,10 @@ package com.fanruan.api.util; import com.fr.general.CommonIOUtils; import com.fr.general.IOUtils; import com.fr.io.utils.ResourceIOUtils; +import com.fr.stable.ImageUtils; import javax.swing.Icon; +import java.awt.*; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -204,6 +206,17 @@ public class IOKit { return CommonIOUtils.readImage(input); } + /** + * 将图片写入输出流 + * + * @param image 图片 + * @param suffix 图片文件后缀 + * @param os 输出流 + */ + public static void writeImage(Image image, String suffix, OutputStream os) { + ImageUtils.writeImage(image, suffix, os); + } + /** * 读取资源 * From 9b074c8a1eb932c441d74bb037c8101c49d1a601 Mon Sep 17 00:00:00 2001 From: "Bruce.Deng" Date: Mon, 14 Oct 2019 14:04:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=8E=A5=E5=8F=A3=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fanruan/api/report/UnitKitTest.java | 20 +++++++++++++++++++ .../com/fanruan/api/util/CodeKitTest.java | 7 ++++++- .../com/fanruan/api/util/GeneralKitTest.java | 16 +++++++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 src/test/java/com/fanruan/api/report/UnitKitTest.java diff --git a/src/test/java/com/fanruan/api/report/UnitKitTest.java b/src/test/java/com/fanruan/api/report/UnitKitTest.java new file mode 100644 index 0000000..f4eb166 --- /dev/null +++ b/src/test/java/com/fanruan/api/report/UnitKitTest.java @@ -0,0 +1,20 @@ +package com.fanruan.api.report; + +import com.fr.stable.unit.FU; +import org.junit.Assert; +import org.junit.Test; + +public class UnitKitTest { + + @Test + public void unit4CompatibleInchDV() { + String str1 = "100"; + Assert.assertEquals(UnitKit.unit4CompatibleInchDV(str1), FU.getInstance(365760000)); + } + + @Test + public void unit4CompatibleMMDV() { + String str1 = "100"; + Assert.assertEquals(UnitKit.unit4CompatibleMMDV(str1), FU.getInstance(14400000)); + } +} \ No newline at end of file diff --git a/src/test/java/com/fanruan/api/util/CodeKitTest.java b/src/test/java/com/fanruan/api/util/CodeKitTest.java index 400a2b2..4977edc 100644 --- a/src/test/java/com/fanruan/api/util/CodeKitTest.java +++ b/src/test/java/com/fanruan/api/util/CodeKitTest.java @@ -1,7 +1,6 @@ package com.fanruan.api.util; import com.fr.stable.CodeUtils; -import com.fr.stable.CommonCodeUtils; import org.junit.Assert; import org.junit.Test; @@ -36,4 +35,10 @@ public class CodeKitTest { } } + + @Test + public void jsonEncode() { + String s = "aaa"; + Assert.assertEquals(CodeKit.jsonEncode(s),"\"aaa\""); + } } diff --git a/src/test/java/com/fanruan/api/util/GeneralKitTest.java b/src/test/java/com/fanruan/api/util/GeneralKitTest.java index 12882ee..5481651 100644 --- a/src/test/java/com/fanruan/api/util/GeneralKitTest.java +++ b/src/test/java/com/fanruan/api/util/GeneralKitTest.java @@ -2,8 +2,6 @@ package com.fanruan.api.util; import com.fanruan.api.Prepare; import com.fr.general.GeneralUtils; -import com.fr.stable.AssistUtils; -import com.fr.stable.xml.XMLableReader; import org.junit.Assert; import org.junit.Test; @@ -44,6 +42,20 @@ public class GeneralKitTest extends Prepare { Assert.assertEquals(GeneralKit.compare(s,s2),1); } + @Test + public void equals() { + String str1 = "a"; + String str2 = "a"; + String str3 = "b"; + int i1 = 1; + int i2 = 1; + int i3 = 2; + Assert.assertEquals(GeneralKit.equals(str1,str2),true); + Assert.assertEquals(GeneralKit.equals(str1,str3),false); + Assert.assertEquals(GeneralKit.equals(i1,i2),true); + Assert.assertEquals(GeneralKit.equals(i1,i3),false); + } + @Test public void join() { Object obj[] = {1, 2, 3, 4};