ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2021-07-02 11:35:14 +08:00
parent 2b4311aca0
commit 26f217e907
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hutool-core/src/main/java/cn/hutool/core/text/csv/CsvWriter.java
View File

@ -212,6 +212,7 @@ public final class CsvWriter implements Closeable, Flushable, Serializable {
* *
* @param csvData CsvData * @param csvData CsvData
* @return this * @return this
* @since 5.7.4
*/ */
public CsvWriter write(CsvData csvData) { public CsvWriter write(CsvData csvData) {
if (csvData != null) { if (csvData != null) {

8
hutool-core/src/main/java/cn/hutool/core/util/JAXBUtil.java
View File

@ -33,15 +33,15 @@ public class JAXBUtil {
/** /**
* JavaBean转换成xml * JavaBean转换成xml
* * <p>
* bean上面用的常用注解 * bean上面用的常用注解
*
* @param bean Bean对象
* @return 输出的XML字符串
* @see XmlRootElement <code>@XmlRootElement(name = "school")</code> * @see XmlRootElement <code>@XmlRootElement(name = "school")</code>
* @see XmlElement <code>@XmlElement(name = "school_name", required = true)</code> * @see XmlElement <code>@XmlElement(name = "school_name", required = true)</code>
* @see XmlElementWrapper <code>@XmlElementWrapper(name="schools")</code> * @see XmlElementWrapper <code>@XmlElementWrapper(name="schools")</code>
* @see XmlTransient JAXB "有两个名为 "**" 的属性,类的两个属性具有相同名称 "**""解决方案 * @see XmlTransient JAXB "有两个名为 "**" 的属性,类的两个属性具有相同名称 "**""解决方案
*
* @param bean Bean对象
* @return 输出的XML字符串
*/ */
public static String beanToXml(Object bean) { public static String beanToXml(Object bean) {
return beanToXml(bean, CharsetUtil.CHARSET_UTF_8, true); return beanToXml(bean, CharsetUtil.CHARSET_UTF_8, true);

11
hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
View File

@ -11,7 +11,10 @@ import org.junit.Assert;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class CsvUtilTest { public class CsvUtilTest {
@ -160,10 +163,10 @@ public class CsvUtilTest {
headMap.put("username", 1); headMap.put("username", 1);
headMap.put("mobile", 2); headMap.put("mobile", 2);
for (int i = 0; i < datas.size(); i++) { for (User user : datas) {
User user = datas.get(i);
// row.size() + 1, 表示从第2行开始，第一行是标题栏 // row.size() + 1, 表示从第2行开始，第一行是标题栏
row.add(new CsvRow(row.size() + 1, headMap, ListUtil.toList(BeanUtil.beanToMap(user).values()).stream().map(Object::toString).collect(Collectors.toList()))); row.add(new CsvRow(row.size() + 1, headMap,
BeanUtil.beanToMap(user).values().stream().map(Object::toString).collect(Collectors.toList())));
} }
CsvData csvData = new CsvData(header, row); CsvData csvData = new CsvData(header, row);