1
0
mirror of synced 2026-02-06 04:58:00 +08:00

toYmdhms改为toYmdHms

This commit is contained in:
6tail
2020-04-20 12:51:10 +08:00
parent 19ac8dd54a
commit b7b7b749c3
3 changed files with 8 additions and 6 deletions

View File

@@ -3,7 +3,9 @@
lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)工具,支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道黑道日及吉凶等。
> 支持java 1.5及以上版本。
> 干支纪年:支持以正月初一计,支持以立春当日计,支持以立春交接时刻计。
> 干支纪月:支持以节当日计,支持以节交接时刻计。
[English](https://github.com/6tail/lunar-java/blob/master/README_EN.md)

View File

@@ -231,7 +231,7 @@ public class Lunar{
}
}
//立春交接时刻判断
if(solar.toYmdhms().compareTo(liChun.toYmdhms())<0) {
if(solar.toYmdHms().compareTo(liChun.toYmdHms())<0) {
gExact--;
if(gExact<0){
gExact += 10;
@@ -284,9 +284,9 @@ public class Lunar{
int indexExact = -2;
for(String jie:LunarUtil.JIE){
end = jieQi.get(jie);
String time = solar.toYmdhms();
String stime = null==start?time:start.toYmdhms();
String etime = end.toYmdhms();
String time = solar.toYmdHms();
String stime = null==start?time:start.toYmdHms();
String etime = end.toYmdHms();
if(time.compareTo(stime)>=0&&time.compareTo(etime)<0){
break;
}

View File

@@ -440,13 +440,13 @@ public class Solar{
return year+"-"+(month<10?"0":"")+month+"-"+(day<10?"0":"")+day;
}
public String toYmdhms(){
public String toYmdHms(){
return toYmd()+" "+(hour<10?"0":"")+hour+":"+(minute<10?"0":"")+minute+":"+(second<10?"0":"")+second;
}
public String toFullString(){
StringBuilder s = new StringBuilder();
s.append(toYmdhms());
s.append(toYmdHms());
if(isLeapYear()){
s.append(" ");
s.append("闰年");