Skip to content

Commit f9aa7ca

Browse files
toolgoodtoolgood
committed
添加 日期操作
1 parent bf89857 commit f9aa7ca

File tree

13 files changed

+4119
-3345
lines changed

13 files changed

+4119
-3345
lines changed

‎csharp/ToolGood.Algorithm2/Internals/MathSimplifiedFormulaVisitor.cs‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,6 +2015,49 @@ public override Operand VisitYEAR_fun(YEAR_funContext context)
20152015
return r;
20162016
}
20172017

2018+
public override Operand VisitADDYEARS_fun(ADDYEARS_funContext context)
2019+
{
2020+
inFunctionCount++;
2021+
Operand r = base.VisitADDYEARS_fun(context);
2022+
inFunctionCount--;
2023+
return r;
2024+
}
2025+
public override Operand VisitADDMONTHS_fun(ADDMONTHS_funContext context)
2026+
{
2027+
inFunctionCount++;
2028+
Operand r = base.VisitADDMONTHS_fun(context);
2029+
inFunctionCount--;
2030+
return r;
2031+
}
2032+
public override Operand VisitADDDAYS_fun(ADDDAYS_funContext context)
2033+
{
2034+
inFunctionCount++;
2035+
Operand r = base.VisitADDDAYS_fun(context);
2036+
inFunctionCount--;
2037+
return r;
2038+
}
2039+
public override Operand VisitADDHOURS_fun(ADDHOURS_funContext context)
2040+
{
2041+
inFunctionCount++;
2042+
Operand r = base.VisitADDHOURS_fun(context);
2043+
inFunctionCount--;
2044+
return r;
2045+
}
2046+
public override Operand VisitADDMINUTES_fun(ADDMINUTES_funContext context)
2047+
{
2048+
inFunctionCount++;
2049+
Operand r = base.VisitADDMINUTES_fun(context);
2050+
inFunctionCount--;
2051+
return r;
2052+
}
2053+
public override Operand VisitADDSECONDS_fun(ADDSECONDS_funContext context)
2054+
{
2055+
inFunctionCount++;
2056+
Operand r = base.VisitADDSECONDS_fun(context);
2057+
inFunctionCount--;
2058+
return r;
2059+
}
2060+
20182061

20192062
}
20202063
}

‎csharp/ToolGood.Algorithm2/ToolGood.Algorithm2.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Product>ToolGood.Algorithm</Product>
2222
<PackageLicenseFile>LICENSE</PackageLicenseFile>
2323
<SignAssembly>true</SignAssembly>
24-
<Version>3.4.0.0</Version>
24+
<Version>3.4.0.1</Version>
2525
<AssemblyOriginatorKeyFile>ToolGood.Algorithm.snk</AssemblyOriginatorKeyFile>
2626
<DelaySign>false</DelaySign>
2727
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\ToolGood.Algorithm.xml</DocumentationFile>

