1

.idea/workspace.xml

@@ -3,16 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="dd929402-2229-45b9-b0b5-26b38816b73a" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt" beforeDir="false" afterPath="$PROJECT_DIR$/sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/sooka-auth/target/" />
     <ignored path="$PROJECT_DIR$/sooka-common/target/" />
@@ -46,83 +37,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Guiji_naturalresources.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="29" column="64" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="80" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Guiji_naturalresources_bdcdjzxx_Bean.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="107">
-              <caret line="20" column="16" lean-forward="true" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Guiji_naturalresources_Mapper.xml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="298">
-              <caret line="325" column="31" selection-start-line="325" selection-start-column="31" selection-end-line="325" selection-end-column="31" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Guiji_naturalresources_Mapper2.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="320" column="17" lean-forward="true" selection-start-line="320" selection-start-column="17" selection-end-line="320" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Guiji_Housingconstruction.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Guiji_Housingconstruction.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-150">
-              <caret line="89" column="49" selection-start-line="89" selection-start-column="49" selection-end-line="89" selection-end-column="49" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Guiji_naturalresources_ServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
-              <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Guiji_naturalresources_Mapper2.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_naturalresources_Mapper2.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="227">
-              <caret line="14" column="50" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="50" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1507">
-              <caret line="90" column="19" selection-start-line="90" selection-start-column="19" selection-end-line="90" selection-end-column="19" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="application-dev-internet.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/application-dev-internet.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2910">
-              <caret line="97" column="9" selection-start-line="97" selection-start-column="9" selection-end-line="97" selection-end-column="9" />
+            <state relative-caret-position="457">
+              <caret line="160" column="38" selection-start-line="160" selection-start-column="38" selection-end-line="160" selection-end-column="38" />
             </state>
           </provider>
         </entry>
@@ -139,7 +58,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>com.sooka.mapper.Guiji_Library_Mapper2</find>
       <find>resultMap</find>
       <find>select DJBH,QLRLX,QLBH,QLRBH,QLLB,QLRMC,SXH,ZJLB,ZJHM,FZJG,SSHY,GJDQ,</find>
       <find>qlrjbxx_select_genren</find>
@@ -169,6 +87,7 @@
       <find>add_guiji_naturalresources_qlrjbxx</find>
       <find>ggui</find>
       <find>FDZL</find>
+      <find>DJBH</find>
     </findStrings>
     <dirStrings>
       <dir>E:\首佳工作目录\thsjzt_cloud</dir>
@@ -229,15 +148,15 @@
         <option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_Housingconstruction_Mapper.xml" />
         <option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_Housingconstruction_Mapper2.xml" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjxx_Bean.java" />
-        <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/test-api/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_qlrjbxx_Bean.java" />
         <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java" />
-        <option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml" />
         <option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml" />
+        <option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml" />
+        <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" />
       </list>
     </option>
   </component>
@@ -286,7 +205,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -337,7 +255,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="sooka" type="462c0819:PsiDirectoryNode" />
-              <item name="api_pagefile" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="s-cloud" type="b2602c69:ProjectViewProjectNode" />
@@ -371,6 +289,7 @@
         </subPane>
       </pane>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -614,7 +533,8 @@
       <workItem from="1632362591381" duration="14480000" />
       <workItem from="1632445032397" duration="10654000" />
       <workItem from="1632617293039" duration="876000" />
-      <workItem from="1632813327613" duration="5322000" />
+      <workItem from="1632813327613" duration="6917000" />
+      <workItem from="1633921285535" duration="225000" />
     </task>
     <task id="LOCAL-00001" summary="1">
       <created>1627002165670</created>
@@ -749,11 +669,32 @@
       <option name="project" value="LOCAL" />
       <updated>1632822778471</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="1">
+      <created>1632823923123</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1632823923123</updated>
+    </task>
+    <task id="LOCAL-00021" summary="1">
+      <created>1632824264897</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1632824264897</updated>
+    </task>
+    <task id="LOCAL-00022" summary="1">
+      <created>1632824288926</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1632824288926</updated>
+    </task>
+    <option name="localTasksCounter" value="23" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="285513000" />
+    <option name="totallyTimeSpent" value="287333000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -776,14 +717,13 @@
       <window_info anchor="bottom" id="Java Enterprise" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="3" />
       <window_info anchor="bottom" id="Run Dashboard" order="8" sideWeight="0.8251599" weight="0.36222222" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.70255864" weight="0.027777778" />
       <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.4989339" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.70255864" visible="true" weight="0.027777778" />
       <window_info anchor="bottom" id="Spring" order="7" />
       <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.4989339" weight="0.39222223" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49888888" visible="true" weight="0.24253732" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49888888" visible="true" weight="0.24520256" />
       <window_info anchor="right" id="Bean Validation" order="3" weight="0.32995737" />
       <window_info id="Web" order="2" sideWeight="0.5011111" side_tool="true" weight="0.32302773" />
-      <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="2" sideWeight="0.5011111" side_tool="true" weight="0.32302773" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -792,6 +732,7 @@
       <window_info anchor="bottom" id="Messages" order="7" sideWeight="0.49840087" weight="0.4977778" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1123,64 +1064,64 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjzxx_Bean.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="107">
-          <caret line="20" column="16" lean-forward="true" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
+        <state relative-caret-position="540">
+          <caret line="20" column="16" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-150">
-          <caret line="89" column="49" selection-start-line="89" selection-start-column="49" selection-end-line="89" selection-end-column="49" />
+        <state relative-caret-position="2700">
+          <caret line="90" column="19" selection-start-line="90" selection-start-column="19" selection-end-line="90" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_naturalresources_Mapper2.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="29" column="64" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="80" />
+        <state relative-caret-position="240">
+          <caret line="14" column="50" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="50" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1507">
-          <caret line="90" column="19" selection-start-line="90" selection-start-column="19" selection-end-line="90" selection-end-column="19" />
+        <state relative-caret-position="1740">
+          <caret line="72" selection-start-line="72" selection-end-line="72" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_naturalresources_Mapper2.java">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_civiladministration_Mapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="14" column="50" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="50" />
+        <state relative-caret-position="462">
+          <caret line="34" column="38" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
+        <state relative-caret-position="9990">
+          <caret line="333" column="31" selection-end-line="455" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="320" column="17" lean-forward="true" selection-start-line="320" selection-start-column="17" selection-end-line="320" selection-end-column="17" />
+        <state relative-caret-position="330">
+          <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_civiladministration_Mapper.xml">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_naturalresources.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="34" column="38" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="38" />
+        <state relative-caret-position="30">
+          <caret line="29" column="64" selection-start-line="29" selection-start-column="46" selection-end-line="29" selection-end-column="80" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml">
+    <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="325" column="31" selection-start-line="325" selection-start-column="31" selection-end-line="325" selection-end-column="31" />
+        <state relative-caret-position="457">
+          <caret line="160" column="38" selection-start-line="160" selection-start-column="38" selection-end-line="160" selection-end-column="38" />
         </state>
       </provider>
     </entry>

test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java

@@ -137,6 +137,32 @@ public class Guiji_Housingconstruction extends BaseApi {
     }
 
 
+    //住建热力-------------------------------2个接口
+    @POST
+    @Path("/guiji_housingconstruction_hqhrzzxsjjk")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_housingconstruction_hqhrzzxsjjk(String str) {
+        System.out.println("hqhrzzxsjjk获取换热站最新数据接口:" + str);
+        ResultModel r = new ResultModel();
+        r.setCode(00000);
+        r.setMessage("成功");
+        return r;
+    }
+
 
+    @POST
+    @Path("/guiji_housingconstruction_hqryzxsjjk")
+    // 指定请求与返回的相应体为JSON
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public ResultModel guiji_housingconstruction_hqryzxsjjk(String str) {
+        System.out.println("hqryzxsjjk获取热源最新数据接口:" + str);
+        ResultModel r = new ResultModel();
+        r.setCode(00000);
+        r.setMessage("成功");
+        return r;
+    }
 
 }

test-api/src/main/java/com/sooka/base/util/DateUtils.java

@@ -0,0 +1,155 @@
+package com.sooka.base.util;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+/**
+ * 时间工具类
+ *
+ * @author lei_wang
+ */
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils
+{
+    public static String YYYY = "yyyy";
+
+    public static String YYYY_MM = "yyyy-MM";
+
+    public static String YYYY_MM_DD = "yyyy-MM-dd";
+
+    public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+
+    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+    private static String[] parsePatterns = {
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
+    /**
+     * 获取当前Date型日期
+     *
+     * @return Date() 当前日期
+     */
+    public static Date getNowDate()
+    {
+        return new Date();
+    }
+
+    /**
+     * 获取当前日期, 默认格式为yyyy-MM-dd
+     *
+     * @return String
+     */
+    public static String getDate()
+    {
+        return dateTimeNow(YYYY_MM_DD);
+    }
+
+    public static final String getTime()
+    {
+        return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
+    }
+
+    public static final String dateTimeNow()
+    {
+        return dateTimeNow(YYYYMMDDHHMMSS);
+    }
+
+    public static final String dateTimeNow(final String format)
+    {
+        return parseDateToStr(format, new Date());
+    }
+
+    public static final String dateTime(final Date date)
+    {
+        return parseDateToStr(YYYY_MM_DD, date);
+    }
+
+    public static final String parseDateToStr(final String format, final Date date)
+    {
+        return new SimpleDateFormat(format).format(date);
+    }
+
+    public static final Date dateTime(final String format, final String ts)
+    {
+        try
+        {
+            return new SimpleDateFormat(format).parse(ts);
+        }
+        catch (ParseException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 日期路径 即年/月/日 如2018/08/08
+     */
+    public static final String datePath()
+    {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyy/MM/dd");
+    }
+
+    /**
+     * 日期路径 即年/月/日 如20180808
+     */
+    public static final String dateTime()
+    {
+        Date now = new Date();
+        return DateFormatUtils.format(now, "yyyyMMdd");
+    }
+
+    /**
+     * 日期型字符串转化为日期 格式
+     */
+    public static Date parseDate(Object str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        try
+        {
+            return parseDate(str.toString(), parsePatterns);
+        }
+        catch (ParseException e)
+        {
+            return null;
+        }
+    }
+
+    /**
+     * 获取服务器启动时间
+     */
+    public static Date getServerStartDate()
+    {
+        long time = ManagementFactory.getRuntimeMXBean().getStartTime();
+        return new Date(time);
+    }
+
+    /**
+     * 计算两个时间差
+     */
+    public static String getDatePoor(Date endDate, Date nowDate)
+    {
+        long nd = 1000 * 24 * 60 * 60;
+        long nh = 1000 * 60 * 60;
+        long nm = 1000 * 60;
+        // long ns = 1000;
+        // 获得两个时间的毫秒时间差异
+        long diff = endDate.getTime() - nowDate.getTime();
+        // 计算差多少天
+        long day = diff / nd;
+        // 计算差多少小时
+        long hour = diff % nd / nh;
+        // 计算差多少分钟
+        long min = diff % nd % nh / nm;
+        // 计算差多少秒//输出结果
+        // long sec = diff % nd % nh % nm / ns;
+        return day + "天" + hour + "小时" + min + "分钟";
+    }
+}