Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期

# Conflicts:
#	logs/iot-box-websocket-api/error.log
#	logs/iot-box-websocket-api/info.log
#	logs/iot-box-websocket-api/warn.log

iot-common/iot-base/src/main/java/com/qiuguo/iot/base/date/Date.java

@@ -0,0 +1,7 @@
+package com.qiuguo.iot.base.date;
+
+import java.time.LocalDateTime;
+
+public abstract class Date{
+
+}

iot-common/iot-base/src/main/java/com/qiuguo/iot/base/date/DateEnum.java

@@ -0,0 +1,211 @@
+package com.qiuguo.iot.base.date;
+
+import java.time.LocalDateTime;
+
+public enum DateEnum implements IDate{
+    //现在，今天，明天，后天，昨天，前天，*天后，*天，
+    // 下周*， *周后，*周，
+    // 下个月*， *个月 *月后
+    // 今年，明年，后年，去年，前年，*年 *年后
+    //*分钟
+    //*小时
+    //*秒
+
+    /**
+     * 今天
+     */
+    TODAY("今天"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime;
+        }
+
+    },
+    /**
+     * 今天
+     */
+    NOW("现在"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime;
+        }
+
+    },
+
+    /**
+     * 明天
+     */
+    TOMORROW("明天"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-1);
+        }
+
+    },
+    /**
+     * 明天
+     */
+    YESTERDAY("昨天"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(1);
+        }
+
+    },
+    /**
+     * 明天
+     */
+    BEFOR_YESTERDAY("前天"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(2);
+        }
+
+    },
+    /**
+     * 后天
+     */
+    AFTER_TOMORROW("后天"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * n天后
+     */
+    N_AFTER_DAY("天后"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * n天
+     */
+    N_DAY("天"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * N月后
+     */
+    N_AFTER_MONTH("月后"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * N月
+     */
+    N_MONTH("月"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * N年后
+     */
+    N_AFTER_YEAR("年后"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * N年
+     */
+    N_YEAR("年"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * N小时后
+     */
+    N_AFTER_HOUR("小时后"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * N小时
+     */
+    N_HOUR("小时"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * N分钟后
+     */
+    N_AFTER_MINUTE("分钟后"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * N分钟
+     */
+    N_MINUTE("分钟"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * N秒后
+     */
+    N_AFTER_SECOND("秒后"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    /**
+     * N秒
+     */
+    N_SECOND("秒"){
+        @Override
+        public LocalDateTime getDateTime(LocalDateTime localDateTime){
+            return localDateTime.minusDays(-2);
+        }
+
+    },
+    ;
+    Date date;
+    String code;
+    DateEnum(String c) {
+        code = c;
+    }
+
+    public static DateEnum getWithCode(String c) {
+        for (DateEnum dateEnum:values()
+             ) {
+            if(c.equals(dateEnum.code)){
+                return dateEnum;
+            }
+        }
+        return null;
+    }
+}

iot-common/iot-base/src/main/java/com/qiuguo/iot/base/date/IDate.java

@@ -0,0 +1,7 @@
+package com.qiuguo.iot.base.date;
+
+import java.time.LocalDateTime;
+
+public interface IDate {
+    public LocalDateTime getDateTime(LocalDateTime localDateTime);
+}

iot-common/iot-base/src/main/java/com/qiuguo/iot/base/date/Tomorrow.java

@@ -0,0 +1,7 @@
+package com.qiuguo.iot.base.date;
+
+import java.time.LocalDateTime;
+
+public class Tomorrow extends Date{
+
+}

iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java

@@ -1,15 +1,11 @@
 package com.qiuguo.iot.third.nlp.action;
 
+import com.qiuguo.iot.base.date.DateEnum;
 import com.qiuguo.iot.base.utils.StringUtils;
-import com.qiuguo.iot.data.entity.system.SystemTalkAnswerConfigEntity;
 import lombok.Data;
 
-import java.text.SimpleDateFormat;
-import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.List;
 
 @Data
 public class ActionTime {
@@ -47,17 +43,7 @@ public class ActionTime {
 
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DateTimeFormatter df1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        if(t.equals("今天")){
-
-        }else if(t.equals("明天")){
-            localDateTime = localDateTime.minusDays(-1);
-        }else if(t.equals("后天")){
-            localDateTime = localDateTime.minusDays(-2);
-        }else if(t.equals("昨天")){
-            localDateTime = localDateTime.minusDays(1);
-        }else if(t.equals("前天")){
-            localDateTime = localDateTime.minusDays(2);
-        }
+        localDateTime = DateEnum.getWithCode(t).getDateTime(localDateTime);
         dateTime = localDateTime.format(df);
         dateDetailTime = localDateTime.format(df1);