Spider/spider-flow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复输出csv文件没有表头和MS打开中文乱码问题

Browse Source
This commit is contained in:
td_zhangyu 2020-03-17 17:30:39 +08:00
parent 1890fed520
commit a101b6ec21
2 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spider-flow-core/pom.xml
View File

@ -40,5 +40,10 @@
<groupId>org.spiderflow</groupId>
<artifactId>spider-flow-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.8</version>
</dependency>
</dependencies>
</project>

75
spider-flow-core/src/main/java/org/spiderflow/core/executor/shape/OutputExecutor.java
View File

@ -1,14 +1,14 @@
package org.spiderflow.core.executor.shape;
import com.alibaba.fastjson.JSON;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.ibatis.jdbc.SQL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spiderflow.context.SpiderContext;
import org.spiderflow.context.SpiderContextHolder;
import org.spiderflow.core.executor.function.FileFunctionExecutor;
import org.spiderflow.core.serializer.FastJsonSerializer;
import org.spiderflow.core.utils.DataSourceUtils;
import org.spiderflow.core.utils.ExpressionUtils;
@ -19,11 +19,8 @@ import org.spiderflow.model.SpiderOutput;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.io.*;
import java.util.*;
/**
* 输出执行器
@ -51,6 +48,11 @@ public class OutputExecutor implements ShapeExecutor{
private static Logger logger = LoggerFactory.getLogger(OutputExecutor.class);
/**
* 输出CSVPrinter节点变量
*/
private Map<String, CSVPrinter> cachePrinter = new HashMap<>();
@Override
public void execute(SpiderNode node, SpiderContext context, Map<String,Object> variables) {
SpiderOutput output = new SpiderOutput();
@ -95,11 +97,28 @@ public class OutputExecutor implements ShapeExecutor{
}
if (csvFlag) {
String csvName = node.getStringJsonValue(CSV_NAME);
outputCSV(csvName, outputData);
outputCSV(node, context, csvName, outputData);
}
context.addOutput(output);
}
@Override
public boolean allowExecuteNext(SpiderNode node, SpiderContext context, Map<String, Object> variables) {
String key = context.getId() + "-" + node.getNodeId();
boolean isDone = node.isDone();
if(isDone){
CSVPrinter printer = cachePrinter.remove(key);
try {
printer.flush();
printer.close();
} catch (IOException e) {
logger.error("文件输出错误,异常信息:{}", e.getMessage(), e);
ExceptionUtils.wrapAndThrow(e);
}
}
return isDone;
}
/**
* 输出所有参数
* @param output
@ -155,29 +174,39 @@ public class OutputExecutor implements ShapeExecutor{
}
}
private void outputCSV(String csvName, Map<String, Object> data) {
private void outputCSV(SpiderNode node, SpiderContext context, String csvName, Map<String, Object> data) {
if (data == null || data.isEmpty()) {
return;
}
Set<Map.Entry<String, Object>> entries = data.entrySet();
StringBuffer sb = new StringBuffer();
int i = 1 ;
for (Map.Entry<String,Object> item : entries) {
if (item.getValue() != null) {
sb.append(item.getValue().toString());
}
if (i < data.size()) {
sb.append(",");
}
i++;
}
sb.append("\r\n");
String key = context.getId() + "-" + node.getNodeId();
CSVPrinter printer = cachePrinter.get(key);
List<String> records = new ArrayList<>(data.size());
String[] headers = data.keySet().toArray(new String[data.size()]);
if (printer == null) {
CSVFormat format = CSVFormat.DEFAULT.withHeader(headers);
try {
FileFunctionExecutor.write(csvName, sb.toString().getBytes(),true);
OutputStreamWriter osw = new OutputStreamWriter(new FileOutputStream(csvName), "GBK");
printer = new CSVPrinter(osw, format);
cachePrinter.put(key, printer);
for (int i = 0; i < headers.length; i++) {
records.add(data.get(headers[i]).toString());
}
printer.printRecord(records);
} catch (IOException e) {
logger.error("文件输出错误,异常信息:{}", e.getMessage(), e);
ExceptionUtils.wrapAndThrow(e);
}
} else {
for (int i = 0; i < headers.length; i++) {
records.add(data.get(headers[i]).toString());
}
try {
printer.printRecord(records);
} catch (IOException e) {
logger.error("文件输出错误,异常信息:{}", e.getMessage(), e);
ExceptionUtils.wrapAndThrow(e);
}
}
}
@Override