app排序

.idea/workspace.xml

@@ -2,11 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/task/ContractTask.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -27,11 +29,11 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="ContractController.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="ContractController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="230">
-              <caret line="137" column="128" lean-forward="false" selection-start-line="137" selection-start-column="128" selection-end-line="137" selection-end-column="128" />
+            <state relative-caret-position="228">
+              <caret line="177" column="40" lean-forward="false" selection-start-line="177" selection-start-column="40" selection-end-line="177" selection-end-column="40" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -39,35 +41,65 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="ContractSendEmailThread.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-184">
+              <caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+              <folding>
+                <element signature="e#1123#1124#0" expanded="true" />
+                <element signature="e#1163#1164#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ContractTask.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractTask.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="298">
+              <caret line="45" column="41" lean-forward="true" selection-start-line="45" selection-start-column="41" selection-end-line="45" selection-end-column="41" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="324">
+              <caret line="29" column="67" lean-forward="false" selection-start-line="29" selection-start-column="67" selection-end-line="29" selection-end-column="67" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="183">
-              <caret line="13" column="66" lean-forward="false" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="66" />
+              <caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TrackAccountController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
+      <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-46">
-              <caret line="73" column="197" lean-forward="false" selection-start-line="73" selection-start-column="197" selection-end-line="73" selection-end-column="197" />
+            <state relative-caret-position="367">
+              <caret line="101" column="41" lean-forward="false" selection-start-line="101" selection-start-column="32" selection-end-line="101" selection-end-column="41" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
+      <file leaf-file-name="TrackAccountController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
-              <caret line="50" column="84" lean-forward="true" selection-start-line="50" selection-start-column="84" selection-end-line="50" selection-end-column="84" />
-              <folding>
-                <element signature="e#1831#1832#0" expanded="true" />
-                <element signature="e#1886#1887#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="-46">
+              <caret line="73" column="197" lean-forward="false" selection-start-line="73" selection-start-column="197" selection-end-line="73" selection-end-column="197" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -75,8 +107,8 @@
       <file leaf-file-name="ContractRepository.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="183">
-              <caret line="18" column="22" lean-forward="false" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
+            <state relative-caret-position="391">
+              <caret line="33" column="34" lean-forward="false" selection-start-line="33" selection-start-column="19" selection-end-line="33" selection-end-column="34" />
               <folding />
             </state>
           </provider>
@@ -138,8 +170,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractBodyRepository.java" />
-        <option value="$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/model/PriceLevelMoney.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/repository/PriceLevelMoneyRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" />
@@ -172,7 +202,6 @@
         <option value="$PROJECT_DIR$/src/main/java/track/service/TrackAccountFlowRestrictService.java" />
         <option value="$PROJECT_DIR$/src/main/java/track/repository/MeasureRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/track/service/impl/TrackAccountFlowRestrictServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
         <option value="$PROJECT_DIR$/src/main/java/tkio/repository/AccountRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/task/ReportCallable.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractMoneyRepository.java" />
@@ -185,10 +214,13 @@
         <option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/controller/UserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
+        <option value="$PROJECT_DIR$/src/main/java/common/task/ContractTask.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
       </list>
     </option>
   </component>
@@ -667,6 +699,10 @@
               <option name="myItemId" value="tkio" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="task" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -693,10 +729,6 @@
               <option name="myItemId" value="tkio" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="controller" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -745,34 +777,8 @@
               <option name="myItemId" value="common" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-          </PATH>
-          <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="manager" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="manager" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="common" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="service" />
+              <option name="myItemId" value="task" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -801,14 +807,6 @@
               <option name="myItemId" value="common" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="service" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="impl" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -861,18 +859,18 @@
     <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/src/main/resources/spring" />
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\newgit\manager\src\main\resources" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="common.task" />
       <recent name="util" />
       <recent name="track.repository" />
       <recent name="track.service.impl" />
       <recent name="track.service" />
-      <recent name="common.repository" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\newgit\manager\src\main\resources" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/main/resources/spring" />
     </key>
   </component>
   <component name="RunManager" selected="Maven.manager">
@@ -1338,14 +1336,7 @@
       <workItem from="1517189406074" duration="8333000" />
       <workItem from="1517275427548" duration="11524000" />
       <workItem from="1517361892578" duration="19237000" />