‎csharp/ToolGood.AlgorithmEngine.sln‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToolGood.Algorithm2", "Tool
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToolGood.Algorithm2.Test", "ToolGood.Algorithm2.Test\ToolGood.Algorithm2.Test.csproj", "{B393EF66-13D8-4D9E-BDB7-5F06D7F09651}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToolGood.Algorithm2.MathParserReplace", "ToolGood.Algorithm2.MathParserReplace\ToolGood.Algorithm2.MathParserReplace.csproj", "{7DE106D2-837C-4E7B-B520-0CC29021D6D8}"
11-
EndProject
1210
Global
1311
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1412
Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
2321
{B393EF66-13D8-4D9E-BDB7-5F06D7F09651}.Debug|Any CPU.Build.0 = Debug|Any CPU
2422
{B393EF66-13D8-4D9E-BDB7-5F06D7F09651}.Release|Any CPU.ActiveCfg = Release|Any CPU
2523
{B393EF66-13D8-4D9E-BDB7-5F06D7F09651}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{7DE106D2-837C-4E7B-B520-0CC29021D6D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{7DE106D2-837C-4E7B-B520-0CC29021D6D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{7DE106D2-837C-4E7B-B520-0CC29021D6D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{7DE106D2-837C-4E7B-B520-0CC29021D6D8}.Release|Any CPU.Build.0 = Release|Any CPU
3024
EndGlobalSection
3125
GlobalSection(SolutionProperties) = preSolution
3226
HideSolutionNode = FALSE

‎java/toolgood.algorithm/libs/antlr-runtime-4.8.jar‎

-330 KB
Binary file not shown.

‎java/toolgood.algorithm/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.github.toolgood</groupId>
88
<artifactId>toolgood-algorithm</artifactId>
9-
<version>3.3.0.0</version>
9+
<version>3.4.0.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>toolgood.algorithm</name>
@@ -15,7 +15,7 @@
1515
<licenses>
1616
<license>
1717
<name>The Apache Software License, Version 2.0</name>
18-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
18+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
1919
<distribution>repo</distribution>
2020
</license>
2121
</licenses>
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.antlr</groupId>
5858
<artifactId>antlr4-runtime</artifactId>
59-
<version>4.11.1</version>
59+
<version>4.12.0</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>joda-time</groupId>

‎java/toolgood.algorithm/src/main/java/toolgood/algorithm/internals/DiyNameVisitor.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@ public Object visitOR_fun(OR_funContext context) {
191191
return visitChildren(context);
192192
}
193193

194+
@Override
195+
public Object visitADDMONTHS_fun(ADDMONTHS_funContext context) {
196+
return visitChildren(context);
197+
}
198+
194199
@Override
195200
public Object visitNORMSINV_fun(NORMSINV_funContext context) {
196201

@@ -605,6 +610,16 @@ public Object visitSTDEVP_fun(STDEVP_funContext context) {
605610
return visitChildren(context);
606611
}
607612

613+
@Override
614+
public Object visitADDYEARS_fun(ADDYEARS_funContext context) {
615+
return visitChildren(context);
616+
}
617+
618+
@Override
619+
public Object visitADDSECONDS_fun(ADDSECONDS_funContext context) {
620+
return visitChildren(context);
621+
}
622+
608623
@Override
609624
public Object visitArray_fun(Array_funContext context) {
610625

@@ -929,6 +944,11 @@ public Object visitEXACT_fun(EXACT_funContext context) {
929944
return visitChildren(context);
930945
}
931946

947+
@Override
948+
public Object visitADDMINUTES_fun(ADDMINUTES_funContext context) {
949+
return visitChildren(context);
950+
}
951+
932952
@Override
933953
public Object visitSUMSQ_fun(SUMSQ_funContext context) {
934954

@@ -1145,6 +1165,11 @@ public Object visitMIN_fun(MIN_funContext context) {
11451165
return visitChildren(context);
11461166
}
11471167

1168+
@Override
1169+
public Object visitADDDAYS_fun(ADDDAYS_funContext context) {
1170+
return visitChildren(context);
1171+
}
1172+
11481173
@Override
11491174
public Object visitISNONTEXT_fun(ISNONTEXT_funContext context) {
11501175

@@ -1301,6 +1326,11 @@ public Object visitATAN2_fun(ATAN2_funContext context) {
13011326
return visitChildren(context);
13021327
}
13031328

1329+
@Override
1330+
public Object visitADDHOURS_fun(ADDHOURS_funContext context) {
1331+
return visitChildren(context);
1332+
}
1333+
13041334
@Override
13051335
public Object visitRAND_fun(RAND_funContext context) {
13061336

‎java/toolgood.algorithm/src/main/java/toolgood/algorithm/internals/MathSimplifiedFormulaVisitor.java‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,4 +1800,51 @@ public Operand visitYEAR_fun(YEAR_funContext context) {
18001800
return r;
18011801
}
18021802

1803+
@Override
1804+
public Operand visitADDYEARS_fun(ADDYEARS_funContext context) {
1805+
inFunctionCount++;
1806+
Operand r = super.visitADDYEARS_fun(context);
1807+
inFunctionCount--;
1808+
return r;
1809+
}
1810+
1811+
@Override
1812+
public Operand visitADDMONTHS_fun(ADDMONTHS_funContext context) {
1813+
inFunctionCount++;
1814+
Operand r = super.visitADDMONTHS_fun(context);
1815+
inFunctionCount--;
1816+
return r;
1817+
}
1818+
1819+
@Override
1820+
public Operand visitADDDAYS_fun(ADDDAYS_funContext context) {
1821+
inFunctionCount++;
1822+
Operand r = super.visitADDDAYS_fun(context);
1823+
inFunctionCount--;
1824+
return r;
1825+
}
1826+
1827+
@Override
1828+
public Operand visitADDHOURS_fun(ADDHOURS_funContext context) {
1829+
inFunctionCount++;
1830+
Operand r = super.visitADDHOURS_fun(context);
1831+
inFunctionCount--;
1832+
return r;
1833+
}
1834+
1835+
@Override
1836+
public Operand visitADDMINUTES_fun(ADDMINUTES_funContext context) {
1837+
inFunctionCount++;
1838+
Operand r = super.visitADDMINUTES_fun(context);
1839+
inFunctionCount--;
1840+
return r;
1841+
}
1842+
1843+
@Override
1844+
public Operand visitADDSECONDS_fun(ADDSECONDS_funContext context) {
1845+
inFunctionCount++;
1846+
Operand r = super.visitADDSECONDS_fun(context);
1847+
inFunctionCount--;
1848+
return r;
1849+
}
18031850
}

‎java/toolgood.algorithm/src/main/java/toolgood/algorithm/internals/MathSplitVisitor.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ public ConditionTree visitOR_fun(mathParser.OR_funContext context) {
162162
return visit_fun(context);
163163
}
164164

165+
@Override
166+
public ConditionTree visitADDMONTHS_fun(mathParser.ADDMONTHS_funContext context) {
167+
return visit_fun(context);
168+
}
169+
165170
@Override
166171
public ConditionTree visitNORMSINV_fun(mathParser.NORMSINV_funContext context) {
167172
return visit_fun(context);
@@ -503,6 +508,16 @@ public ConditionTree visitSTDEVP_fun(mathParser.STDEVP_funContext context) {
503508
return visit_fun(context);
504509
}
505510

511+
@Override
512+
public ConditionTree visitADDYEARS_fun(mathParser.ADDYEARS_funContext context) {
513+
return visit_fun(context);
514+
}
515+
516+
@Override
517+
public ConditionTree visitADDSECONDS_fun(mathParser.ADDSECONDS_funContext ctx) {
518+
return null;
519+
}
520+
506521
@Override
507522
public ConditionTree visitArray_fun(mathParser.Array_funContext context) {
508523
return visit_fun(context);
@@ -778,6 +793,11 @@ public ConditionTree visitEXACT_fun(mathParser.EXACT_funContext context) {
778793
return visit_fun(context);
779794
}
780795

796+
@Override
797+
public ConditionTree visitADDMINUTES_fun(mathParser.ADDMINUTES_funContext context) {
798+
return visit_fun(context);
799+
}
800+
781801
@Override
782802
public ConditionTree visitSUMSQ_fun(mathParser.SUMSQ_funContext context) {
783803
return visit_fun(context);
@@ -954,6 +974,11 @@ public ConditionTree visitMIN_fun(mathParser.MIN_funContext context) {
954974
return visit_fun(context);
955975
}
956976

977+
@Override
978+
public ConditionTree visitADDDAYS_fun(mathParser.ADDDAYS_funContext context) {
979+
return visit_fun(context);
980+
}
981+
957982
@Override
958983
public ConditionTree visitISNONTEXT_fun(mathParser.ISNONTEXT_funContext context) {
959984
return visit_fun(context);
@@ -1084,6 +1109,11 @@ public ConditionTree visitATAN2_fun(mathParser.ATAN2_funContext context) {
10841109
return visit_fun(context);
10851110
}
10861111

1112+
@Override
1113+
public ConditionTree visitADDHOURS_fun(mathParser.ADDHOURS_funContext context) {
1114+
return visit_fun(context);
1115+
}
1116+
10871117
@Override
10881118
public ConditionTree visitRAND_fun(mathParser.RAND_funContext context) {
10891119
return visit_fun(context);

0 commit comments

Comments
 (0)