iFish/Light12306
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整部分算法

Browse Source
This commit is contained in:
iFish(木鱼) 2015-12-07 02:30:22 +08:00
parent 4d50df2cf3
commit d201b426fc
8 changed files with 152 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
12306.sln.vsdoc Normal file
View File

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<!-- VSdocman config file for current project/solution.-->
<activeProfile>default</activeProfile>
<appSettings>
<SettingsGroup name="CommonProjectProfile">
<add key="VBdocman_generateVbSyntax"><![CDATA[-1]]></add>
<add key="VBdocman_generateJscriptSyntax"><![CDATA[-1]]></add>
<add key="VBdocman_comConstant"><![CDATA[-1]]></add>
<add key="VBdocman_comStdModule"><![CDATA[-1]]></add>
<add key="VBdocman_templatePath"><![CDATA[html_msdn10_lightweight.vbdt]]></add>
<add key="VBdocman_supportedNetFrameworkClientProfile"><![CDATA[4, 3.5 SP1]]></add>
<add key="VBdocman_generateCppSyntax"><![CDATA[-1]]></add>
<add key="VBdocman_comEnumeration"><![CDATA[-1]]></add>
<add key="VBdocman_supportedNetFramework"><![CDATA[4.6, 4.5, 4, 3.5, 3.0, 2.0, 1.1, 1.0]]></add>
<add key="VBdocman_supportedNetCompactFramework"><![CDATA[]]></add>
<add key="VBdocman_removeAttributes"><![CDATA[0]]></add>
<add key="VBdocman_comProtected"><![CDATA[-1]]></add>
<add key="VBdocman_helpTitle"><![CDATA[SOLUTION-WIDE PROPERTIES Reference]]></add>
<add key="VBdocman_allowMacrosInComments"><![CDATA[0]]></add>
<add key="VBdocman_customVar2"><![CDATA[]]></add>
<add key="VBdocman_comModulesSaveExcluded"><![CDATA[-1]]></add>
<add key="VBdocman_comDelegate"><![CDATA[-1]]></add>
<add key="VBdocman_comStructure"><![CDATA[-1]]></add>
<add key="VBdocman_comEventDecl"><![CDATA[-1]]></add>
<add key="VBdocman_pageFooterText"><![CDATA[Generated with <see href="http://www.helixoft.com/vsdocman/overview.html">VSdocman</see>]]></add>
<add key="VBdocman_comProtectedFriend"><![CDATA[-1]]></add>
<add key="VBdocman_dontSortSeeAlsoList"><![CDATA[0]]></add>
<add key="VBdocman_regexFilters"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<filters />]]></add>
<add key="VBdocman_linkForExternalNotInFramework"><![CDATA[0]]></add>
<add key="VBdocman_rootNamespaceText"><![CDATA[]]></add>
<add key="VBdocman_comPrivate"><![CDATA[0]]></add>
<add key="VBdocman_SelectedProperties"><![CDATA[
<ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<string>showFormsSeparate</string>
<string>showInherited</string>
<string>pageFooterText</string>
<string>outputPath</string>
<string>templatePath</string>
<string>templateFolder</string>
<string>externalFilesFolder</string>
<string>templateLocale</string>
<string>fileNamingConvention</string>
<string>generateVbSyntax</string>
<string>generateCsharpSyntax</string>
<string>generateCppSyntax</string>
<string>generateJscriptSyntax</string>
<string>helpTitle</string>
<string>customTopics</string>
<string>emptyOutputFolder</string>
</ArrayOfString>]]></add>
<add key="VBdocman_comNonCommented"><![CDATA[-1]]></add>
<add key="VBdocman_comDeclare"><![CDATA[-1]]></add>
<add key="VBdocman_supportedXnaFramework"><![CDATA[]]></add>
<add key="VBdocman_enumSorting"><![CDATA[1]]></add>
<add key="VBdocman_supportedPortableClassLibrary"><![CDATA[]]></add>
<add key="VBdocman_useConditionalCompilation"><![CDATA[0]]></add>
<add key="VBdocman_supportedNetForWindowsStoreApps"><![CDATA[]]></add>
<add key="VBdocman_showInherited"><![CDATA[-1]]></add>
<add key="VBdocman_fileNamingConvention"><![CDATA[1]]></add>
<add key="VBdocman_conditionalConstants"><![CDATA[]]></add>
<add key="VBdocman_comWriteDescription"><![CDATA[0]]></add>
<add key="VBdocman_comFriend"><![CDATA[0]]></add>
<add key="VBdocman_comVariable"><![CDATA[-1]]></add>
<add key="VBdocman_showFormsSeparate"><![CDATA[0]]></add>
<add key="VBdocman_comObject"><![CDATA[-1]]></add>
<add key="VBdocman_emptyOutputFolder"><![CDATA[0]]></add>
<add key="VBdocman_customVar1"><![CDATA[]]></add>
<add key="VBdocman_indentMode"><![CDATA[0]]></add>
<add key="VBdocman_comEvent"><![CDATA[-1]]></add>
<add key="VBdocman_rootNamespaceCommentStyle"><![CDATA[2]]></add>
<add key="VBdocman_customTopics"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
<topics>
<topic>
<type>normal</type>
<is-default>yes</is-default>
<name>SOLUTION-WIDE PROPERTIES Reference</name>
<id>solutionwide_properties_reference</id>
<comment><![CDATA[<summary></summary>vsdocman_escaped_]_]_></comment>
<namespaces />
<topics>
<topic>
<type>placeholder</type>
<is-default>no</is-default>
<name />
<id>421550cecbb34c889da962a973d57471</id>
<comment><![CDATA[vsdocman_escaped_]_]_></comment>
<namespaces />
<topics />
</topic>
</topics>
</topic>
</topics>]]></add>
<add key="VBdocman_comMethod"><![CDATA[-1]]></add>
<add key="VBdocman_externalFilesFolder"><![CDATA[]]></add>
<add key="VBdocman_templateLocale"><![CDATA[en-US]]></add>
<add key="VBdocman_supportedPlatforms"><![CDATA[Windows Phone 8.1, Windows Phone 8, Windows 8.1, Windows Server 2012 R2, Windows 8, Windows Server 2012, Windows 7, Windows Vista SP2, Windows Server 2008 (Server Core Role not supported), Windows Server 2008 R2 (Server Core Role supported with SP1 or later; Itanium not supported)]]></add>
<add key="VBdocman_comForm"><![CDATA[-1]]></add>
<add key="VBdocman_unbreakSourceLines"><![CDATA[0]]></add>
<add key="VBdocman_comPublic"><![CDATA[-1]]></add>
<add key="VBdocman_templateFolder"><![CDATA[$(VSdocmanDir)Templates]]></add>
<add key="VBdocman_customVar3"><![CDATA[]]></add>
<add key="VBdocman_outputPath"><![CDATA[$(ProjectDir)VSdoc]]></add>
<add key="VBdocman_insertSourceGlobal"><![CDATA[0]]></add>
<add key="VBdocman_comProperty"><![CDATA[-1]]></add>
<add key="VBdocman_supportedOthers"><![CDATA[]]></add>
<add key="VBdocman_generateCsharpSyntax"><![CDATA[-1]]></add>
<add key="VBdocman_comInterface"><![CDATA[-1]]></add>
</SettingsGroup>
<add key="VBdocman_FSLib.Extension"><![CDATA[default]]></add>
<add key="VBdocman_FSLib.MvcWeb.Net4"><![CDATA[default]]></add>
<add key="VBdocman_FSLib.Network.NET4"><![CDATA[default]]></add>
<add key="VBdocman_FSLib.Web.NET4"><![CDATA[default]]></add>
<add key="VBdocman_FSLib_NET4"><![CDATA[default]]></add>
<add key="VBdocman_TrainInfomationProviderService"><![CDATA[default]]></add>
</appSettings>
</configuration>

