Skip to content

S
smallproject
Commit f42232e5 by mahaisong
Options

fix:输出文件

parent 89de8dda
Showing with 39 additions and 174 deletions
6.CsvCount_ES/CsvCount_ES/Form1.cs
......@@ -687,29 +687,53 @@ namespace CsvCount_ES
this.listBox1.Items.Add(" ES中找到的条数有：" + (totalCountDic.Count() - errorEsCount) + "条");
this.listBox1.Items.Add(" ES中找不到的条数有：" + errorEsCount + "条");
this.listBox1.Items.Add("3.1开始：写入JSON文件：");
this.listBox1.Items.Add("3.2初始化文件数量： "+ textBox_output.Text + "个。");
this.listBox1.Items.Add("3.2初始化文件数量： " + textBox_output.Text + "个。");
this.listBox1.Items.Add("3.3并行写入文件中。");
}
));
Stopwatch writesw = new Stopwatch();
writesw.Start();
//输出到JSON文件中。
using (FileStream fs = new FileStream(filePath, FileMode.Append))
{
using (StreamWriter sw = new StreamWriter(fs))
{
sw.Write("[");
while (ResultQueue.Count == 0)
{
try
{
ResultItem tempitem = new ResultItem();
//将result结果放入到集合中。统一转为json字符串，写入文件。
ResultQueue.TryDequeue(out tempitem);
//string returnstr = JsonConvert.SerializeObject(result) + ",";
//将result结果放入到集合中。统一转为json字符串，写入文件。
string returnstr = JsonConvert.SerializeObject(result) + ",";
//using (FileStream fs = new FileStream(filePath, FileMode.Append))
//{
// using (StreamWriter sw = new StreamWriter(fs))
// {
// sw.Write(returnstr);
// sw.Flush();
// sw.Close();
// }
//}
sw.Write(returnstr);
sw.Flush();
sw.Close();
}
catch (Exception exm)
{
MessageBox.Show(exm.ToString());
}
}
sw.Write("]");
}
}
writesw.Stop();
this.Invoke(new MethodInvoker(() =>
{
this.listBox1.Items.Add("3.4写入文件完毕：");
this.listBox1.Items.Add(" 写入文件完成用时：" + writesw.ElapsedMilliseconds + "毫秒！");
}
));
errorCount = 0;
while (ResultQueue.Count > 0)
......
6.CsvCount_ES/CsvCount_ES/bin/Debug/Common.Logging.xml deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
6.CsvCount_ES/CsvCount_ES/bin/Debug/Config/log4net.config deleted 100644 → 0
<?xml version="1.0" encoding="utf-8" ?>
<log4net>
<appender name="errorAppender" type="log4net.Appender.RollingFileAppender">
<filter type="log4net.Filter.LevelMatchFilter">
<levelToMatch value="ERROR" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
<file value="Logs\err.log" />
<encoding value="utf-8"/>
<preserveLogFileNameExtension value="true" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
</layout>
</appender>
<appender name="infoAppender" type="log4net.Appender.RollingFileAppender">
<filter type="log4net.Filter.LevelMatchFilter">
<levelToMatch value="INFO" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
<file value="Logs\info.log" />
<encoding value="utf-8"/>
<preserveLogFileNameExtension value="true" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
</layout>
</appender>
<appender name="debugAppender" type="log4net.Appender.RollingFileAppender">
<filter type="log4net.Filter.LevelMatchFilter">
<levelToMatch value="DEBUG" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
<file value="Logs\debug.log" />
<encoding value="utf-8"/>
<preserveLogFileNameExtension value="true" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
</layout>
</appender>
<appender name="perfAppender" type="log4net.Appender.RollingFileAppender">
<filter type="log4net.Filter.LevelMatchFilter">
<levelToMatch value="INFO" />
</filter>
<filter type="log4net.Filter.DenyAllFilter" />
<file value="Logs\perf.log" />
<encoding value="utf-8"/>
<preserveLogFileNameExtension value="true" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyyMMdd" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date %logger - %message%newline" />
</layout>
</appender>
<root>
<level value="ALL" />
<appender-ref ref="errorAppender" />
<appender-ref ref="infoAppender" />
<appender-ref ref="debugAppender" />
</root>
<logger name="Performance" additivity="false">
<level value="ALL" />
<appender-ref ref="perfAppender" />
</logger>
</log4net>
\ No newline at end of file
6.CsvCount_ES/CsvCount_ES/bin/Debug/CsvCount_ES.exe.config deleted 100644 → 0
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
<sectionGroup name="common">
<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
</sectionGroup>
</configSections>
<connectionStrings>
<add name="ESDatabase" connectionString="host=mech.palaspom.com|tank.palaspom.com;port=19235;defaultIndex=palas" />
</connectionStrings>
<common>
<logging>
<factoryAdapter type="Common.Logging.Log4Net.Log4NetLoggerFactoryAdapter, Common.Logging.Log4Net208">
<!--FILE
FILE-WATCH log4net节点在其他独立文件内部。
INLINE log4net节点在配置app.config内部。
EXTERNAL-->
<arg key="configType" value="FILE-WATCH" />
<arg key="configFile" value="~/Config/log4net.config" />
</factoryAdapter>
</logging>
</common>
<appSettings>
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
</configuration>
\ No newline at end of file
6.CsvCount_ES/CsvCount_ES/bin/Debug/Elasticsearch.Net.xml deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
6.CsvCount_ES/CsvCount_ES/bin/Debug/MongoDB.Bson.xml deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
6.CsvCount_ES/CsvCount_ES/bin/Debug/Nest.xml deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
6.CsvCount_ES/CsvCount_ES/bin/Debug/Newtonsoft.Json.xml deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
6.CsvCount_ES/CsvCount_ES/bin/Debug/OutPut/模板.json deleted 100644 → 0
//要求通过newsid=itemid（ES中的）一一对应。
++ /dev/null
//要求通过newsid=itemid（ES中的）一一对应。
//要求取得以下字段，并返回统一包装的JSON结构。（AnalyzeData只有1个，里面的数据是common+reader（两者其中有值，值也是一样的，任取其一。可能存在相互补充的情况，合并为1个。））
[
{
"ItemID": "文章ID",
"ClickCount": "点击次数",
"Url": "文章Url",
"CleanTitle": "标题",
"CleanText": "正文",
"PubDate": "页面显示发布时间",
"MediaName": "21世纪经济报道",
"DuplicationID": "相似转载ID（早先入库的相似文章ID，第一篇该字段为空，其他均为第一篇的ID）",
"AnalyzeData语义分析结果字段": {
"MarketIDs": " 品类/市场common编号reader编号：有值任取其一",
"BlockIDs": "主题/板块编号common编号,reader编号：有值任取其一",
"StockIDs": "股票编号common编号,reader编号：有值任取其一",
"IG": ""
}
}
]
\ No newline at end of file
6.CsvCount_ES/CsvCount_ES/bin/Debug/log4net.xml deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
6.CsvCount_ES/CsvCount_ES/obj/Debug/CsvCount_ES.csproj.FileListAbsolute.txt
......@@ -15,32 +15,3 @@ C:\Users\admin\Desktop\CsvCount_ES\CsvCount_ES\bin\Debug\CsvCount_ES.pdb
C:\Users\admin\Desktop\CsvCount_ES\CsvCount_ES\obj\Debug\CsvCount_ES.Form1.resources
C:\Users\admin\Desktop\CsvCount_ES\CsvCount_ES\obj\Debug\CsvCount_ES.Properties.Resources.resources
C:\Users\admin\Desktop\CsvCount_ES\CsvCount_ES\obj\Debug\CsvCount_ES.csproj.GenerateResource.Cache
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Config\log4net.config
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\OutPut\模板.json
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\CsvCount_ES.exe.config
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\CsvCount_ES.exe
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\CsvCount_ES.pdb
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Common.Logging.Core.dll
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Common.Logging.dll
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Common.Logging.Log4Net208.dll
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Elasticsearch.Net.dll
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\log4net.dll
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\MongoDB.Bson.dll
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Nest.dll
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Newtonsoft.Json.dll
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Common.Logging.pdb
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Common.Logging.xml
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Common.Logging.Core.pdb
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Common.Logging.Core.xml
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Common.Logging.Log4Net208.pdb
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Common.Logging.Log4Net208.xml
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Elasticsearch.Net.xml
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\log4net.xml
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\MongoDB.Bson.xml
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Nest.xml
D:\smallproject\6.CsvCount_ES\CsvCount_ES\bin\Debug\Newtonsoft.Json.xml
D:\smallproject\6.CsvCount_ES\CsvCount_ES\obj\Debug\CsvCount_ES.Form1.resources
D:\smallproject\6.CsvCount_ES\CsvCount_ES\obj\Debug\CsvCount_ES.Properties.Resources.resources
D:\smallproject\6.CsvCount_ES\CsvCount_ES\obj\Debug\CsvCount_ES.csproj.GenerateResource.Cache
D:\smallproject\6.CsvCount_ES\CsvCount_ES\obj\Debug\CsvCount_ES.exe
D:\smallproject\6.CsvCount_ES\CsvCount_ES\obj\Debug\CsvCount_ES.pdb
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment