enhance Timestamp-LocalDateTime converter

Author: caofanCPU

README.md

@@ -182,13 +182,6 @@ Solution
     - Adjustment: 
         - Icons changed for align, friendly view etc.
         - The manual of this plugin has been moved to my <a href="http://www.debuggerpowerzcy.top/home/2020/03/14/D8gerAutoCode%E6%8F%92%E4%BB%B6%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97/">website</a>.
-    
-- 2.2(private)
-    - Addition:
-        - END easter eggs, try to type `end` in the blank file in IDEA to get the end-template(encryption and decryption).
-        - END easter eggs, multi-lines can be batch handled with the end-template, it's very useful for encryption and decryption.
-    - Optimization: Support linebreak or comma as the delimiter.
-    - Attention: This version is private, you can <a href="http://www.debuggerpowerzcy.top/about/">send me a email</a> and clarify your needs, such as what algorithm you'll take.
 
 - 2.1
     - BugFix: add Uncapitalize, and the circle is Camel-Underline-Uppercase-Uncapitalize-Lowercase.

README_CN.md

@@ -180,13 +180,6 @@
     - 功能调整: 
         - 插件功能图标调整对齐.
         - 插件使用指南搬迁到我的<a href="http://www.debuggerpowerzcy.top/home/2020/03/14/D8gerAutoCode%E6%8F%92%E4%BB%B6%E4%BD%BF%E7%94%A8%E6%8C%87%E5%8D%97/">博客</a>.
-    
-- 2.2(private)
-    - 新增功能:
-        - 加解密彩蛋, 空白文档输入`end`获取加解密模板.
-        - 加解密彩蛋, 针对多行文本, 提供多种加密算法下的加密、解密、加解密全过程的处理功能
-    - 体验优化: 支持用中英文逗号作为多行文本的分隔符.
-    - TheShy提示: 该版本是私有版本, 你可以向我<a href="http://www.debuggerpowerzcy.top/about/">发邮件</a>阐明你需要定制的加解密功能, 例如你要使用的加解密算法是哪一种.
 
 - 2.1
     - Bug修复: 补充一键首字母小写转换功能, 完成字段命名闭环: 驼峰-下划线-全大写-首字母小写-全小写.

src/main/java/com/xyz/caofancpu/d8ger/action/CamelUnderlineConvertAction.java

@@ -9,14 +9,11 @@
 import com.intellij.openapi.editor.SelectionModel;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
-import com.xyz.caofancpu.d8ger.util.ConstantUtil;
 import com.xyz.caofancpu.d8ger.util.DateUtil;
 import com.xyz.caofancpu.d8ger.util.VerbalExpressionUtil;
 import lombok.NonNull;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.regex.Pattern;
-
 /**
  * 1.Camel-Underline convert
  * 2.Uppercase-Lowercase convert
@@ -25,9 +22,6 @@
  * @author caofanCPU
  */
 public class CamelUnderlineConvertAction extends AnAction {
-
-    public static final Pattern DATE_TIME_REGEX = Pattern.compile("(?:[Tt])+");
-
     @Override
     public void actionPerformed(AnActionEvent e) {
         final Editor currentEditor = e.getRequiredData(CommonDataKeys.EDITOR);
@@ -66,17 +60,12 @@ private void executeCamelUnderlineConvert(@NonNull Document currentDocument, @No
     private String handleReplacement(@NonNull String originWord) {
         String result = null;
         try {
-            // First, 1600069557000 to 2020-09-14 15:45:57
+            // First, 1600069557000 to 2020-09-14 15:45:57.000
             Long milliSeconds = Long.valueOf(originWord);
-            result = DateUtil.toLocalDateTime(milliSeconds).toString().replaceAll(DATE_TIME_REGEX.pattern(), ConstantUtil.SPACE);
+            result = DateUtil.enhanceToLocalDateTime(milliSeconds);
         } catch (Exception e) {
             // ignore
-            try {
-                // Second, 2020-09-14 15:45:57 to 1600069557000
-                result = DateUtil.parseStandardMilliSeconds(originWord.replaceAll(DATE_TIME_REGEX.pattern(), ConstantUtil.SPACE)).toString();
-            } catch (Exception exception) {
-                // ignore
-            }
+            result = DateUtil.enhanceParseMilliSeconds(originWord);
         }
         if (StringUtils.isBlank(result)) {
             result = VerbalExpressionUtil.camelUnderLineNameConverter(originWord);

src/main/java/com/xyz/caofancpu/d8ger/util/DateUtil.java

@@ -20,11 +20,14 @@
 
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.util.Objects;
+import java.util.regex.Pattern;
 
 
 /**
@@ -34,7 +37,11 @@
  */
 @Slf4j
 public class DateUtil {
+    public static final Pattern DATE_TIME_REGEX = Pattern.compile("(?:[Tt])+");
     public final static String DATETIME_FORMAT_SIMPLE = "yyyy-MM-dd HH:mm:ss";
+    public final static String DATETIME_FORMAT_DETAIL = "yyyy-MM-dd HH:mm:ss:SSS";
+    public final static String DATETIME_FORMAT_DETAIL_DOT = "yyyy-MM-dd HH:mm:ss.SSS";
+    public final static String DATETIME_FORMAT_CN = "yyyy年MM月dd日HH时mm分ss秒";
 
     public final static ZoneOffset DEFAULT_ZONE_OFFSET = ZoneOffset.of("+8");
 
@@ -65,4 +72,47 @@ public static LocalDateTime parseStandardDateTime(String dateTimeStr) {
         return LocalDateTime.parse(dateTimeStr, DateTimeFormatter.ofPattern(DATETIME_FORMAT_SIMPLE));
     }
 
+    /**
+     * Long to LocalDateTimeString
+     */
+    public static String enhanceToLocalDateTime(@NonNull Long milliSeconds) {
+        LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(milliSeconds), DEFAULT_ZONE_OFFSET);
+        return localDateTime.format(DateTimeFormatter.ofPattern(DATETIME_FORMAT_DETAIL_DOT));
+    }
+
+    /**
+     * String of date and time, convert to String: milliseconds
+     * for example:
+     * 2020-09-14 15:45:57
+     * 2020-09-14T15:45:57
+     * 2020-09-14t15:45:57
+     * 2020-09-14 15:45:57.007
+     * 2020-09-14 15:45:57:007
+     * 2020年09月14日15时45分57秒
+     *
+     * @param dateTimeStr
+     * @return
+     */
+    public static String enhanceParseMilliSeconds(String dateTimeStr) {
+        if (StringUtils.isBlank(dateTimeStr)) {
+            return dateTimeStr;
+        }
+        String originWord = dateTimeStr.replaceAll(DATE_TIME_REGEX.pattern(), ConstantUtil.SPACE);
+        LocalDateTime parse = null;
+        try {
+            parse = LocalDateTime.parse(originWord, DateTimeFormatter.ofPattern(DATETIME_FORMAT_SIMPLE));
+        } catch (Exception e) {
+            try {
+                parse = LocalDateTime.parse(originWord, DateTimeFormatter.ofPattern(DATETIME_FORMAT_DETAIL));
+            } catch (Exception exception) {
+                try {
+                    parse = LocalDateTime.parse(originWord, DateTimeFormatter.ofPattern(DATETIME_FORMAT_DETAIL_DOT));
+                } catch (Exception ex) {
+                    parse = LocalDateTime.parse(originWord, DateTimeFormatter.ofPattern(DATETIME_FORMAT_CN));
+                }
+            }
+        }
+        return Objects.nonNull(parse) ? String.valueOf(parse.toInstant(DEFAULT_ZONE_OFFSET).toEpochMilli()) : dateTimeStr;
+    }
+
 }

src/main/resources/META-INF/plugin.xml

@@ -192,18 +192,6 @@
         </li>
         </ul>
         </br>
-        <li><h1>2.2(private)</h1></li>
-        <ul>
-        <li>Addition:<br>
-            <ul>
-            <li>END easter eggs, try to type 'end' in the blank file in IDEA to get the end-template(encryption and decryption).</li>
-            <li>END easter eggs, multi-lines can be batch handled with the end-template, it's very useful for encryption and decryption.</li>
-            </ul>
-        </li>
-        <li>Optimization: Support linebreak or comma as the delimiter.</li>
-        <li>Attention: This version is private, you can <a href="http://www.debuggerpowerzcy.top/about/">send me a email</a> and clarify your needs, such as what algorithm you'll take.</li>
-        </ul>
-        </br>
         <li><h1>2.1</h1></li>
         <ul>
         <li>BugFix: add Uncapitalize, and the circle is Camel-Underline-Uppercase-Uncapitalize-Lowercase.</li>