提交truncDate,istarshine的依赖

pom.xml

@@ -232,6 +232,11 @@
             <artifactId>nlp-aggree</artifactId>
             <version>0.0.5-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.zhiwei.tools</groupId>
+            <artifactId>zhiwei-tools</artifactId>
+            <version>0.3.3-SNAPSHOT</version>
+        </dependency>
 
     </dependencies>
     <build>

src/main/java/com/zhiwei/brandkbs2/util/Tools.java

@@ -37,6 +37,7 @@ import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -445,6 +446,44 @@ public class Tools {
 
     /**
      * 日期取整，去掉时分秒
+     * @param time
+     * @param pattern
+     * @return
+     */
+    public static Long truncDate(Long time, String pattern){
+        Long result = null;
+        if (time != null) {
+            Date date = new Date(time);
+            Calendar c = Calendar.getInstance();
+            c.setTime(date);
+            if (!pattern.contains("yyyy")) {
+                c.set(Calendar.YEAR, 1970);
+            }
+            if (!pattern.contains("MM")) {
+                c.set(Calendar.MONTH, 0);
+            }
+            if (!pattern.contains("dd")) {
+                c.set(Calendar.DAY_OF_MONTH, 1);
+            }
+            if (!pattern.contains("HH")) {
+                c.set(Calendar.HOUR_OF_DAY, 0);
+            }
+            if (!pattern.contains("mm")) {
+                c.set(Calendar.MINUTE, 0);
+            }
+            if (!pattern.contains("ss")) {
+                c.set(Calendar.SECOND, 0);
+            }
+            if (!pattern.contains("SSS")) {
+                c.set(Calendar.MILLISECOND, 0);
+            }
+            result = c.getTime().getTime();
+        }
+        return result;
+    }
+
+    /**
+     * 日期取整，去掉时分秒
      *
      * @param date
      * @return Date
@@ -805,8 +844,8 @@ public class Tools {
     /**
      * 解析时间转换成按月基数时间的集合
      *
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param startLong 开始时间
+     * @param endLong   结束时间
      * @return 按月基数分割时间的集合
      */
     public static List<Map<String, Long>> parseToDaysWithBase(Long startLong, Long endLong) {