Skip to content

M
manager
Commit 3119ff4e by manxiaoqiang
Options

定时任务

parent 1695457b
Showing with 156 additions and 317 deletions
.idea/workspace.xml
......@@ -3,6 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.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/" />
......@@ -27,8 +28,8 @@
<file leaf-file-name="AccountTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/AccountTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-23">
<caret line="84" column="51" lean-forward="true" selection-start-line="84" selection-start-column="51" selection-end-line="84" selection-end-column="51" />
<state relative-caret-position="1079">
<caret line="124" column="41" lean-forward="true" selection-start-line="124" selection-start-column="41" selection-end-line="124" selection-end-column="41" />
<folding />
</state>
</provider>
......@@ -37,95 +38,9 @@
<file leaf-file-name="Account4Web.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<state relative-caret-position="-2233">
<caret line="18" column="22" lean-forward="false" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="22" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#867#868#0" expanded="false" />
<element signature="e#892#893#0" expanded="false" />
<element signature="e#926#927#0" expanded="false" />
<element signature="e#954#955#0" expanded="false" />
<element signature="e#988#989#0" expanded="false" />
<element signature="e#1020#1021#0" expanded="false" />
<element signature="e#1068#1069#0" expanded="false" />
<element signature="e#1110#1111#0" expanded="false" />
<element signature="e#1142#1143#0" expanded="false" />
<element signature="e#1170#1171#0" expanded="false" />
<element signature="e#1212#1213#0" expanded="false" />
<element signature="e#1246#1247#0" expanded="false" />
<element signature="e#1280#1281#0" expanded="false" />
<element signature="e#1310#1311#0" expanded="false" />
<element signature="e#1356#1357#0" expanded="false" />
<element signature="e#1394#1395#0" expanded="false" />
<element signature="e#1429#1430#0" expanded="false" />
<element signature="e#1462#1463#0" expanded="false" />
<element signature="e#1512#1513#0" expanded="false" />
<element signature="e#1556#1557#0" expanded="false" />
<element signature="e#1589#1590#0" expanded="false" />
<element signature="e#1618#1619#0" expanded="false" />
<element signature="e#1662#1663#0" expanded="false" />
<element signature="e#1698#1699#0" expanded="false" />
<element signature="e#1736#1737#0" expanded="false" />
<element signature="e#1770#1771#0" expanded="false" />
<element signature="e#1824#1825#0" expanded="false" />
<element signature="e#1870#1871#0" expanded="false" />
<element signature="e#1905#1906#0" expanded="false" />
<element signature="e#1936#1937#0" expanded="false" />
<element signature="e#1984#1985#0" expanded="false" />
<element signature="e#2024#2025#0" expanded="false" />
<element signature="e#2060#2061#0" expanded="false" />
<element signature="e#2088#2089#0" expanded="false" />
<element signature="e#2134#2135#0" expanded="false" />
<element signature="e#2168#2169#0" expanded="false" />
<element signature="e#2201#2202#0" expanded="false" />
<element signature="e#2226#2227#0" expanded="false" />
<element signature="e#2266#2267#0" expanded="false" />
<element signature="e#2294#2295#0" expanded="false" />
<element signature="e#2335#2336#0" expanded="false" />
<element signature="e#2368#2369#0" expanded="false" />
<element signature="e#2424#2425#0" expanded="false" />
<element signature="e#2468#2469#0" expanded="false" />
<element signature="e#2506#2507#0" expanded="false" />
<element signature="e#2536#2537#0" expanded="false" />
<element signature="e#2586#2587#0" expanded="false" />
<element signature="e#2624#2625#0" expanded="false" />
<element signature="e#2660#2661#0" expanded="false" />
<element signature="e#2691#2692#0" expanded="false" />
<element signature="e#2740#2741#0" expanded="false" />
<element signature="e#2780#2781#0" expanded="false" />
<element signature="e#2811#2812#0" expanded="false" />
<element signature="e#2838#2839#0" expanded="false" />
<element signature="e#2878#2879#0" expanded="false" />
<element signature="e#2910#2911#0" expanded="false" />
<element signature="e#2941#2942#0" expanded="false" />
<element signature="e#2968#2969#0" expanded="false" />
<element signature="e#3008#3009#0" expanded="false" />
<element signature="e#3040#3041#0" expanded="false" />
<element signature="e#3070#3071#0" expanded="false" />
<element signature="e#3098#3099#0" expanded="false" />
<element signature="e#3138#3139#0" expanded="false" />
<element signature="e#3172#3173#0" expanded="false" />
<element signature="e#3208#3209#0" expanded="false" />
<element signature="e#3239#3240#0" expanded="false" />
<element signature="e#3288#3289#0" expanded="false" />
<element signature="e#3328#3329#0" expanded="false" />
<element signature="e#3367#3368#0" expanded="false" />
<element signature="e#3401#3402#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3502#3503#0" expanded="false" />
<element signature="e#3539#3540#0" expanded="false" />
<element signature="e#3571#3572#0" expanded="false" />
<element signature="e#3622#3623#0" expanded="false" />
<element signature="e#3664#3665#0" expanded="false" />
<element signature="e#3701#3702#0" expanded="false" />
<element signature="e#3736#3737#0" expanded="false" />
<element signature="e#3790#3791#0" expanded="false" />
<element signature="e#3838#3839#0" expanded="false" />
<element signature="e#3873#3874#0" expanded="false" />
<element signature="e#3904#3905#0" expanded="false" />
<element signature="e#3952#3953#0" expanded="false" />
<element signature="e#3992#3993#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -133,8 +48,18 @@
<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="207">
<caret line="15" column="27" lean-forward="true" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
<state relative-caret-position="184">
<caret line="14" column="70" lean-forward="false" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountFlowRestrictServiceImpl.java" pinned="false" current-in-tab="false">
<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="1574">
<caret line="114" column="49" lean-forward="true" selection-start-line="114" selection-start-column="49" selection-end-line="114" selection-end-column="49" />
<folding />
</state>
</provider>
......@@ -295,80 +220,6 @@
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="myweb Maven Webapp" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="myweb Maven Webapp" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$PluginsNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="war" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$PluginNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="myweb Maven Webapp" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$PluginsNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="myweb Maven Webapp" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Plugins" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$PluginsNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="clean" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$PluginNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="myweb Maven Webapp" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Lifecycle" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$LifecycleNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Profiles" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProfilesNode" />
</PATH_ELEMENT>
......@@ -399,7 +250,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
......@@ -547,6 +400,58 @@
<option name="myItemId" value="tkio" />
<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="dmp" />
<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="task" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
......@@ -574,14 +479,12 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="tkio" />
<option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -1062,7 +965,7 @@
<workItem from="1515374350608" duration="8773000" />
<workItem from="1515460815079" duration="9913000" />
<workItem from="1515547535839" duration="19579000" />
<workItem from="1515633296422" duration="1243000" />
<workItem from="1515633296422" duration="2213000" />
</task>
<task id="LOCAL-00003" summary="Merge branch 'master' of git.minrow.com:reyun/manager&#10;&#10;# Conflicts:&#10;#&#9;pom.xml&#10;#&#9;target/classes/common.properties&#10;#&#9;target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst&#10;">
<created>1514871143365</created>
......@@ -1323,11 +1226,18 @@
<option name="project" value="LOCAL" />
<updated>1515585230893</updated>
</task>
<option name="localTasksCounter" value="40" />
<task id="LOCAL-00040" summary="定时任务">
<created>1515637113162</created>
<option name="number" value="00040" />
<option name="presentableId" value="LOCAL-00040" />
<option name="project" value="LOCAL" />
<updated>1515637113162</updated>
</task>
<option name="localTasksCounter" value="41" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="150657000" />
<option name="totallyTimeSpent" value="151627000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="0" />
......@@ -1351,7 +1261,7 @@
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45008183" sideWeight="0.49319214" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="1.0" sideWeight="0.49319214" 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.33" 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.27987897" sideWeight="0.5" order="7" side_tool="false" content_ui="combo" />
......@@ -1405,11 +1315,11 @@
<window_info id="Capture Analysis" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5155483" sideWeight="0.49546143" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45008183" sideWeight="0.49319214" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.45008183" sideWeight="0.49319214" 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.33" 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="CheckStyle" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27987897" 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="false" show_stripe_button="true" weight="0.27987897" 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="Gradle View" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" />
......@@ -1452,7 +1362,8 @@
<MESSAGE value="pom" />
<MESSAGE value="sendemail" />
<MESSAGE value="location" />
<option name="LAST_COMMIT_MESSAGE" value="location" />
<MESSAGE value="定时任务" />
<option name="LAST_COMMIT_MESSAGE" value="定时任务" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1547,13 +1458,6 @@
</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="84">
<caret line="114" column="0" lean-forward="false" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dic/RoleEnum.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
......@@ -1600,6 +1504,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="214">
<caret line="30" column="63" lean-forward="true" selection-start-line="30" selection-start-column="63" selection-end-line="30" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
......@@ -1767,13 +1672,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml" />
<entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="159" column="55" lean-forward="false" selection-start-line="159" selection-start-column="55" selection-end-line="159" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/AwsS3Util.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
......@@ -1811,112 +1709,42 @@
</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="207">
<caret line="43" column="4" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="82" />
<folding />
</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="1574">
<caret line="114" column="49" lean-forward="true" selection-start-line="114" selection-start-column="49" selection-end-line="114" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Account4Web.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<state relative-caret-position="-2233">
<caret line="18" column="22" lean-forward="false" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="22" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#867#868#0" expanded="false" />
<element signature="e#892#893#0" expanded="false" />
<element signature="e#926#927#0" expanded="false" />
<element signature="e#954#955#0" expanded="false" />
<element signature="e#988#989#0" expanded="false" />
<element signature="e#1020#1021#0" expanded="false" />
<element signature="e#1068#1069#0" expanded="false" />
<element signature="e#1110#1111#0" expanded="false" />
<element signature="e#1142#1143#0" expanded="false" />
<element signature="e#1170#1171#0" expanded="false" />
<element signature="e#1212#1213#0" expanded="false" />
<element signature="e#1246#1247#0" expanded="false" />
<element signature="e#1280#1281#0" expanded="false" />
<element signature="e#1310#1311#0" expanded="false" />
<element signature="e#1356#1357#0" expanded="false" />
<element signature="e#1394#1395#0" expanded="false" />
<element signature="e#1429#1430#0" expanded="false" />
<element signature="e#1462#1463#0" expanded="false" />
<element signature="e#1512#1513#0" expanded="false" />
<element signature="e#1556#1557#0" expanded="false" />
<element signature="e#1589#1590#0" expanded="false" />
<element signature="e#1618#1619#0" expanded="false" />
<element signature="e#1662#1663#0" expanded="false" />
<element signature="e#1698#1699#0" expanded="false" />
<element signature="e#1736#1737#0" expanded="false" />
<element signature="e#1770#1771#0" expanded="false" />
<element signature="e#1824#1825#0" expanded="false" />
<element signature="e#1870#1871#0" expanded="false" />
<element signature="e#1905#1906#0" expanded="false" />
<element signature="e#1936#1937#0" expanded="false" />
<element signature="e#1984#1985#0" expanded="false" />
<element signature="e#2024#2025#0" expanded="false" />
<element signature="e#2060#2061#0" expanded="false" />
<element signature="e#2088#2089#0" expanded="false" />
<element signature="e#2134#2135#0" expanded="false" />
<element signature="e#2168#2169#0" expanded="false" />
<element signature="e#2201#2202#0" expanded="false" />
<element signature="e#2226#2227#0" expanded="false" />
<element signature="e#2266#2267#0" expanded="false" />
<element signature="e#2294#2295#0" expanded="false" />
<element signature="e#2335#2336#0" expanded="false" />
<element signature="e#2368#2369#0" expanded="false" />
<element signature="e#2424#2425#0" expanded="false" />
<element signature="e#2468#2469#0" expanded="false" />
<element signature="e#2506#2507#0" expanded="false" />
<element signature="e#2536#2537#0" expanded="false" />
<element signature="e#2586#2587#0" expanded="false" />
<element signature="e#2624#2625#0" expanded="false" />
<element signature="e#2660#2661#0" expanded="false" />
<element signature="e#2691#2692#0" expanded="false" />
<element signature="e#2740#2741#0" expanded="false" />
<element signature="e#2780#2781#0" expanded="false" />
<element signature="e#2811#2812#0" expanded="false" />
<element signature="e#2838#2839#0" expanded="false" />
<element signature="e#2878#2879#0" expanded="false" />
<element signature="e#2910#2911#0" expanded="false" />
<element signature="e#2941#2942#0" expanded="false" />
<element signature="e#2968#2969#0" expanded="false" />
<element signature="e#3008#3009#0" expanded="false" />
<element signature="e#3040#3041#0" expanded="false" />
<element signature="e#3070#3071#0" expanded="false" />
<element signature="e#3098#3099#0" expanded="false" />
<element signature="e#3138#3139#0" expanded="false" />
<element signature="e#3172#3173#0" expanded="false" />
<element signature="e#3208#3209#0" expanded="false" />
<element signature="e#3239#3240#0" expanded="false" />
<element signature="e#3288#3289#0" expanded="false" />
<element signature="e#3328#3329#0" expanded="false" />
<element signature="e#3367#3368#0" expanded="false" />
<element signature="e#3401#3402#0" expanded="false" />
<element signature="e#3456#3457#0" expanded="false" />
<element signature="e#3502#3503#0" expanded="false" />
<element signature="e#3539#3540#0" expanded="false" />
<element signature="e#3571#3572#0" expanded="false" />
<element signature="e#3622#3623#0" expanded="false" />
<element signature="e#3664#3665#0" expanded="false" />
<element signature="e#3701#3702#0" expanded="false" />
<element signature="e#3736#3737#0" expanded="false" />
<element signature="e#3790#3791#0" expanded="false" />
<element signature="e#3838#3839#0" expanded="false" />
<element signature="e#3873#3874#0" expanded="false" />
<element signature="e#3904#3905#0" expanded="false" />
<element signature="e#3952#3953#0" expanded="false" />
<element signature="e#3992#3993#0" expanded="false" />
</folding>
<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="-23">
<caret line="84" column="51" lean-forward="true" selection-start-line="84" selection-start-column="51" selection-end-line="84" selection-end-column="51" />
<state relative-caret-position="1079">
<caret line="124" column="41" lean-forward="true" selection-start-line="124" selection-start-column="41" selection-end-line="124" 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="207">
<caret line="15" column="27" lean-forward="true" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
<state relative-caret-position="184">
<caret line="14" column="70" lean-forward="false" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" />
<folding />
</state>
</provider>
......
src/main/java/tkio/task/AccountTask.java
......@@ -2,6 +2,9 @@ package tkio.task;
import common.model.Account4Web;
import common.repository.Account4WebRepository;
import common.task.SyncAppDataTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import tkio.model.Account;
import tkio.model.AccountRestrict4Web;
......@@ -23,6 +26,7 @@ import java.util.Map;
* Created by mxq on 2017/12/25.
*/
public class AccountTask {
private static Logger logger = LoggerFactory.getLogger(AccountTask.class);
@Autowired
AccountRepository accountRepository;
......@@ -40,6 +44,7 @@ public class AccountTask {
SalesManLeaderRepository salesManLeaderRepository;
public void task(){
logger.info("tkio task start :" + System.currentTimeMillis());
//清空前一天数据
account4WebRepository.deleteAll();
List<Account4Web> list = new ArrayList<>();
......@@ -47,44 +52,49 @@ public class AccountTask {
List<Account> accountValidList = accountRepository.findRootParentsUnPast(DateUtil.getBeforeDays(1));
if(ValidateUtil.isValid(accountValidList)){
for(Account ac : accountValidList){
AccountRestrict4Web restrict4Web = accountFlowRestrictService.findRestrictByAccount(ac.getId());
Account4Web account4Web = new Account4Web();
account4Web.setAccountId(ac.getId());
account4Web.setEmail(ac.getEmail());
account4Web.setCompany(ac.getCompany());
account4Web.setCreateDate(ac.getPubDate());
account4Web.setCreateDs(DateUtil.getFormatDate(ac.getPubDate()));
account4Web.setStatus(null == restrict4Web.getIOFlowNotified() ? "已激活" : (restrict4Web.getIOFlowNotified() ? "已激活" : "流量用尽"));
account4Web.setPackageType(restrict4Web.getPackageName());
account4Web.setPastDate(ac.getPastDate());
if (ac.getPricelevel().equals(7L) || ac.getPricelevel().equals(8L) || ac.getPricelevel().equals(5L) || ac.getPricelevel().equals(6L)){
account4Web.setIo(restrict4Web.getThisMonthIOFlow());
account4Web.setTrack(restrict4Web.getTrackTotalFlow());
}else{
account4Web.setIo(restrict4Web.getThisMonthIOFlow());
account4Web.setTrack(restrict4Web.getTrackTotalFlow());
account4Web.setIoLimit(restrict4Web.getIOLimit());
account4Web.setTrackLimit(restrict4Web.getTrackLimit());
account4Web.setIoStatus(restrict4Web.getAllowBehavior());
account4Web.setTrackStatus(restrict4Web.getTrackFlowNotified());
double f = 1.0;
if((account4Web.getIo().doubleValue() != 0) && (null != account4Web.getIoLimit())){
if((account4Web.getIo().doubleValue() / account4Web.getIoLimit().doubleValue()) > f){
account4Web.setIoStatus(false);
account4Web.setStatus("流量用尽");
try{
AccountRestrict4Web restrict4Web = accountFlowRestrictService.findRestrictByAccount(ac.getId());
Account4Web account4Web = new Account4Web();
account4Web.setAccountId(ac.getId());
account4Web.setEmail(ac.getEmail());
account4Web.setCompany(ac.getCompany());
account4Web.setCreateDate(ac.getPubDate());
account4Web.setCreateDs(DateUtil.getFormatDate(ac.getPubDate()));
account4Web.setStatus(null == restrict4Web.getIOFlowNotified() ? "已激活" : (restrict4Web.getIOFlowNotified() ? "已激活" : "流量用尽"));
account4Web.setPackageType(restrict4Web.getPackageName());
account4Web.setPastDate(ac.getPastDate());
if (ac.getPricelevel().equals(7L) || ac.getPricelevel().equals(8L) || ac.getPricelevel().equals(5L) || ac.getPricelevel().equals(6L)){
account4Web.setIo(restrict4Web.getThisMonthIOFlow());
account4Web.setTrack(restrict4Web.getTrackTotalFlow());
}else{
account4Web.setIo(restrict4Web.getThisMonthIOFlow());
account4Web.setTrack(restrict4Web.getTrackTotalFlow());
account4Web.setIoLimit(restrict4Web.getIOLimit());
account4Web.setTrackLimit(restrict4Web.getTrackLimit());
account4Web.setIoStatus(restrict4Web.getAllowBehavior());
account4Web.setTrackStatus(restrict4Web.getTrackFlowNotified());
double f = 1.0;
if((account4Web.getIo().doubleValue() != 0) && (null != account4Web.getIoLimit())){
if((account4Web.getIo().doubleValue() / account4Web.getIoLimit().doubleValue()) > f){
account4Web.setIoStatus(false);
account4Web.setStatus("流量用尽");
}
}
}
if((account4Web.getTrack().doubleValue() != 0) && (null != account4Web.getTrackLimit())){
if((account4Web.getTrack().doubleValue() / account4Web.getTrackLimit().doubleValue()) > f){
account4Web.setTrackStatus(false);
account4Web.setStatus("流量用尽");
if((account4Web.getTrack().doubleValue() != 0) && (null != account4Web.getTrackLimit())){
if((account4Web.getTrack().doubleValue() / account4Web.getTrackLimit().doubleValue()) > f){
account4Web.setTrackStatus(false);
account4Web.setStatus("流量用尽");
}
}
}
account4Web.setUser(ac.getName());
account4Web.setTell(ac.getPhone());
account4Web.setBussinessMan(ac.getBussinessman());
list.add(account4Web);
} catch (Exception e){
logger.error("tkio task error :" + ac.getEmail());
}
account4Web.setUser(ac.getName());
account4Web.setTell(ac.getPhone());
account4Web.setBussinessMan(ac.getBussinessman());
list.add(account4Web);
}
}
//已过期的直接设置成过期
......@@ -113,5 +123,6 @@ public class AccountTask {
}
}
account4WebRepository.save(list);
logger.info("tkio task end :" + System.currentTimeMillis());
}
}
src/main/resources/spring/applicationContext-schedule.xml
......@@ -12,7 +12,7 @@
<bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
<task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="tkioAccountTask" method="task" cron="0 22 2 * * ?"/>
<task:scheduled ref="tkioAccountTask" method="task" cron="0 38 2 * * ?"/>
</task:scheduled-tasks>
<bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment