Skip to content

M
manager
Commit 60fbe959 by manxiaoqiang
Options

notice

parent c2a8bc47
Showing with 762 additions and 217 deletions
.idea/misc.xml
......@@ -3,12 +3,5 @@
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" />
</component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
.idea/workspace.xml
......@@ -2,10 +2,22 @@
<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/controller/NoticeController.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/model/Notice.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/service/NoticeService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/NoticeServiceImpl.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/common/controller/UserLogController.class" afterPath="$PROJECT_DIR$/target/classes/common/controller/UserLogController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.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/controller/UserLogController.java" afterPath="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/manage.iml" afterPath="$PROJECT_DIR$/manage.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" afterPath="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java" afterPath="$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java" />
<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/applicationContext-schedule.xml" afterPath="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" />
</list>
<list id="933e480d-1136-4c92-9651-6e74b37fc51c" name="Failed commit: Default" comment="track客户管理" />
<ignored path="$PROJECT_DIR$/target/" />
......@@ -22,11 +34,11 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserLogThread.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/util/UserLogThread.java">
<file leaf-file-name="NoticeRepository.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="401">
<caret line="39" column="11" lean-forward="false" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
<state relative-caret-position="276">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -34,16 +46,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="NoticeTask.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="5" column="25" lean-forward="false" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -88,7 +90,6 @@
<option value="$PROJECT_DIR$/src/main/java/common/repository/AppCategoryRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/AppService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/AppServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext.xml" />
<option value="$PROJECT_DIR$/src/main/java/dic/OperateSatusEnum.java" />
<option value="$PROJECT_DIR$/src/main/java/dic/OperateObjectTypeEnum.java" />
......@@ -105,7 +106,15 @@
<option value="$PROJECT_DIR$/src/main/java/common/controller/UserLogController.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Test.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Notice.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java" />
<option value="$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Account4Web.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/NoticeService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/NoticeServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/NoticeController.java" />
</list>
</option>
</component>
......@@ -116,7 +125,96 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="MavenProjectNavigator">
<treeState />
<treeState>
<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>
<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="install" />
<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_ELEMENT>
<option name="myItemId" value="compiler" />
<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_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="Profiles" />
<option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProfilesNode" />
</PATH_ELEMENT>
</PATH>
</treeState>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
......@@ -128,7 +226,7 @@
<ConfirmationsSetting value="1" id="Add" />
</component>
<component name="ProjectView">
<navigator currentView="PackagesPane" proportions="" version="1">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
......@@ -259,6 +357,92 @@
<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>
<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="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>
<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="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="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
......@@ -401,6 +585,8 @@
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="common.controller" />
<recent name="common.model" />
<recent name="util" />
<recent name="dic" />
<recent name="common.context" />
......@@ -840,7 +1026,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="40028000" />
<option name="totallyTimeSpent" value="41136000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -873,11 +1059,11 @@
<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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4222586" sideWeight="0.5" 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.5400982" sideWeight="0.5" order="9" 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.3289689" sideWeight="0.5" order="2" 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.33" 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="true" show_stripe_button="true" weight="0.25718608" sideWeight="0.5" order="7" 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.34493193" sideWeight="0.5" order="7" 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.33" sideWeight="0.5" order="5" 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="Find" 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="8" side_tool="false" content_ui="tabs" />
......@@ -914,12 +1100,12 @@
<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="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="12" 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.3502455" sideWeight="0.5" 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.5400982" sideWeight="0.5" order="9" 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.3289689" sideWeight="0.5" order="2" 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.33" 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.25718608" sideWeight="0.5" order="7" 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.34493193" sideWeight="0.5" order="7" 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.33" sideWeight="0.5" order="5" 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="Find" 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="8" side_tool="false" content_ui="tabs" />
......@@ -974,78 +1160,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/model/TagCrawlerAppsWandoujia.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" column="31" lean-forward="false" selection-start-line="22" selection-start-column="19" selection-end-line="22" selection-end-column="31" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/repository/TagCrawlerAppsWandoujiaRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="14" column="57" lean-forward="false" selection-start-line="14" selection-start-column="57" selection-end-line="14" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/LoginController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/MenuController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="436">
<caret line="32" column="5" lean-forward="true" selection-start-line="27" selection-start-column="4" selection-end-line="32" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/MenuServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="17" column="39" lean-forward="false" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3916">
<caret line="59" column="49" lean-forward="true" selection-start-line="59" selection-start-column="49" selection-end-line="59" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/rest-servlet.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="35" column="70" lean-forward="false" selection-start-line="35" selection-start-column="46" selection-end-line="35" selection-end-column="70" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-792">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/web/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="5" column="10" lean-forward="true" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/util/ResultModel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1034">
......@@ -1065,29 +1179,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="12" column="17" lean-forward="false" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppCategoryRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="13" column="5" lean-forward="false" selection-start-line="13" selection-start-column="5" selection-end-line="14" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="24" column="7" lean-forward="false" selection-start-line="24" selection-start-column="7" selection-end-line="24" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/SyncAppDataTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1320">
......@@ -1116,7 +1207,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="6" column="12" lean-forward="false" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
......@@ -1125,7 +1215,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="11" column="53" lean-forward="false" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
......@@ -1133,7 +1222,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1141,9 +1229,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="23" lean-forward="true" selection-start-line="13" selection-start-column="23" selection-end-line="13" selection-end-column="23" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1158,7 +1243,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="12" column="68" lean-forward="false" selection-start-line="12" selection-start-column="42" selection-end-line="12" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
......@@ -1174,45 +1258,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="15" column="30" lean-forward="false" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="30" />
<folding>
<element signature="imports" expanded="false" />
<element signature="e#554#555#0" expanded="false" />
<element signature="e#579#580#0" expanded="false" />
<element signature="e#617#618#0" expanded="false" />
<element signature="e#645#646#0" expanded="false" />
<element signature="e#687#688#0" expanded="false" />
<element signature="e#721#722#0" expanded="false" />
<element signature="e#779#780#0" expanded="false" />
<element signature="e#825#826#0" expanded="false" />
<element signature="e#868#869#0" expanded="false" />
<element signature="e#903#904#0" expanded="false" />
<element signature="e#963#964#0" expanded="false" />
<element signature="e#1011#1012#0" expanded="false" />
<element signature="e#1053#1054#0" expanded="false" />
<element signature="e#1087#1088#0" expanded="false" />
<element signature="e#1145#1146#0" expanded="false" />
<element signature="e#1191#1192#0" expanded="false" />
<element signature="e#1224#1225#0" expanded="false" />
<element signature="e#1249#1250#0" expanded="false" />
<element signature="e#1289#1290#0" expanded="false" />
<element signature="e#1317#1318#0" expanded="false" />
<element signature="e#1365#1366#0" expanded="false" />
<element signature="e#1405#1406#0" expanded="false" />
<element signature="e#1475#1476#0" expanded="false" />
<element signature="e#1533#1534#0" expanded="false" />
<element signature="e#1577#1578#0" expanded="false" />
<element signature="e#1613#1614#0" expanded="false" />
<element signature="e#1675#1676#0" expanded="false" />
<element signature="e#1725#1726#0" expanded="false" />
<element signature="e#1767#1768#0" expanded="false" />
<element signature="e#1801#1802#0" expanded="false" />
<element signature="e#1859#1860#0" expanded="false" />
<element signature="e#1905#1906#0" expanded="false" />
<element signature="e#1944#1945#0" expanded="false" />
<element signature="e#1975#1976#0" expanded="false" />
<element signature="e#2027#2028#0" expanded="false" />
<element signature="e#2067#2068#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1227,7 +1272,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="13" column="60" lean-forward="false" selection-start-line="13" selection-start-column="60" selection-end-line="13" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
......@@ -1235,7 +1279,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="11" column="1" lean-forward="false" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
......@@ -1243,9 +1286,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<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>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1269,9 +1309,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="13" column="18" lean-forward="false" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1279,9 +1316,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="29" column="25" lean-forward="false" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1289,7 +1323,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="329">
<caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1297,10 +1330,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="9" column="22" lean-forward="false" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="22" />
<folding>
<element signature="e#364#365#0" expanded="true" />
<element signature="e#390#391#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1308,7 +1337,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="283">
<caret line="14" column="12" lean-forward="false" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
......@@ -1332,9 +1360,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="17" column="37" lean-forward="false" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="37" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1342,15 +1367,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-414">
<caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<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="950">
<caret line="87" column="34" lean-forward="false" selection-start-line="87" selection-start-column="30" selection-end-line="87" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
......@@ -1366,7 +1382,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="17" column="20" lean-forward="false" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
......@@ -1382,7 +1397,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="30" column="20" lean-forward="false" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
......@@ -1390,9 +1404,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="21" column="45" lean-forward="true" selection-start-line="21" selection-start-column="45" selection-end-line="21" selection-end-column="45" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1400,9 +1411,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="401">
<caret line="39" column="11" lean-forward="false" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1420,19 +1428,239 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="67" column="73" lean-forward="false" selection-start-line="67" selection-start-column="73" selection-end-line="67" selection-end-column="73" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Test.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Notice.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="10" column="15" lean-forward="true" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="15" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#406#407#0" expanded="true" />
<element signature="e#431#432#0" expanded="true" />
<element signature="e#465#466#0" expanded="true" />
<element signature="e#493#494#0" expanded="true" />
<element signature="e#522#523#0" expanded="true" />
<element signature="e#549#550#0" expanded="true" />
<element signature="e#587#588#0" expanded="true" />
<element signature="e#619#620#0" expanded="true" />
<element signature="e#654#655#0" expanded="true" />
<element signature="e#685#686#0" expanded="true" />
<element signature="e#733#734#0" expanded="true" />
<element signature="e#773#774#0" expanded="true" />
<element signature="e#807#808#0" expanded="true" />
<element signature="e#837#838#0" expanded="true" />
<element signature="e#883#884#0" expanded="true" />
<element signature="e#921#922#0" expanded="true" />
<element signature="e#950#951#0" expanded="true" />
<element signature="e#975#976#0" expanded="true" />
<element signature="e#1011#1012#0" expanded="true" />
<element signature="e#1039#1040#0" expanded="true" />
<element signature="e#1074#1075#0" expanded="true" />
<element signature="e#1106#1107#0" expanded="true" />
<element signature="e#1153#1154#0" expanded="true" />
<element signature="e#1188#1189#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/task/NoticeTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="5" column="25" lean-forward="false" selection-start-line="5" selection-start-column="25" selection-end-line="5" selection-end-column="25" />
<state relative-caret-position="413">
<caret line="105" column="42" lean-forward="false" selection-start-line="105" selection-start-column="42" selection-end-line="105" selection-end-column="42" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext-schedule.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="18" column="26" lean-forward="true" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
<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="297">
<caret line="183" column="35" lean-forward="false" selection-start-line="183" selection-start-column="35" selection-end-line="183" selection-end-column="35" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3707#3708#0" expanded="true" />
<element signature="e#3761#3762#0" expanded="true" />
<element signature="e#3809#3810#0" expanded="true" />
<marker date="1514450072810" expanded="false" signature="837:848" ph=" { " />
<marker date="1514450072810" expanded="false" signature="858:864" ph=" }" />
<marker date="1514450072810" expanded="false" signature="896:907" ph=" { " />
<marker date="1514450072810" expanded="false" signature="920:926" ph=" }" />
<marker date="1514450072810" expanded="false" signature="958:969" ph=" { " />
<marker date="1514450072810" expanded="false" signature="986:992" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1038:1049" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1076:1082" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1112:1123" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1136:1142" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1182:1193" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1212:1218" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1250:1261" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1276:1282" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1326:1337" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1360:1366" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1399:1410" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1428:1434" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1482:1493" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1522:1528" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1559:1570" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1584:1590" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1632:1643" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1664:1670" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1706:1717" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1736:1742" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1794:1805" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1836:1842" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1875:1886" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1902:1908" ph=" }" />
<marker date="1514450072810" expanded="false" signature="1954:1965" ph=" { " />
<marker date="1514450072810" expanded="false" signature="1990:1996" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2030:2041" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2054:2060" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2104:2115" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2134:2140" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2171:2182" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2192:2198" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2236:2247" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2260:2266" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2305:2316" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2334:2340" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2394:2405" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2434:2440" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2476:2487" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2502:2508" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2556:2567" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2590:2596" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2630:2641" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2657:2663" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2710:2721" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2746:2752" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2781:2792" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2804:2810" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2848:2859" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2876:2882" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2911:2922" ph=" { " />
<marker date="1514450072810" expanded="false" signature="2934:2940" ph=" }" />
<marker date="1514450072810" expanded="false" signature="2978:2989" ph=" { " />
<marker date="1514450072810" expanded="false" signature="3006:3012" ph=" }" />
<marker date="1514450072810" expanded="false" signature="3040:3051" ph=" { " />
<marker date="1514450072810" expanded="false" signature="3064:3070" ph=" }" />
<marker date="1514450072810" expanded="false" signature="3108:3119" ph=" { " />
<marker date="1514450072810" expanded="false" signature="3138:3144" ph=" }" />
<marker date="1514450072810" expanded="false" signature="3178:3189" ph=" { " />
<marker date="1514450072810" expanded="false" signature="3205:3211" ph=" }" />
<marker date="1514450072810" expanded="false" signature="3258:3269" ph=" { " />
<marker date="1514450072810" expanded="false" signature="3294:3300" ph=" }" />
<marker date="1514450072810" expanded="false" signature="3337:3348" ph=" { " />
<marker date="1514450072810" expanded="false" signature="3367:3373" ph=" }" />
<marker date="1514450072810" expanded="false" signature="3426:3437" ph=" { " />
<marker date="1514450072810" expanded="false" signature="3468:3474" ph=" }" />
<marker date="1514450072810" expanded="false" signature="3509:3520" ph=" { " />
<marker date="1514450072810" expanded="false" signature="3537:3543" ph=" }" />
<marker date="1514450072810" expanded="false" signature="3592:3603" ph=" { " />
<marker date="1514450072810" expanded="false" signature="3630:3636" ph=" }" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/Account4WebRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="18" column="24" lean-forward="false" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/dmp/model/TagCrawlerAppsWandoujia.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="13" column="36" lean-forward="false" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/AppCategoryRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="14" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/NoticeService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="14" column="25" lean-forward="false" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/NoticeServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
<caret line="31" column="30" lean-forward="false" selection-start-line="31" selection-start-column="30" selection-end-line="31" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/NoticeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="552">
<caret line="44" column="58" lean-forward="false" selection-start-line="44" selection-start-column="58" selection-end-line="44" selection-end-column="58" />
<folding>
<element signature="e#1080#1081#0" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" />
<element signature="e#1358#1359#0" 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="1242">
<caret line="71" column="66" lean-forward="false" selection-start-line="71" selection-start-column="66" selection-end-line="71" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/repository/NoticeRepository.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
src/main/java/common/controller/NoticeController.java 0 → 100644
package common.controller;
import common.model.User;
import common.repository.UserRepository;
import common.service.NoticeService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import security.RedisLoginStatusManager;
import security.TokenManager;
import security.annotation.CurrentAccount;
import util.CipherUtil;
import util.Constant;
import util.ResultModel;
import util.ValidateUtil;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
@Controller
@RequestMapping("notice")
public class NoticeController {
protected Logger logger = LoggerFactory.getLogger(NoticeController.class);
@Autowired
NoticeService noticeService;
@RequestMapping(value = "find", method = RequestMethod.GET)
@ResponseBody
public ResultModel find(@CurrentAccount User user) {
return ResultModel.OK(noticeService.findAll(user));
}
@RequestMapping(value = "read/{id}", method = RequestMethod.PUT)
@ResponseBody
public ResultModel loginCheck(@PathVariable Long id) {
return ResultModel.OK(noticeService.read(id));
}
}
src/main/java/common/model/Account4Web.java
......@@ -26,7 +26,7 @@ public class Account4Web {
private Boolean ioStatus;
private Boolean trackStatus;
private Boolean remStatus;
private Long bussinessMan;
@Id
@GeneratedValue
public Long getId() {
......@@ -181,6 +181,14 @@ public class Account4Web {
this.remStatus = remStatus;
}
public Long getBussinessMan() {
return bussinessMan;
}
public void setBussinessMan(Long bussinessMan) {
this.bussinessMan = bussinessMan;
}
@Override
public String toString() {
return "Account4Web{" +
......
src/main/java/common/model/Notice.java 0 → 100644
package common.model;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
/**
* Created by mxq on 2017/12/28.
*/
@Entity
public class Notice {
private Long id;
private Long user;
private String platform;
private String content;
private String ds;
private Boolean isNotRead;
@Id
@GeneratedValue
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getUser() {
return user;
}
public void setUser(Long user) {
this.user = user;
}
public String getPlatform() {
return platform;
}
public void setPlatform(String platform) {
this.platform = platform;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getDs() {
return ds;
}
public void setDs(String ds) {
this.ds = ds;
}
public Boolean getNotRead() {
return isNotRead;
}
public void setNotRead(Boolean notRead) {
isNotRead = notRead;
}
}
src/main/java/common/repository/Account4WebRepository.java
......@@ -15,4 +15,7 @@ public interface Account4WebRepository extends JpaRepository<Account4Web, Long>
@Query(value = "SELECT * from account4web where email in ?1", nativeQuery = true)
List<Account4Web> findByEmails(List<String> emails);
@Query(value = "SELECT * from account4web where past_date = ?1", nativeQuery = true)
List<Account4Web> findByPast(String yesterday);
}
src/main/java/common/repository/NoticeRepository.java 0 → 100644
package common.repository;
import common.model.Notice;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Transactional
public interface NoticeRepository extends JpaRepository<Notice, Long> {
@Query(value="select * from notice where user = ?1 and ds >= ?2",nativeQuery=true)
List<Notice> findall(Long user, String ds);
}
src/main/java/common/service/NoticeService.java 0 → 100644
package common.service;
import common.model.Notice;
import common.model.User;
import java.util.List;
/**
* Created by mxq on 2017/12/28.
*/
public interface NoticeService {
List<Notice> findAll(User user);
Notice read(Long id);
}
src/main/java/common/service/impl/NoticeServiceImpl.java 0 → 100644
package common.service.impl;
import common.model.Notice;
import common.model.User;
import common.repository.NoticeRepository;
import common.service.NoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import util.DateUtil;
import java.util.List;
/**
* Created by mxq on 2017/12/28.
*/
@Service
public class NoticeServiceImpl implements NoticeService {
@Autowired
NoticeRepository noticeRepository;
@Override
public List<Notice> findAll(User user) {
List<Notice> noticeList = noticeRepository.findall(user.getId(), DateUtil.getBeforeDays(7));
return noticeList;
}
@Override
public Notice read(Long id) {
Notice one = noticeRepository.findOne(id);
one.setNotRead(false);
return noticeRepository.save(one);
}
}
src/main/java/tkio/task/AccountTask.java
......@@ -69,6 +69,7 @@ public class AccountTask {
}
account4Web.setUser(ac.getName());
account4Web.setTell(ac.getPhone());
account4Web.setBussinessMan(ac.getBussinessman());
list.add(account4Web);
}
}
......@@ -93,6 +94,7 @@ public class AccountTask {
account4Web.setTrackStatus(false);
account4Web.setUser(ac.getName());
account4Web.setTell(ac.getPhone());
account4Web.setBussinessMan(ac.getBussinessman());
list.add(account4Web);
}
}
......
src/main/java/tkio/task/NoticeTask.java 0 → 100644
package tkio.task;
import common.model.Account4Web;
import common.model.Notice;
import common.model.User;
import common.repository.Account4WebRepository;
import common.repository.NoticeRepository;
import common.repository.UserRepository;
import dic.RoleEnum;
import org.springframework.beans.factory.annotation.Autowired;
import tkio.model.SalesManLeader;
import tkio.repository.SalesManLeaderRepository;
import util.DateUtil;
import util.ValidateUtil;
import java.util.*;
/**
* Created by mxq on 2017/12/27.
*/
public class NoticeTask {
@Autowired
Account4WebRepository account4WebRepository;
@Autowired
UserRepository userRepository;
@Autowired
SalesManLeaderRepository salesManLeaderRepository;
@Autowired
NoticeRepository noticeRepository;
public void task(){
System.out.println("同步消息任务开始");
noticeRepository.findAll();
List<Account4Web> account4WebList = account4WebRepository.findByPast(DateUtil.getBeforeDays(1));
Map<Long, Integer> map = new HashMap<>();
Map<Long, Integer> mapTotle = new HashMap<>();
if(ValidateUtil.isValid(account4WebList)){
for(Account4Web aw : account4WebList){
if(mapTotle.containsKey(0L)){
mapTotle.put(0L, mapTotle.get(0L) + 1);
}else{
mapTotle.put(0L, 1);
}
if(null != aw.getBussinessMan()){
if(map.containsKey(aw.getBussinessMan())){
map.put(aw.getBussinessMan(), map.get(aw.getBussinessMan()) + 1);
}else{
map.put(aw.getBussinessMan(), 1);
}
}
}
List<SalesManLeader> salesManLeaders = salesManLeaderRepository.findAll();
Map<String, List<Long>> saleMap = new HashMap<>();
if(ValidateUtil.isValid(salesManLeaders)){
for(SalesManLeader sml : salesManLeaders){
List<Long> idList = new ArrayList<>();
if(sml.getId() == 0 || sml.getId() == sml.getLeader()){//不是主管
Long id = (long)sml.getId();
idList.add(id);
}else{//是主管
for(SalesManLeader sml2 : salesManLeaders){
if(sml.getId() == sml2.getLeader()){
Long id = (long)sml.getId();
idList.add(id);
}
}
}
saleMap.put(sml.getEmail(), idList);
}
}
Map<Long, Integer> resultMap = new HashMap<>();
List<User> userList = userRepository.findAll();
if(mapTotle.containsKey(0L)){
for(User user : userList){
if(user.getRole().equals(RoleEnum.MANAGER.getKey())){
resultMap.put(user.getId(), mapTotle.get(0L));
} else{
if(saleMap.containsKey(user.getId())){
List<Long> list = saleMap.get(user.getId());
for(Long id : list){
if(map.containsKey(id)){
if(resultMap.containsKey(user.getId())){
resultMap.put(user.getId(), map.get(user.getId()) + map.get(id));
}else{
resultMap.put(user.getId(), map.get(id));
}
}
}
}
}
}
List<Notice> list = new ArrayList<>();
String today = DateUtil.getBeforeDays(0);
Set<Long> keySet = resultMap.keySet();
for(Long id : keySet){
int num = resultMap.get(id);
Notice notice = new Notice();
notice.setUser(id);
notice.setPlatform("tkio");
notice.setContent("tkio有" + num + "个客户过期,请及时联系客户");
notice.setDs(today);
notice.setNotRead(true);
list.add(notice);
}
noticeRepository.save(list);
}
}
System.out.println("同步消息任务结束");
}
}
src/main/resources/applicationContext-schedule.xml
......@@ -10,11 +10,14 @@
<description>调度配置</description>
<bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
<task:scheduled-tasks>
<!--//定时同步短链数据(每5分钟执行一次)-->
<task:scheduled ref="tkioAccountTask" method="task" cron="0 21 15 * * ?"/>
<task:scheduled ref="tkioAccountTask" method="task" cron="0 40 14 * * ?"/>
</task:scheduled-tasks>
<bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>
<task:scheduled-tasks>
<task:scheduled ref="tkioNoticeTask" method="task" cron="0 33 16 * * ?"/>
</task:scheduled-tasks>
<bean id="trackAccountTask" class="track.task.AccountTask"></bean>
......
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
......@@ -36,6 +36,7 @@ util\DateUtil.class
common\model\AppCategory.class
tkio\repository\ChannelRepository.class
security\RedisLoginStatusManager.class
common\model\Notice.class
dic\RoleTypeEnum.class
common\repository\AppInfoRepository.class
tkio\model\Channel.class
......@@ -74,6 +75,7 @@ tkio\service\AccountFlowRestrictService.class
util\UserLogThread.class
tkio\model\DataAuth.class
common\model\KeyValue.class
common\model\Test.class
common\repository\UserRepository.class
track\repository\TrackCampaignRepository.class
util\ResultModel.class
......@@ -84,10 +86,12 @@ tkio\model\App.class
security\resolvers\LoginUserMethodArgumentsResolver.class
tkio\service\TkioAccountService.class
common\model\TrackAccount4Web.class
common\repository\NoticeRepository.class
common\model\RoleType.class
tkio\task\AccountTask.class
security\annotation\Authorization.class
util\IP$1.class
tkio\task\NoticeTask.class
common\repository\CodeRepository.class
tkio\model\SalesManLeader.class
common\controller\AppController.class
......
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
......@@ -11,12 +11,14 @@ E:\newgit\manager\src\main\java\tkio\repository\ChannelRepository.java
E:\newgit\manager\src\main\java\common\model\Account4Web.java
E:\newgit\manager\src\main\java\tkio\repository\AppRepository.java
E:\newgit\manager\src\main\java\util\Constant.java
E:\newgit\manager\src\main\java\common\repository\NoticeRepository.java
E:\newgit\manager\src\main\java\tkio\service\impl\AccountFlowRestrictServiceImpl.java
E:\newgit\manager\src\main\java\tkio\controller\TkioAccountController.java
E:\newgit\manager\src\main\java\tkio\model\Campaign.java
E:\newgit\manager\src\main\java\common\model\Auth.java
E:\newgit\manager\src\main\java\common\model\KeyValue.java
E:\newgit\manager\src\main\java\util\ResultModel.java
E:\newgit\manager\src\main\java\tkio\task\NoticeTask.java
E:\newgit\manager\src\main\java\track\service\impl\TrackAccountServiceImpl.java
E:\newgit\manager\src\main\java\security\interceptor\AuthorizationInterceptor.java
E:\newgit\manager\src\main\java\exception\NotFoundException.java
......@@ -48,6 +50,7 @@ E:\newgit\manager\src\main\java\common\model\AppInfo.java
E:\newgit\manager\src\main\java\common\repository\AuthRepository.java
E:\newgit\manager\src\main\java\common\controller\LoginController.java
E:\newgit\manager\src\main\java\dic\RoleTypeEnum.java
E:\newgit\manager\src\main\java\common\model\Notice.java
E:\newgit\manager\src\main\java\common\model\Menu.java
E:\newgit\manager\src\main\java\common\service\AppService.java
E:\newgit\manager\src\main\java\common\service\MenuService.java
......@@ -78,6 +81,7 @@ E:\newgit\manager\src\main\java\security\TokenManager.java
E:\newgit\manager\src\main\java\common\repository\CodeRepository.java
E:\newgit\manager\src\main\java\dic\OperateObjectTypeEnum.java
E:\newgit\manager\src\main\java\util\HttpClientUtil.java
E:\newgit\manager\src\main\java\common\model\Test.java
E:\newgit\manager\src\main\java\tkio\model\Auth.java
E:\newgit\manager\src\main\java\common\repository\AppInfoRepository.java
E:\newgit\manager\src\main\java\track\model\App.java
......
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