-      <workItem from="1517447750893" duration="5665000" />
-    </task>
-    <task id="LOCAL-00028" summary="sendemail">
-      <created>1515114797659</created>
-      <option name="number" value="00028" />
-      <option name="presentableId" value="LOCAL-00028" />
-      <option name="project" value="LOCAL" />
-      <updated>1515114797659</updated>
+      <workItem from="1517447750893" duration="8505000" />
     </task>
     <task id="LOCAL-00029" summary="sendemail">
       <created>1515133725442</created>
@@ -1683,15 +1674,22 @@
       <option name="project" value="LOCAL" />
       <updated>1517455132087</updated>
     </task>
-    <option name="localTasksCounter" value="77" />
+    <task id="LOCAL-00077" summary="app排序">
+      <created>1517473084319</created>
+      <option name="number" value="00077" />
+      <option name="presentableId" value="LOCAL-00077" />
+      <option name="project" value="LOCAL" />
+      <updated>1517473084319</updated>
+    </task>
+    <option name="localTasksCounter" value="78" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="322712000" />
+    <option name="totallyTimeSpent" value="325552000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1714,7 +1712,7 @@
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42553192" sideWeight="0.49016643" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3289689" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5581015" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30711043" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30711043" sideWeight="0.5" order="8" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1827,20 +1825,8 @@
           <properties />
           <option name="timeStamp" value="1" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java</url>
-          <line>102</line>
-          <properties />
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java</url>
-          <line>75</line>
-          <properties />
-          <option name="timeStamp" value="5" />
-        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="26" />
+      <option name="time" value="27" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -1849,48 +1835,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/exception/GlobalExceptionAdvice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-301">
-          <caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/exception/NotFoundException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/security/cors/CorsFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/security/RedisTokenManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/security/RedisLoginStatusManagerImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/security/RedisLoginStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="5" column="17" lean-forward="false" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/exception/TransferCurrentAccountException.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="138">
@@ -1905,13 +1849,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="805">
-          <caret line="55" column="88" lean-forward="false" selection-start-line="55" selection-start-column="88" selection-end-line="55" selection-end-column="88" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="528">
@@ -1993,6 +1930,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="366">
           <caret line="44" column="53" lean-forward="true" selection-start-line="44" selection-start-column="53" selection-end-line="44" selection-end-column="53" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -2010,14 +1948,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="32" column="72" lean-forward="false" selection-start-line="32" selection-start-column="72" selection-end-line="32" selection-end-column="73" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/AppController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="309">
@@ -2181,6 +2111,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="122">
           <caret line="140" column="47" lean-forward="true" selection-start-line="140" selection-start-column="47" selection-end-line="140" selection-end-column="47" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -2311,6 +2242,22 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="37" column="13" lean-forward="false" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/SendEmailServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="148">
+          <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="35" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-46">
@@ -2319,10 +2266,44 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SendEmailTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="46">
+          <caret line="116" column="39" lean-forward="false" selection-start-line="116" selection-start-column="39" selection-end-line="116" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/SendEmailService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="184">
+          <caret line="8" column="9" lean-forward="false" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="228">
+          <caret line="177" column="40" lean-forward="false" selection-start-line="177" selection-start-column="40" selection-end-line="177" selection-end-column="40" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="237">
+          <caret line="45" column="3" lean-forward="true" selection-start-line="45" selection-start-column="3" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="18" column="22" lean-forward="false" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
+        <state relative-caret-position="391">
+          <caret line="33" column="34" lean-forward="false" selection-start-line="33" selection-start-column="19" selection-end-line="33" selection-end-column="34" />
           <folding />
         </state>
       </provider>
@@ -2330,32 +2311,46 @@
     <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="183">
-          <caret line="13" column="66" lean-forward="false" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="66" />
+          <caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="50" column="84" lean-forward="true" selection-start-line="50" selection-start-column="84" selection-end-line="50" selection-end-column="84" />
-          <folding>
-            <element signature="e#1831#1832#0" expanded="true" />
-            <element signature="e#1886#1887#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="367">
+          <caret line="101" column="41" lean-forward="false" selection-start-line="101" selection-start-column="32" selection-end-line="101" selection-end-column="41" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="137" column="128" lean-forward="false" selection-start-line="137" selection-start-column="128" selection-end-line="137" selection-end-column="128" />
+        <state relative-caret-position="-184">
+          <caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#1123#1124#0" expanded="true" />
+            <element signature="e#1163#1164#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/common/task/ContractTask.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="298">
+          <caret line="45" column="41" lean-forward="true" selection-start-line="45" selection-start-column="41" selection-end-line="45" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="324">
+          <caret line="29" column="67" lean-forward="false" selection-start-line="29" selection-start-column="67" selection-end-line="29" selection-end-column="67" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

src/main/java/common/controller/ContractController.java

@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableList;
 import common.model.*;
 import common.service.ContractService;
 import common.service.MenuService;
+import common.task.ContractSendEmailThread;
 import dic.OperateObjectTypeEnum;
 import exception.TipException;
 import org.apache.commons.io.IOUtils;
@@ -177,6 +178,9 @@ public class ContractController {
         Contract contract1 = service.create(loginAccount, contract);
         NewUserLogThread userlog = new NewUserLogThread(loginAccount.getEmail(), loginAccount.getName(), OperateObjectTypeEnum.CUSTOMER.getKey(), contract.getContractCode(), "新建合同","",contract1.toString(), request);
         userlog.start();
+
+        ContractSendEmailThread email = new ContractSendEmailThread(contract);
+        email.start();
         return ResultModel.OK(contract1);
     }
 

src/main/java/common/repository/ContractRepository.java

@@ -29,4 +29,10 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
 
     @Query(value="SELECT * from contract where platform = ?1 and email = ?2",nativeQuery=true)
     List<Contract> findByPlatformAndEmail(String platform, String email);
+
+    @Query(value="SELECT * from contract where start_date = ?1",nativeQuery=true)
+    List<Contract> findByStartDate(String startDate);
+
+    @Query(value="SELECT * from contract where end_date = ?1",nativeQuery=true)
+    List<Contract> findByEndDate(String endDate);
 }

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -94,7 +94,7 @@ public class ContractServiceImpl implements ContractService{
     public Contract create(User loginUser, Contract resource) {
         resource.setPayMoney(0L);
         resource.setInvoice(0L);
-        if(DateUtil.getBeforeDays(0).compareTo(resource.getStartDate()) > 0){
+        if(DateUtil.getBeforeDays(0).compareTo(resource.getStartDate()) < 0){
             resource.setDs(DateUtil.getBeforeDays(0));
             resource.setStatus("wait");
         }else{
@@ -135,7 +135,7 @@ public class ContractServiceImpl implements ContractService{
         if(!resource.getStartDate().equals(contract.getStartDate())){
             cc.setContent(cc.getContent() + "开始时间变更 : " + contract.getStartDate() + "-->" + resource.getStartDate());
             contract.setStartDate(resource.getStartDate());
-            if(DateUtil.getBeforeDays(0).compareTo(resource.getStartDate()) > 0){
+            if(DateUtil.getBeforeDays(0).compareTo(resource.getStartDate()) < 0){
                 contract.setStatus("wait");
             }else{
                 contract.setStatus("executing");

src/main/java/common/task/ContractSendEmailThread.java

+package common.task;
+
+import common.context.AppUtils;
+import common.model.Contract;
+import common.model.User;
+import common.model.UserLog;
+import common.repository.UserLogRepository;
+import common.repository.UserRepository;
+import dic.RoleTypeEnum;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import tkio.model.PackageType;
+import tkio.repository.PackageTypeRepository;
+import util.DateUtil;
+import util.IPAddrUtil;
+import util.MailUtils;
+import util.ValidateUtil;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+/**
+ * Created by zxy on 2017/12/15.
+ */
+public class ContractSendEmailThread
+        extends Thread
+{
+    protected Logger logger = LoggerFactory.getLogger(ContractSendEmailThread.class);
+
+    private PackageTypeRepository packageTypeRepository = AppUtils.getApplicationContext().getBean(PackageTypeRepository.class);
+    private UserRepository userRepository = AppUtils.getApplicationContext().getBean(UserRepository.class);
+
+    private Contract contract;
+
+    public ContractSendEmailThread(Contract contract) {
+        this.contract = contract;
+    }
+
+    @Override
+    public void run()
+    {
+        Map<Long, String> packageMap = getPackageMap();
+        StringBuffer sb = new StringBuffer();
+        sb.append("账号 :" + this.contract.getEmail() + " 签约了," + " 套餐 ：" +
+                packageMap.get(this.contract.getPriceLevel()) + ",开始时间 " + this.contract.getStartDate()
+                + ",结束时间 " +  this.contract.getEndDate());
+        User user = userRepository.findOne(this.contract.getSale());
+        List<String> list = new ArrayList<>();
+        list.add(user.getEmail());
+        if(!user.getRoleType().equals(RoleTypeEnum.MANAGER)){
+            List<User> userList = userRepository.findOneDepartment(user.getRole());
+            for(User u : userList){
+                if (u.getRoleType().equals(RoleTypeEnum.MANAGER)){
+                    list.add(u.getEmail());
+                }
+            }
+        }
+
+
+        try {
+            MailUtils.sendSimpleEmail("新建合同",  sb.toString(),list);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+    public Map<Long, String> getPackageMap(){
+        List<PackageType> typeList = packageTypeRepository.findAll();
+        Map<Long, String> typeMap = new HashMap<>();
+        if(ValidateUtil.isValid(typeList)){
+            for(PackageType s: typeList){
+                typeMap.put(s.getId(), s.getPackageName());
+            }
+        }
+        return typeMap;
+    }
+}

src/main/java/common/task/ContractTask.java

+package common.task;
+
+import com.google.common.base.Splitter;
+import common.model.AppCategory;
+import common.model.AppInfo;
+import common.model.Contract;
+import common.repository.AppCategoryRepository;
+import common.repository.AppInfoRepository;
+import common.repository.CityRepository;
+import common.repository.ContractRepository;
+import dmp.model.OtPkgDevStats;
+import dmp.repository.OtPkgDevStatsRepository;
+import dmp.repository.TagCrawlerAppsWandoujiaRepository;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.anarres.lzo.LzoAlgorithm;
+import org.anarres.lzo.LzoDecompressor;
+import org.anarres.lzo.LzoInputStream;
+import org.anarres.lzo.LzoLibrary;
+import org.apache.commons.collections.map.HashedMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import util.*;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by zxy on 2017/12/26.
+ */
+public class ContractTask
+{
+    private static Logger logger = LoggerFactory.getLogger(ContractTask.class);
+    @Autowired
+    ContractRepository contractRepository;
+
+    public void task(){
+        List<Contract> contractList = contractRepository.findByStartDate(DateUtil.getBeforeDays(0));
+        if(ValidateUtil.isValid(contractList)){
+            List<Contract> list = new ArrayList<>();
+            for(Contract c : contractList){
+                c.setStatus("executing");
+                list.add(c);
+            }
+            contractRepository.save(list);
+        }
+
+        List<Contract> contractList2 = contractRepository.findByEndDate(DateUtil.getBeforeDays(0));
+        if(ValidateUtil.isValid(contractList2)){
+            List<Contract> list = new ArrayList<>();
+            for(Contract c : contractList2){
+                c.setStatus("end");
+                list.add(c);
+            }
+            contractRepository.save(list);
+        }
+    }
+
+
+}

src/main/resources/spring/applicationContext-schedule.xml

@@ -25,9 +25,12 @@
         <task:scheduled ref="emailTask" method="task" cron="0 20 0 * * ?"/>
     </task:scheduled-tasks>
 
-    <bean id="trackAccountTask" class="track.task.AccountTask"></bean>
-
+    <bean id="contractTask" class="common.task.ContractTask"></bean>
+    <task:scheduled-tasks>
+        <task:scheduled ref="contractTask" method="task" cron="0 20 17 * * ?"/>
+    </task:scheduled-tasks>
 
+    <bean id="trackAccountTask" class="track.task.AccountTask"></bean>
     <task:scheduled-tasks>
         <!--//定时同步短链数据(每5分钟执行一次)-->
         <task:scheduled ref="trackAccountTask" method="task" cron="0 32 0 * * ?"/>