2
TrainInfomationProviderService/Program.cs
View File

@ -113,7 +113,7 @@ namespace TrainInfomationProviderService
var opt = new TrainTransitSearchOptions(); var opt = new TrainTransitSearchOptions();
opt.InitLimit(1357); opt.InitLimit(1357);
var altLines = searchProvider.FindOnceTransitTrains(DateTime.Parse("2016-01-28"), "WMR", "WHN", opt).ToArray(); var altLines = searchProvider.FindOnceTransitTrains(DateTime.Parse("2016-02-03"), "BJP", "ZHQ", opt).ToArray();
//var availableLines = lines.Select(s => s.Train.Code + "," + s.FromStation.Name + "," + s.ToStation.Name + "," + s.ElapsedTime).ToArray(); //var availableLines = lines.Select(s => s.Train.Code + "," + s.FromStation.Name + "," + s.ToStation.Name + "," + s.ElapsedTime).ToArray();
Array.ForEach(altLines.Select(s => Array.ForEach(altLines.Select(s =>

2
TrainInfomationProviderService/Properties/AssemblyInfo.cs
View File

@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.5810.3")] [assembly: AssemblyFileVersion("1.0.5818.7")]

4
TrainInfomationProviderService/TrainInfo/TrainInfoSearchProvider.cs
View File

@ -67,7 +67,7 @@ namespace TrainInfomationProviderService.TrainInfo
while (date >= minDate) while (date >= minDate)
{ {
infoStorage = Storage.TrainInfoStorages.GetValue(date.ToString("yyyy-MM-dd")); infoStorage = Storage.TrainInfoStorages.GetValue(date.ToString("yyyy-MM-dd"));
if (infoStorage == null) if (infoStorage == null || infoStorage.Trains.Count == 0)
date = date.AddDays(-1); date = date.AddDays(-1);
else break; else break;
} }
@ -102,7 +102,7 @@ namespace TrainInfomationProviderService.TrainInfo
while (date >= minDate) while (date >= minDate)
{ {
infoStorage = Storage.TrainInfoStorages.GetValue(date.ToString("yyyy-MM-dd")); infoStorage = Storage.TrainInfoStorages.GetValue(date.ToString("yyyy-MM-dd"));
if (infoStorage == null) if (infoStorage == null || infoStorage.Trains.Count == 0)
date = date.AddDays(-1); date = date.AddDays(-1);
else break; else break;
} }

8
TrainInfomationProviderService/TrainInfo/WebDataProvider.cs
View File

@ -121,9 +121,17 @@ namespace TrainInfomationProviderService.TrainInfo
var data = JsonConvert.DeserializeObject<TrainListData>(body); var data = JsonConvert.DeserializeObject<TrainListData>(body);
var station = StationManager.Instance.Storage.StationNameMap; var station = StationManager.Instance.Storage.StationNameMap;
var nowDate = DateTime.Now.Date;
foreach (var date in data.Keys) foreach (var date in data.Keys)
{ {
if (DateTime.Parse(date) < nowDate)
{
Trace.TraceInformation($"[TRAIN_DATA_WEB_PROVIDER] 忽略过期日期：{date}");
continue;
}
var dateSt = data[date]; var dateSt = data[date];
var curStorage = indexStorage.TrainInfoStorages.GetValue(date); var curStorage = indexStorage.TrainInfoStorages.GetValue(date);
if (curStorage == null) if (curStorage == null)

17
Web12306/.project Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Web12306</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.aptana.ide.core.unifiedBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.aptana.projects.webnature</nature>
</natures>
</projectDescription>

4
Web12306/.vscode/launch.json vendored Normal file
View File

@ -0,0 +1,4 @@
{
"version": "0.2.0",
"configurations": []
}

2
Web12306/Web12306.csproj
View File

@ -23,7 +23,7 @@
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<TypeScriptToolsVersion>1.6</TypeScriptToolsVersion> <TypeScriptToolsVersion>1.7</TypeScriptToolsVersion>
<NuGetPackageImportStamp>16ae31ba</NuGetPackageImportStamp> <NuGetPackageImportStamp>16ae31ba</NuGetPackageImportStamp>
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
</PropertyGroup> </PropertyGroup>