Skip to content

M
manager
Commit 914b8387 by manxiaoqiang
Options

app排序

parent af967d85
Showing with 82 additions and 173 deletions
.idea/workspace.xml
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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/java/common/task/SyncAppDataTask.java" afterPath="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.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> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -24,43 +25,31 @@ ...@@ -24,43 +25,31 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserLogController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="applicationContext-schedule.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java"> <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343"> <state relative-caret-position="790">
<caret line="29" column="49" lean-forward="false" selection-start-line="29" selection-start-column="49" selection-end-line="29" selection-end-column="49" /> <caret line="48" column="8" lean-forward="true" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ContractController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <state relative-caret-position="897">
<caret line="180" column="126" lean-forward="true" selection-start-line="180" selection-start-column="126" selection-end-line="180" selection-end-column="126" /> <caret line="39" column="3" lean-forward="false" selection-start-line="39" selection-start-column="3" selection-end-line="39" selection-end-column="3" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ResultStatus.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/util/ResultStatus.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="332">
<caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="30" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="true"> <file leaf-file-name="SyncAppDataTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="3289">
<caret line="67" column="67" lean-forward="false" selection-start-line="67" selection-start-column="67" selection-end-line="67" selection-end-column="67" /> <caret line="173" column="41" lean-forward="false" selection-start-line="173" selection-start-column="41" selection-end-line="173" selection-end-column="41" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -101,6 +90,7 @@ ...@@ -101,6 +90,7 @@
<find>rootParent</find> <find>rootParent</find>
<find>, request</find> <find>, request</find>
<find>reminderlevel</find> <find>reminderlevel</find>
<find>manager</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -134,7 +124,6 @@ ...@@ -134,7 +124,6 @@
<option value="$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java" /> <option value="$PROJECT_DIR$/src/main/java/track/service/TrackAccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/TrackAccount4WebRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/TrackAccount4WebRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/BackVisitRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/java/util/DateUtil.java" /> <option value="$PROJECT_DIR$/src/main/java/util/DateUtil.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/service/AccountService.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/tkio/repository/SalesManLeaderRepository.java" />
...@@ -160,7 +149,6 @@ ...@@ -160,7 +149,6 @@
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserController.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/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ContractTask.java" /> <option value="$PROJECT_DIR$/src/main/java/common/task/ContractTask.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" /> <option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java" /> <option value="$PROJECT_DIR$/src/main/java/common/task/ContractSendEmailThread.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
...@@ -173,6 +161,8 @@ ...@@ -173,6 +161,8 @@
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/util/ResultStatus.java" /> <option value="$PROJECT_DIR$/src/main/java/util/ResultStatus.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" /> <option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/task/SyncAppDataTask.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext-schedule.xml" />
</list> </list>
</option> </option>
</component> </component>
...@@ -223,7 +213,7 @@ ...@@ -223,7 +213,7 @@
<option name="importAutomatically" value="true" /> <option name="importAutomatically" value="true" />
</MavenImportingSettings> </MavenImportingSettings>
</option> </option>
<option name="disabledProfiles"> <option name="enabledProfiles">
<list> <list>
<option value="dev" /> <option value="dev" />
</list> </list>
...@@ -267,7 +257,6 @@ ...@@ -267,7 +257,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -792,6 +781,7 @@ ...@@ -792,6 +781,7 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="Scope" /> <pane id="Scope" />
</panes> </panes>
...@@ -799,7 +789,7 @@ ...@@ -799,7 +789,7 @@
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../trackingio" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../saasio" />
<property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" /> <property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
<property name="js.eslint.eslintPackage" value="" /> <property name="js.eslint.eslintPackage" value="" />
<property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" /> <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
...@@ -808,7 +798,7 @@ ...@@ -808,7 +798,7 @@
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" /> <property name="settings.editor.selected.configurable" value="MavenSettings" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
...@@ -1290,6 +1280,10 @@ ...@@ -1290,6 +1280,10 @@
<workItem from="1517361892578" duration="19237000" /> <workItem from="1517361892578" duration="19237000" />
<workItem from="1517447750893" duration="11115000" /> <workItem from="1517447750893" duration="11115000" />
<workItem from="1517533917524" duration="7763000" /> <workItem from="1517533917524" duration="7763000" />
<workItem from="1519440833182" duration="10260000" />
<workItem from="1519615497701" duration="4282000" />
<workItem from="1519625926139" duration="2253000" />
<workItem from="1519632640546" duration="7000" />
</task> </task>
<task id="LOCAL-00038" summary="location"> <task id="LOCAL-00038" summary="location">
<created>1515585171413</created> <created>1515585171413</created>
...@@ -1638,10 +1632,10 @@ ...@@ -1638,10 +1632,10 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="335925000" /> <option name="totallyTimeSpent" value="352727000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <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="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" />
...@@ -1655,7 +1649,7 @@ ...@@ -1655,7 +1649,7 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" 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="2" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33387887" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.42716858" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="TODO" 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="18" side_tool="false" content_ui="tabs" /> <window_info id="TODO" 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="18" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" 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="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" 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="3" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" 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="3" side_tool="false" content_ui="tabs" />
...@@ -1665,7 +1659,7 @@ ...@@ -1665,7 +1659,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="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="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="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.3207262" 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="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="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" /> <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" />
...@@ -1707,7 +1701,7 @@ ...@@ -1707,7 +1701,7 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" 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="2" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33387887" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.42716858" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="TODO" 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="18" side_tool="false" content_ui="tabs" /> <window_info id="TODO" 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="18" side_tool="false" content_ui="tabs" />
<window_info id="Messages" 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="0" side_tool="false" content_ui="tabs" /> <window_info id="Messages" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" 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="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" 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="3" side_tool="false" content_ui="tabs" />
...@@ -1720,7 +1714,7 @@ ...@@ -1720,7 +1714,7 @@
<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="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="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="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.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="false" 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="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="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="17" side_tool="false" 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="17" side_tool="false" content_ui="tabs" />
...@@ -1779,7 +1773,7 @@ ...@@ -1779,7 +1773,7 @@
<option name="timeStamp" value="1" /> <option name="timeStamp" value="1" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
<option name="time" value="29" /> <option name="time" value="34" />
</breakpoint-manager> </breakpoint-manager>
<watches-manager /> <watches-manager />
</component> </component>
...@@ -1869,7 +1863,6 @@ ...@@ -1869,7 +1863,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="252">
<caret line="173" column="0" lean-forward="false" selection-start-line="173" selection-start-column="0" selection-end-line="175" selection-end-column="9" /> <caret line="173" column="0" lean-forward="false" selection-start-line="173" selection-start-column="0" selection-end-line="175" selection-end-column="9" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1898,10 +1891,6 @@ ...@@ -1898,10 +1891,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="283"> <state relative-caret-position="283">
<caret line="55" column="44" lean-forward="true" selection-start-line="55" selection-start-column="44" selection-end-line="55" selection-end-column="44" /> <caret line="55" column="44" lean-forward="true" selection-start-line="55" selection-start-column="44" selection-end-line="55" selection-end-column="44" />
<folding>
<element signature="e#1195#1196#0" expanded="false" />
<element signature="e#1240#1241#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1912,19 +1901,10 @@ ...@@ -1912,19 +1901,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2277">
<caret line="99" column="8" lean-forward="false" selection-start-line="99" selection-start-column="8" selection-end-line="99" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractChange.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/model/ContractChange.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="46"> <state relative-caret-position="46">
<caret line="33" column="34" lean-forward="false" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" /> <caret line="33" column="34" lean-forward="false" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1946,7 +1926,6 @@ ...@@ -1946,7 +1926,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="122"> <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" /> <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> </state>
</provider> </provider>
</entry> </entry>
...@@ -1961,72 +1940,6 @@ ...@@ -1961,72 +1940,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276"> <state relative-caret-position="276">
<caret line="15" column="27" lean-forward="false" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="27" /> <caret line="15" column="27" lean-forward="false" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="27" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#667#668#0" expanded="false" />
<element signature="e#692#693#0" expanded="false" />
<element signature="e#726#727#0" expanded="false" />
<element signature="e#754#755#0" expanded="false" />
<element signature="e#793#794#0" expanded="false" />
<element signature="e#828#829#0" expanded="false" />
<element signature="e#884#885#0" expanded="false" />
<element signature="e#932#933#0" expanded="false" />
<element signature="e#961#962#0" expanded="false" />
<element signature="e#986#987#0" expanded="false" />
<element signature="e#1022#1023#0" expanded="false" />
<element signature="e#1050#1051#0" expanded="false" />
<element signature="e#1081#1082#0" expanded="false" />
<element signature="e#1108#1109#0" expanded="false" />
<element signature="e#1148#1149#0" expanded="false" />
<element signature="e#1180#1181#0" expanded="false" />
<element signature="e#1210#1211#0" expanded="false" />
<element signature="e#1238#1239#0" expanded="false" />
<element signature="e#1278#1279#0" expanded="false" />
<element signature="e#1312#1313#0" expanded="false" />
<element signature="e#1341#1342#0" expanded="false" />
<element signature="e#1368#1369#0" expanded="false" />
<element signature="e#1406#1407#0" expanded="false" />
<element signature="e#1438#1439#0" expanded="false" />
<element signature="e#1470#1471#0" expanded="false" />
<element signature="e#1498#1499#0" expanded="false" />
<element signature="e#1540#1541#0" expanded="false" />
<element signature="e#1574#1575#0" expanded="false" />
<element signature="e#1608#1609#0" expanded="false" />
<element signature="e#1638#1639#0" expanded="false" />
<element signature="e#1684#1685#0" expanded="false" />
<element signature="e#1722#1723#0" expanded="false" />
<element signature="e#1760#1761#0" expanded="false" />
<element signature="e#1796#1797#0" expanded="false" />
<element signature="e#1852#1853#0" expanded="false" />
<element signature="e#1902#1903#0" expanded="false" />
<element signature="e#1940#1941#0" expanded="false" />
<element signature="e#1976#1977#0" expanded="false" />
<element signature="e#2032#2033#0" expanded="false" />
<element signature="e#2082#2083#0" expanded="false" />
<element signature="e#2117#2118#0" expanded="false" />
<element signature="e#2150#2151#0" expanded="false" />
<element signature="e#2200#2201#0" expanded="false" />
<element signature="e#2244#2245#0" expanded="false" />
<element signature="e#2279#2280#0" expanded="false" />
<element signature="e#2312#2313#0" expanded="false" />
<element signature="e#2362#2363#0" expanded="false" />
<element signature="e#2406#2407#0" expanded="false" />
<element signature="e#2443#2444#0" expanded="false" />
<element signature="e#2476#2477#0" expanded="false" />
<element signature="e#2528#2529#0" expanded="false" />
<element signature="e#2572#2573#0" expanded="false" />
<element signature="e#2607#2608#0" expanded="false" />
<element signature="e#2638#2639#0" expanded="false" />
<element signature="e#2686#2687#0" expanded="false" />
<element signature="e#2726#2727#0" expanded="false" />
</folding>
</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" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2083,7 +1996,6 @@ ...@@ -2083,7 +1996,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="194">
<caret line="695" column="29" lean-forward="false" selection-start-line="695" selection-start-column="29" selection-end-line="695" selection-end-column="29" /> <caret line="695" column="29" lean-forward="false" selection-start-line="695" selection-start-column="29" selection-end-line="695" selection-end-column="29" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2091,9 +2003,6 @@ ...@@ -2091,9 +2003,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253"> <state relative-caret-position="253">
<caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="35" /> <caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="35" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2101,9 +2010,6 @@ ...@@ -2101,9 +2010,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="989"> <state relative-caret-position="989">
<caret line="63" column="32" lean-forward="false" selection-start-line="63" selection-start-column="32" selection-end-line="63" selection-end-column="32" /> <caret line="63" column="32" lean-forward="false" selection-start-line="63" selection-start-column="32" selection-end-line="63" selection-end-column="32" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2111,7 +2017,6 @@ ...@@ -2111,7 +2017,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276"> <state relative-caret-position="276">
<caret line="16" column="31" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="31" /> <caret line="16" column="31" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="31" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2119,7 +2024,6 @@ ...@@ -2119,7 +2024,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230"> <state relative-caret-position="230">
<caret line="14" column="89" lean-forward="false" selection-start-line="14" selection-start-column="89" selection-end-line="14" selection-end-column="89" /> <caret line="14" column="89" lean-forward="false" selection-start-line="14" selection-start-column="89" selection-end-line="14" selection-end-column="89" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2127,7 +2031,6 @@ ...@@ -2127,7 +2031,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1275"> <state relative-caret-position="1275">
<caret line="319" column="22" lean-forward="true" selection-start-line="319" selection-start-column="22" selection-end-line="319" selection-end-column="22" /> <caret line="319" column="22" lean-forward="true" selection-start-line="319" selection-start-column="22" selection-end-line="319" selection-end-column="22" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2135,7 +2038,6 @@ ...@@ -2135,7 +2038,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="398"> <state relative-caret-position="398">
<caret line="40" column="15" lean-forward="false" selection-start-line="40" selection-start-column="15" selection-end-line="40" selection-end-column="15" /> <caret line="40" column="15" lean-forward="false" selection-start-line="40" selection-start-column="15" selection-end-line="40" selection-end-column="15" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2143,7 +2045,6 @@ ...@@ -2143,7 +2045,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <state relative-caret-position="207">
<caret line="36" column="46" lean-forward="false" selection-start-line="36" selection-start-column="46" selection-end-line="36" selection-end-column="46" /> <caret line="36" column="46" lean-forward="false" selection-start-line="36" selection-start-column="46" selection-end-line="36" selection-end-column="46" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2151,7 +2052,6 @@ ...@@ -2151,7 +2052,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="552"> <state relative-caret-position="552">
<caret line="49" column="22" lean-forward="false" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="22" /> <caret line="49" column="22" lean-forward="false" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="22" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2159,15 +2059,13 @@ ...@@ -2159,15 +2059,13 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <state relative-caret-position="207">
<caret line="14" column="41" lean-forward="false" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" /> <caret line="14" column="41" lean-forward="false" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343"> <state relative-caret-position="391">
<caret line="29" column="49" lean-forward="false" selection-start-line="29" selection-start-column="49" selection-end-line="29" selection-end-column="49" /> <caret line="29" column="49" lean-forward="false" selection-start-line="29" selection-start-column="49" selection-end-line="29" selection-end-column="49" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2175,7 +2073,6 @@ ...@@ -2175,7 +2073,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <state relative-caret-position="207">
<caret line="10" column="12" lean-forward="false" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" /> <caret line="10" column="12" lean-forward="false" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2183,7 +2080,6 @@ ...@@ -2183,7 +2080,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-46"> <state relative-caret-position="-46">
<caret line="31" column="36" lean-forward="false" selection-start-line="31" selection-start-column="36" selection-end-line="31" selection-end-column="36" /> <caret line="31" column="36" lean-forward="false" selection-start-line="31" selection-start-column="36" selection-end-line="31" selection-end-column="36" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2191,15 +2087,6 @@ ...@@ -2191,15 +2087,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="194">
<caret line="9" column="4" lean-forward="false" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" /> <caret line="9" column="4" lean-forward="false" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
<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="54" lean-forward="false" selection-start-line="29" selection-start-column="54" selection-end-line="29" selection-end-column="54" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -2207,32 +2094,51 @@ ...@@ -2207,32 +2094,51 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183"> <state relative-caret-position="183">
<caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/ResultStatus.java"> <entry file="file://$PROJECT_DIR$/src/main/java/util/ResultStatus.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="332"> <state relative-caret-position="621">
<caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="30" /> <caret line="27" column="25" lean-forward="false" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="30" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <state relative-caret-position="3243">
<caret line="180" column="126" lean-forward="true" selection-start-line="180" selection-start-column="126" selection-end-line="180" selection-end-column="126" /> <caret line="180" column="126" lean-forward="false" selection-start-line="180" selection-start-column="126" selection-end-line="180" selection-end-column="126" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="206">
<caret line="67" column="67" lean-forward="false" selection-start-line="67" selection-start-column="67" selection-end-line="67" selection-end-column="67" /> <caret line="65" column="13" lean-forward="true" selection-start-line="65" selection-start-column="13" selection-end-line="65" selection-end-column="13" />
</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="3289">
<caret line="173" column="41" lean-forward="false" selection-start-line="173" selection-start-column="41" selection-end-line="173" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="897">
<caret line="39" column="3" lean-forward="false" selection-start-line="39" selection-start-column="3" selection-end-line="39" selection-end-column="3" />
<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="790">
<caret line="48" column="8" lean-forward="true" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
src/main/java/common/task/SyncAppDataTask.java
...@@ -146,22 +146,25 @@ public class SyncAppDataTask ...@@ -146,22 +146,25 @@ public class SyncAppDataTask
}*/ }*/
public void syncAppDeviceNum() { public void syncAppDeviceNum() {
String ds = DateUtil.getBeforeDays(2); for(int j =4; j < 9; j++){
//ds = "2017-12-22"; String ds = DateUtil.getBeforeDays(j);
System.out.println(ds); //ds = "2018-02-20";
String skey = "export/pkg_dev_stats/ds=" + ds + "/"; System.out.println(ds);
String skey = "export/pkg_dev_stats/ds=" + ds + "/";
final AwsS3Util s3Util = AwsS3Util.getInstance(); final AwsS3Util s3Util = AwsS3Util.getInstance();
List itemList = AwsS3Util.getInstance().getS3Keys("reyunbpu", skey); List itemList = AwsS3Util.getInstance().getS3Keys("reyunbpu", skey);
if (itemList == null || itemList.size() == 0) { if (itemList == null || itemList.size() == 0) {
System.out.println("pkg_dev_stats null"); System.out.println("pkg_dev_stats null");
return; return;
} }
for (int i = 0; i < itemList.size(); i++) { for (int i = 0; i < itemList.size(); i++) {
String s3key = String.valueOf(itemList.get(i)); String s3key = String.valueOf(itemList.get(i));
readS3File(s3Util, s3key, "deviceNum"); readS3File(s3Util, s3key, "deviceNum");
}
} }
System.out.println("pkg_dev_stats end"); System.out.println("pkg_dev_stats end");
} }
...@@ -233,7 +236,7 @@ public class SyncAppDataTask ...@@ -233,7 +236,7 @@ public class SyncAppDataTask
List<OtPkgDevStats> resultList = new ArrayList<>(); List<OtPkgDevStats> resultList = new ArrayList<>();
List<AppInfo> appResultList = new ArrayList<>(); List<AppInfo> appResultList = new ArrayList<>();
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
// System.out.println(line); System.out.println(line);
Object[] array = Splitter.on("\t").trimResults().splitToList(line).toArray(); Object[] array = Splitter.on("\t").trimResults().splitToList(line).toArray();
if (array.length == 3) { if (array.length == 3) {
OtPkgDevStats opds = new OtPkgDevStats(); OtPkgDevStats opds = new OtPkgDevStats();
...@@ -242,7 +245,7 @@ public class SyncAppDataTask ...@@ -242,7 +245,7 @@ public class SyncAppDataTask
opds.setDs(array[2].toString()); opds.setDs(array[2].toString());
resultList.add(opds); resultList.add(opds);
if (resultList.size() >= 2000) { if (resultList.size() >= 2000) {
//System.out.println(resultList); System.out.println(resultList);
otPkgDevStatsRepository.save(resultList); otPkgDevStatsRepository.save(resultList);
resultList = new ArrayList<>(); resultList = new ArrayList<>();
} }
...@@ -263,7 +266,7 @@ public class SyncAppDataTask ...@@ -263,7 +266,7 @@ public class SyncAppDataTask
appInfoRepository.save(appResultList); appInfoRepository.save(appResultList);
} }
//System.out.println(newCategorys); System.out.println(newCategorys);
if (newCategorys.size() > 0) { if (newCategorys.size() > 0) {
appCategoryRepository.save(newCategorys); appCategoryRepository.save(newCategorys);
} }
......
src/main/resources/spring/applicationContext-schedule.xml
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<task:scheduled-tasks> <task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)--> <!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="SyncAppDataTask" method="syncAppInfo" cron="0 31 0 * * ?"/> <task:scheduled ref="SyncAppDataTask" method="syncAppInfo" cron="0 31 0 * * ?"/>
<task:scheduled ref="SyncAppDataTask" method="syncAppDeviceNum" cron="0 11 0 * * ?"/> <task:scheduled ref="SyncAppDataTask" method="syncAppDeviceNum" cron="0 43 14 * * ?"/>
</task:scheduled-tasks> </task:scheduled-tasks>
......
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