From 913e7b40fb46d194661d3ab055c5eeb863391253 Mon Sep 17 00:00:00 2001
From: 6tail <6tail@6tail.cn>
Date: Mon, 12 Oct 2020 22:54:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E6=B0=94=E5=AF=B9=E8=B1=A1=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A4=E6=96=AD=E6=98=AF=E8=8A=82=E4=BB=A4=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E6=B0=94=E4=BB=A4=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nlf/calendar/JieQi.java | 47 ++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nlf/calendar/JieQi.java b/src/main/java/com/nlf/calendar/JieQi.java
index 65a0597..6cdf424 100644
--- a/src/main/java/com/nlf/calendar/JieQi.java
+++ b/src/main/java/com/nlf/calendar/JieQi.java
@@ -1,5 +1,7 @@
 package com.nlf.calendar;
 
+import com.nlf.calendar.util.LunarUtil;
+
 /**
  * 节气
  *
@@ -13,11 +15,22 @@ public class JieQi {
   /** 阳历日期 */
   private Solar solar;
 
+  /** 是否节令 */
+  private boolean jie;
+
+  /** 是否气令 */
+  private boolean qi;
+
   public JieQi() {
   }
 
+  /**
+   * 初始化
+   * @param name 名称
+   * @param solar 阳历日期
+   */
   public JieQi(String name, Solar solar) {
-    this.name = name;
+    setName(name);
     this.solar = solar;
   }
 
@@ -35,6 +48,18 @@ public class JieQi {
    */
   public void setName(String name) {
     this.name = name;
+    for(String key: LunarUtil.JIE){
+      if(key.equals(name)){
+        this.jie = true;
+        return;
+      }
+    }
+    for(String key: LunarUtil.QI){
+      if(key.equals(name)){
+        this.qi = true;
+        return;
+      }
+    }
   }
 
   /**
@@ -53,4 +78,24 @@ public class JieQi {
     this.solar = solar;
   }
 
+  /**
+   * 是否节令
+   * @return true/false
+   */
+  public boolean isJie(){
+    return jie;
+  }
+
+  /**
+   * 是否气令
+   * @return true/false
+   */
+  public boolean isQi() {
+    return qi;
+  }
+
+  @Override
+  public String toString(){
+    return name;
+  }
 }