From 052c104cbc2ccc13d83cd912e3b2bbf12c0d56bc Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Fri, 27 Oct 2017 16:00:32 +0800 Subject: [PATCH] 批量更新,提升性能 --- .idea/workspace.xml | 1061 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 830 insertions(+), 231 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 70c873a..37d3780 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,9 +6,13 @@ </artifacts-to-build> </component> <component name="ChangeListManager"> - <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment=""> + <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="���������������������"> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" /> </list> <ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/target/" /> @@ -20,12 +24,83 @@ <option name="LAST_RESOLUTION" value="IGNORE" /> </component> <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> + <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="210"> - <caret line="14" column="78" lean-forward="false" selection-start-line="14" selection-start-column="78" selection-end-line="14" selection-end-column="78" /> + <state relative-caret-position="308"> + <caret line="101" column="39" lean-forward="false" selection-start-line="101" selection-start-column="39" selection-end-line="101" selection-end-column="39" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#3225#3234#0" expanded="true" /> + <element signature="e#4082#4097#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="History.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="270"> + <caret line="18" column="28" lean-forward="false" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" /> + <folding> + <element signature="e#297#298#0" expanded="true" /> + <element signature="e#334#335#0" expanded="true" /> + <element signature="e#362#363#0" expanded="true" /> + <element signature="e#392#393#0" expanded="true" /> + <element signature="e#418#419#0" expanded="true" /> + <element signature="e#456#457#0" expanded="true" /> + <element signature="e#486#487#0" expanded="true" /> + <element signature="e#519#520#0" expanded="true" /> + <element signature="e#548#549#0" expanded="true" /> + <element signature="e#592#593#0" expanded="true" /> + <element signature="e#628#629#0" expanded="true" /> + <element signature="e#662#663#0" expanded="true" /> + <element signature="e#692#693#0" expanded="true" /> + <element signature="e#738#739#0" expanded="true" /> + <element signature="e#776#777#0" expanded="true" /> + <element signature="e#812#813#0" expanded="true" /> + <element signature="e#844#845#0" expanded="true" /> + <element signature="e#894#895#0" expanded="true" /> + <element signature="e#936#937#0" expanded="true" /> + <element signature="e#965#966#0" expanded="true" /> + <element signature="e#992#993#0" expanded="true" /> + <element signature="e#1030#1031#0" expanded="true" /> + <element signature="e#1062#1063#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Dashboard.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="359" column="33" lean-forward="true" selection-start-line="359" selection-start-column="33" selection-end-line="359" selection-end-column="33" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="JobDao.xml" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="372"> + <caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" /> + <folding> + <marker date="1509091122000" expanded="true" signature="504:736" ph="select c.mac... equipment" /> + <marker date="1509091122000" expanded="true" signature="795:841" ph="UPDATE equip... " /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="JobDao.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="15" column="33" lean-forward="false" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="33" /> <folding /> </state> </provider> @@ -33,10 +108,32 @@ </file> </leaf> </component> + <component name="FileTemplateManagerImpl"> + <option name="RECENT_TEMPLATES"> + <list> + <option value="Interface" /> + <option value="Class" /> + </list> + </option> + </component> <component name="FindInProjectRecents"> <findStrings> <find>javax.servlet</find> <find>monitor</find> + <find>selectFromequipmentByinstaller</find> + <find>insertIntoequipment</find> + <find>updateFromequipmentBymac</find> + <find>jedis</find> + <find>Monitorpoint</find> + <find>sysConfig.properties</find> + <find>resultMap</find> + <find>monitors_storage_data</find> + <find>findcritical</find> + <find>updateequipmentstate</find> + <find>insertTostate</find> + <find>selectFromsensorByver</find> + <find>insertTologger</find> + <find>logger</find> </findStrings> </component> <component name="Git.Settings"> @@ -52,8 +149,33 @@ <list> <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/LoginService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/ApiService.java" /> + <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Captcha.java" /> <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java" /> + <option value="$PROJECT_DIR$/src/main/resources/database.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/mybatis.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/quartz.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisManager.java" /> + <option value="$PROJECT_DIR$/src/main/resources/application.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java" /> + <option value="$PROJECT_DIR$/src/main/resources/redis.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/redis-config.properties" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/job/Adjust.java" /> <option value="$PROJECT_DIR$/pom.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/Test.java" /> + <option value="$PROJECT_DIR$/src/test/java/Test.java" /> + <option value="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" /> + <option value="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" /> </list> </option> </component> @@ -71,7 +193,8 @@ <option name="CUSTOM_FILTER" /> </component> <component name="ProjectFrameBounds" extendedState="6"> - <option name="y" value="23" /> + <option name="x" value="-1619" /> + <option name="y" value="214" /> <option name="width" value="1404" /> <option name="height" value="877" /> </component> @@ -91,9 +214,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scope" /> - <pane id="Scratches" /> - <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <expand> @@ -101,17 +221,67 @@ <item name="task" type="b2602c69:ProjectViewProjectNode" /> <item name="task" type="462c0819:PsiDirectoryNode" /> </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + <item name="monitor" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + <item name="monitor" type="462c0819:PsiDirectoryNode" /> + <item name="controller" type="462c0819:PsiDirectoryNode" /> + </path> + <path> + <item name="task" type="b2602c69:ProjectViewProjectNode" /> + <item name="task" type="462c0819:PsiDirectoryNode" /> + <item name="src" type="462c0819:PsiDirectoryNode" /> + <item name="main" type="462c0819:PsiDirectoryNode" /> + <item name="java" type="462c0819:PsiDirectoryNode" /> + <item name="monitor" type="462c0819:PsiDirectoryNode" /> + <item name="listener" type="462c0819:PsiDirectoryNode" /> + </path> </expand> <select /> </subPane> </pane> + <pane id="Scratches" /> <pane id="AndroidView" /> + <pane id="Scope" /> + <pane id="PackagesPane" /> </panes> </component> <component name="PropertiesComponent"> <property name="nodejs_interpreter_path" value="/usr/local/bin/node" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> + <property name="project.structure.last.edited" value="Modules" /> + <property name="project.structure.proportion" value="0.0" /> + <property name="project.structure.side.proportion" value="0.0" /> </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> @@ -131,6 +301,20 @@ </option> </component> <component name="RunManager" selected="Tomcat Server.task"> + <configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <option name="MAIN_CLASS_NAME" value="Test" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <module name="task" /> + <envs /> + </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <option name="WIDTH" value="400" /> <option name="HEIGHT" value="300" /> @@ -283,6 +467,15 @@ </option> </method> </configuration> + <list size="2"> + <item index="0" class="java.lang.String" itemvalue="Tomcat Server.task" /> + <item index="1" class="java.lang.String" itemvalue="Application.Test" /> + </list> + <recent_temporary> + <list size="1"> + <item index="0" class="java.lang.String" itemvalue="Application.Test" /> + </list> + </recent_temporary> </component> <component name="ShelveChangesManager" show_recycled="false"> <option name="remove_strategy" value="false" /> @@ -303,7 +496,18 @@ <workItem from="1508484396389" duration="3821000" /> <workItem from="1508491332601" duration="106000" /> <workItem from="1508811045436" duration="651000" /> - <workItem from="1508811839440" duration="16000" /> + <workItem from="1508811839440" duration="1908000" /> + <workItem from="1508814020720" duration="1887000" /> + <workItem from="1508824129641" duration="250000" /> + <workItem from="1508824729673" duration="781000" /> + <workItem from="1508900264535" duration="3612000" /> + <workItem from="1508911116546" duration="7028000" /> + <workItem from="1508977804904" duration="22579000" /> + <workItem from="1509026048007" duration="2710000" /> + <workItem from="1509030446574" duration="3006000" /> + <workItem from="1509056858319" duration="2984000" /> + <workItem from="1509068025499" duration="9340000" /> + <workItem from="1509085973276" duration="4377000" /> </task> <task id="LOCAL-00001" summary="updates"> <created>1508484578874</created> @@ -326,50 +530,186 @@ <option name="project" value="LOCAL" /> <updated>1508490813600</updated> </task> - <option name="localTasksCounter" value="4" /> + <task id="LOCAL-00004" summary="updates"> + <created>1508811869390</created> + <option name="number" value="00004" /> + <option name="presentableId" value="LOCAL-00004" /> + <option name="project" value="LOCAL" /> + <updated>1508811869390</updated> + </task> + <task id="LOCAL-00005" summary="updates"> + <created>1508812121965</created> + <option name="number" value="00005" /> + <option name="presentableId" value="LOCAL-00005" /> + <option name="project" value="LOCAL" /> + <updated>1508812121965</updated> + </task> + <task id="LOCAL-00006" summary="updates"> + <created>1508814407295</created> + <option name="number" value="00006" /> + <option name="presentableId" value="LOCAL-00006" /> + <option name="project" value="LOCAL" /> + <updated>1508814407295</updated> + </task> + <task id="LOCAL-00007" summary="updates"> + <created>1508814992465</created> + <option name="number" value="00007" /> + <option name="presentableId" value="LOCAL-00007" /> + <option name="project" value="LOCAL" /> + <updated>1508814992465</updated> + </task> + <task id="LOCAL-00008" summary="updates"> + <created>1508815251640</created> + <option name="number" value="00008" /> + <option name="presentableId" value="LOCAL-00008" /> + <option name="project" value="LOCAL" /> + <updated>1508815251640</updated> + </task> + <task id="LOCAL-00009" summary="updates"> + <created>1508815333934</created> + <option name="number" value="00009" /> + <option name="presentableId" value="LOCAL-00009" /> + <option name="project" value="LOCAL" /> + <updated>1508815333934</updated> + </task> + <task id="LOCAL-00010" summary="updates"> + <created>1508816385719</created> + <option name="number" value="00010" /> + <option name="presentableId" value="LOCAL-00010" /> + <option name="project" value="LOCAL" /> + <updated>1508816385719</updated> + </task> + <task id="LOCAL-00011" summary="BUG-058"> + <created>1508825226306</created> + <option name="number" value="00011" /> + <option name="presentableId" value="LOCAL-00011" /> + <option name="project" value="LOCAL" /> + <updated>1508825226306</updated> + </task> + <task id="LOCAL-00012" summary="������������������"> + <created>1508902617619</created> + <option name="number" value="00012" /> + <option name="presentableId" value="LOCAL-00012" /> + <option name="project" value="LOCAL" /> + <updated>1508902617619</updated> + </task> + <task id="LOCAL-00013" summary="������������������"> + <created>1508920155176</created> + <option name="number" value="00013" /> + <option name="presentableId" value="LOCAL-00013" /> + <option name="project" value="LOCAL" /> + <updated>1508920155177</updated> + </task> + <task id="LOCAL-00014" summary="updates"> + <created>1508920429528</created> + <option name="number" value="00014" /> + <option name="presentableId" value="LOCAL-00014" /> + <option name="project" value="LOCAL" /> + <updated>1508920429528</updated> + </task> + <task id="LOCAL-00015" summary="������������"> + <created>1508920850416</created> + <option name="number" value="00015" /> + <option name="presentableId" value="LOCAL-00015" /> + <option name="project" value="LOCAL" /> + <updated>1508920850416</updated> + </task> + <task id="LOCAL-00016" summary="������������"> + <created>1508987038075</created> + <option name="number" value="00016" /> + <option name="presentableId" value="LOCAL-00016" /> + <option name="project" value="LOCAL" /> + <updated>1508987038075</updated> + </task> + <task id="LOCAL-00017" summary="RabbitMQ & Redis ������"> + <created>1509061963499</created> + <option name="number" value="00017" /> + <option name="presentableId" value="LOCAL-00017" /> + <option name="project" value="LOCAL" /> + <updated>1509061963500</updated> + </task> + <task id="LOCAL-00018" summary="���������������������"> + <created>1509071255017</created> + <option name="number" value="00018" /> + <option name="presentableId" value="LOCAL-00018" /> + <option name="project" value="LOCAL" /> + <updated>1509071255017</updated> + </task> + <task id="LOCAL-00019" summary="���������������������"> + <created>1509083891003</created> + <option name="number" value="00019" /> + <option name="presentableId" value="LOCAL-00019" /> + <option name="project" value="LOCAL" /> + <updated>1509083891003</updated> + </task> + <task id="LOCAL-00020" summary="���������������������"> + <created>1509084804781</created> + <option name="number" value="00020" /> + <option name="presentableId" value="LOCAL-00020" /> + <option name="project" value="LOCAL" /> + <updated>1509084804781</updated> + </task> + <task id="LOCAL-00021" summary="���������������������"> + <created>1509088852950</created> + <option name="number" value="00021" /> + <option name="presentableId" value="LOCAL-00021" /> + <option name="project" value="LOCAL" /> + <updated>1509088852950</updated> + </task> + <option name="localTasksCounter" value="22" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="6335000" /> + <option name="totallyTimeSpent" value="66781000" /> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1404" height="877" extended-state="6" /> + <frame x="-1920" y="23" width="1920" height="1057" extended-state="6" /> <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="3" side_tool="false" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.7378517" sideWeight="0.51468426" order="8" side_tool="true" content_ui="tabs" /> + <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32893288" sideWeight="0.49706313" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Maven Projects" 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="Capture Tool" 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="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="3" side_tool="false" content_ui="tabs" /> + <window_info id="Database" 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="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2496329" sideWeight="0.5" order="1" 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.25" sideWeight="0.5" order="1" 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="4" 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.39897698" sideWeight="0.5" order="4" 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.33" sideWeight="0.5" order="9" 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.32992327" sideWeight="0.49706313" order="1" 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" /> <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="7" 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="13" 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="6" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.50293684" order="8" side_tool="true" content_ui="tabs" /> - <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49706313" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Maven Projects" 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.6662404" sideWeight="0.49706313" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.6912682" sideWeight="0.4853157" order="3" 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.32992327" sideWeight="0.48237884" order="10" 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="11" 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="12" side_tool="false" content_ui="tabs" /> - <window_info id="Capture Tool" 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="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="3" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18795888" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14589989" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <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="5" side_tool="true" content_ui="tabs" /> - <window_info id="Database" 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="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" 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.25" sideWeight="0.5" order="1" 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="4" 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" /> - <window_info id="Debug" 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="4" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" 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="6" side_tool="true" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Message" 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="2" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49706313" order="1" 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="7" side_tool="false" 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="5" side_tool="false" 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.32992327" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="TypeScriptGeneratedFilesManager"> <option name="version" value="1" /> + </component> + <component name="Vcs.Log.History.Properties"> + <option name="COLUMN_ORDER"> + <list> + <option value="0" /> + <option value="2" /> + <option value="3" /> + <option value="1" /> + </list> + </option> </component> <component name="Vcs.Log.Tabs.Properties"> <option name="TAB_STATES"> @@ -401,112 +741,35 @@ <option name="myLimit" value="2678400000" /> </component> <component name="VcsManagerConfiguration"> - <MESSAGE value="updates" /> <MESSAGE value="������task������������" /> <MESSAGE value="������app������������������" /> - <option name="LAST_COMMIT_MESSAGE" value="������app������������������" /> + <MESSAGE value="BUG-058" /> + <MESSAGE value="������������������" /> + <MESSAGE value="updates" /> + <MESSAGE value="������������" /> + <MESSAGE value="RabbitMQ & Redis ������" /> + <MESSAGE value="������������" /> + <MESSAGE value="���������������������" /> + <option name="LAST_COMMIT_MESSAGE" value="���������������������" /> </component> <component name="XDebuggerManager"> - <breakpoint-manager /> + <breakpoint-manager> + <option name="time" value="1" /> + </breakpoint-manager> <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.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" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/ApiService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="480"> - <caret line="43" column="31" lean-forward="false" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/ApiService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="495"> - <caret line="43" column="31" lean-forward="false" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="3780"> - <caret line="274" column="36" lean-forward="true" selection-start-line="274" selection-start-column="36" selection-end-line="274" selection-end-column="36" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.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" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1380"> - <caret line="113" column="41" lean-forward="false" selection-start-line="113" selection-start-column="34" selection-end-line="113" selection-end-column="41" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/VerificationCodeController.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" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/apientity/ApiEquipment.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/ApiDao.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/LoginFilter.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="120"> - <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" /> + <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/EquipmentCheck.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/JsonData.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="104"> - <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/webapp/bootbox/bootbox.min.js"> - <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" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ApiDao.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-1052"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/DashboardDao.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-2"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/application.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-210"> - <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 relative-caret-position="135"> + <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> </state> </provider> </entry> @@ -519,8 +782,44 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis.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" /> + <state relative-caret-position="60"> + <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Go.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="134"> + <caret line="13" column="34" lean-forward="true" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Login.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-72"> + <caret line="60" column="0" lean-forward="true" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MonitorPointController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="309"> + <caret line="100" column="5" lean-forward="true" selection-start-line="100" selection-start-column="5" selection-end-line="100" selection-end-column="5" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/MessageNotice.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="160"> + <caret line="20" column="60" lean-forward="false" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="60" /> + </state> + </provider> + </entry> + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-context/4.3.7.RELEASE/spring-context-4.3.7.RELEASE.jar!/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.class"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="145" column="0" lean-forward="false" selection-start-line="145" selection-start-column="0" selection-end-line="145" selection-end-column="0" /> </state> </provider> </entry> @@ -531,181 +830,469 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/EchoServerHandler.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/MonitorpointServiceImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> + <state relative-caret-position="135"> + <caret line="17" column="8" lean-forward="false" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/EchoServer.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> + <state relative-caret-position="479"> + <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/EchoClientHandler.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/MgrService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> + <state relative-caret-position="96"> + <caret line="13" column="25" lean-forward="true" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/test/java/EchoClient.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/ApiData.java"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="75"> + <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/DashboardService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="57"> <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MonitorPointController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/RedisDao.java" /> + <entry file="file://$PROJECT_DIR$/src/main/resources/application.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="394"> - <caret line="100" column="5" lean-forward="true" selection-start-line="100" selection-start-column="5" selection-end-line="100" selection-end-column="5" /> + <state relative-caret-position="567"> + <caret line="49" column="35" lean-forward="true" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" /> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ScreenApiController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisManager.java" /> + <entry file="file://$PROJECT_DIR$/src/main/resources/database.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="780"> - <caret line="62" column="38" lean-forward="false" selection-start-line="62" selection-start-column="38" selection-end-line="62" selection-end-column="38" /> + <state relative-caret-position="32"> + <caret line="8" column="57" lean-forward="false" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="57" /> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/UserController.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Captcha.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="270"> - <caret line="18" column="31" lean-forward="true" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" /> + <state relative-caret-position="345"> + <caret line="30" column="44" lean-forward="false" selection-start-line="30" selection-start-column="44" selection-end-line="30" selection-end-column="44" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/VerificationCodeController.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/redis-config.properties"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-209"> - <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> + <state relative-caret-position="105"> + <caret line="7" column="23" lean-forward="false" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="23" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MgrController.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="120"> - <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Go.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="144"> - <caret line="14" column="41" lean-forward="false" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="41" /> + <state relative-caret-position="345"> + <caret line="23" column="36" lean-forward="false" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="36" /> + <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/EquController.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="118"> + <state relative-caret-position="61"> <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-amqp/1.6.3.RELEASE/spring-amqp-1.6.3.RELEASE.jar!/org/springframework/amqp/core/MessageListener.class"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="7" column="32" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="32" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.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/rabbitmq.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-127"> - <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/test/java/Tmap.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="210"> - <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/webapp/login.jsp"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-297"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/LoginDao.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" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/Crypto.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" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/LoginDao.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="120"> - <caret line="8" column="24" lean-forward="false" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="24" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/LoginService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="180"> - <caret line="17" column="59" lean-forward="false" selection-start-line="17" selection-start-column="59" selection-end-line="17" selection-end-column="59" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Login.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="354"> - <caret line="50" column="38" lean-forward="false" selection-start-line="50" selection-start-column="38" selection-end-line="50" selection-end-column="38" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/database.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" /> + <state relative-caret-position="129"> + <caret line="31" column="25" lean-forward="false" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/ApiService.java"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="495"> - <caret line="43" column="31" lean-forward="false" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" /> + <state relative-caret-position="95"> + <caret line="17" column="13" lean-forward="true" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java"> + <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.39/fastjson-1.2.39.jar!/com/alibaba/fastjson/JSON.class"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-3586"> - <caret line="95" column="0" lean-forward="true" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" /> + <state relative-caret-position="90"> + <caret line="48" column="22" lean-forward="false" selection-start-line="48" selection-start-column="22" selection-end-line="48" selection-end-column="22" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/ApiDao.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="315"> + <caret line="27" column="15" lean-forward="false" selection-start-line="27" selection-start-column="11" selection-end-line="27" selection-end-column="15" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/apientity/Report.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="75"> + <caret line="5" column="19" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="19" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="16" column="47" lean-forward="false" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="47" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/job/Adjust.java" /> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/src.zip!/java/util/Map.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="173"> + <caret line="211" column="6" lean-forward="false" selection-start-line="211" selection-start-column="6" selection-end-line="211" selection-end-column="6" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/Test.java" /> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="75"> + <caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> + <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="210"> - <caret line="14" column="78" lean-forward="false" selection-start-line="14" selection-start-column="78" selection-end-line="14" selection-end-column="78" /> + <state relative-caret-position="261"> + <caret line="203" column="38" lean-forward="false" selection-start-line="203" selection-start-column="38" selection-end-line="203" selection-end-column="38" /> <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Tomq.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="345"> + <caret line="29" column="106" lean-forward="false" selection-start-line="29" selection-start-column="50" selection-end-line="29" selection-end-column="106" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="150"> + <caret line="80" column="0" lean-forward="true" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/test/java/Test.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="30"> + <caret line="8" column="19" lean-forward="false" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ApiDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="164"> + <caret line="39" column="13" lean-forward="true" selection-start-line="37" selection-start-column="4" selection-end-line="39" selection-end-column="13" /> + <folding> + <marker date="1507622125000" expanded="true" signature="339:380" ph="select * fro... equipment" /> + <marker date="1507622125000" expanded="true" signature="449:562" ph="UPDATE equip... " /> + <marker date="1507622125000" expanded="true" signature="627:769" ph="INSERT INTO equipment... " /> + <marker date="1507622125000" expanded="true" signature="908:969" ph="SELECT * fro... user" /> + <marker date="1507622125000" expanded="true" signature="1107:1162" ph="SELECT * fro... user" /> + <marker date="1507622125000" expanded="true" signature="1224:1271" ph="UPDATE `user... " /> + <marker date="1507622125000" expanded="true" signature="1430:1473" ph="select * fro... user" /> + <marker date="1507622125000" expanded="true" signature="1550:1596" ph="UPDATE `user... " /> + <marker date="1507622125000" expanded="true" signature="1745:1807" ph="select * fro... equipment" /> + <marker date="1507622125000" expanded="true" signature="2793:2831" ph="select * fro... equipment" /> + <marker date="1507622125000" expanded="true" signature="2958:2991" ph="select * fro... user" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="345"> + <caret line="23" column="50" lean-forward="false" selection-start-line="23" selection-start-column="50" selection-end-line="23" selection-end-column="50" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Critical.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="75"> + <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="360"> + <caret line="24" column="28" lean-forward="false" selection-start-line="24" selection-start-column="28" selection-end-line="24" selection-end-column="28" /> + <folding> + <element signature="e#385#386#0" expanded="true" /> + <element signature="e#422#423#0" expanded="true" /> + <element signature="e#450#451#0" expanded="true" /> + <element signature="e#481#482#0" expanded="true" /> + <element signature="e#508#509#0" expanded="true" /> + <element signature="e#548#549#0" expanded="true" /> + <element signature="e#580#581#0" expanded="true" /> + <element signature="e#613#614#0" expanded="true" /> + <element signature="e#642#643#0" expanded="true" /> + <element signature="e#686#687#0" expanded="true" /> + <element signature="e#722#723#0" expanded="true" /> + <element signature="e#760#761#0" expanded="true" /> + <element signature="e#794#795#0" expanded="true" /> + <element signature="e#848#849#0" expanded="true" /> + <element signature="e#894#895#0" expanded="true" /> + <element signature="e#928#929#0" expanded="true" /> + <element signature="e#958#959#0" expanded="true" /> + <element signature="e#1004#1005#0" expanded="true" /> + <element signature="e#1042#1043#0" expanded="true" /> + <element signature="e#1074#1075#0" expanded="true" /> + <element signature="e#1102#1103#0" expanded="true" /> + <element signature="e#1144#1145#0" expanded="true" /> + <element signature="e#1178#1179#0" expanded="true" /> + <element signature="e#1210#1211#0" expanded="true" /> + <element signature="e#1238#1239#0" expanded="true" /> + <element signature="e#1280#1281#0" expanded="true" /> + <element signature="e#1314#1315#0" expanded="true" /> + <element signature="e#1346#1347#0" expanded="true" /> + <element signature="e#1374#1375#0" expanded="true" /> + <element signature="e#1416#1417#0" expanded="true" /> + <element signature="e#1450#1451#0" expanded="true" /> + <element signature="e#1483#1484#0" expanded="true" /> + <element signature="e#1511#1512#0" expanded="true" /> + <element signature="e#1554#1555#0" expanded="true" /> + <element signature="e#1588#1589#0" expanded="true" /> + <element signature="e#1618#1619#0" expanded="true" /> + <element signature="e#1644#1645#0" expanded="true" /> + <element signature="e#1682#1683#0" expanded="true" /> + <element signature="e#1712#1713#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaskDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="4" column="30" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="30" /> + <folding> + <marker date="1507622125000" expanded="true" signature="241:300" ph="insert into logger... " /> + <marker date="1507622125000" expanded="true" signature="356:450" ph="insert into history... " /> + <marker date="1507622125000" expanded="true" signature="552:603" ph="select * fro... state" /> + <marker date="1507622125000" expanded="true" signature="675:736" ph="DELETE FROM " /> + <marker date="1507622125000" expanded="true" signature="838:934" ph="insert into state... " /> + <marker date="1507622125000" expanded="true" signature="1031:1105" ph="update state... " /> + <marker date="1507622125000" expanded="true" signature="1218:1628" ph="select mac.*... mac" /> + <marker date="1507622125000" expanded="true" signature="1756:2026" ph="select user.... notice" /> + <marker date="1507622125000" expanded="true" signature="2158:2195" ph="select * fro... sensor" /> + <marker date="1507622125000" expanded="true" signature="2328:2368" ph="select * fro... equipment" /> + <marker date="1507622125000" expanded="true" signature="2428:2621" ph="insert into alarmlog... " /> + <marker date="1507622125000" expanded="true" signature="2681:2902" ph="insert into noticelog... " /> + <marker date="1507622125000" expanded="true" signature="2965:3011" ph="update equip... " /> + <marker date="1507622125000" expanded="true" signature="3142:3216" ph="select * fro... alarmlog" /> + <marker date="1507622125000" expanded="true" signature="3327:3360" ph="SELECT * fro... state" /> + <marker date="1507622125000" expanded="true" signature="3449:3511" ph="select logge... logger" /> + <marker date="1507622125000" expanded="true" signature="3638:3737" ph="SELECT * fro... noticelog" /> + <marker date="1507622125000" expanded="true" signature="3799:3907" ph="insert into offlinelog... " /> + <marker date="1507622125000" expanded="true" signature="4041:4075" ph="select * fro... mac" /> + <marker date="1507622125000" expanded="true" signature="4195:4297" ph="select * fro... alarmlog" /> + <marker date="1507622125000" expanded="true" signature="4379:4444" ph="update alarm... " /> + <marker date="1507622125000" expanded="true" signature="4558:4624" ph="select * fro... noticelog" /> + <marker date="1507622125000" expanded="true" signature="4744:4778" ph="select * fro... user" /> + <marker date="1507622125000" expanded="true" signature="4861:4914" ph="UPDATE notic... " /> + <marker date="1507622125000" expanded="true" signature="5070:5107" ph="SELECT * fro... state" /> + <marker date="1507622125000" expanded="true" signature="5227:5261" ph="select * fro... mac" /> + <marker date="1507622125000" expanded="true" signature="5364:5386" ph="select * fro... critical" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/TaskDao.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="164"> + <caret line="26" column="21" lean-forward="true" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="289"> + <caret line="137" column="5" lean-forward="true" selection-start-line="133" selection-start-column="4" selection-end-line="137" selection-end-column="5" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#2778#2796#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="410"> + <caret line="260" column="48" lean-forward="false" selection-start-line="260" selection-start-column="48" selection-end-line="260" selection-end-column="48" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="15" column="33" lean-forward="false" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="33" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="372"> + <caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" /> + <folding> + <marker date="1509091122000" expanded="true" signature="504:736" ph="select c.mac... equipment" /> + <marker date="1509091122000" expanded="true" signature="795:841" ph="UPDATE equip... " /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="359" column="33" lean-forward="true" selection-start-line="359" selection-start-column="33" selection-end-line="359" selection-end-column="33" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="270"> + <caret line="18" column="28" lean-forward="false" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" /> + <folding> + <element signature="e#297#298#0" expanded="true" /> + <element signature="e#334#335#0" expanded="true" /> + <element signature="e#362#363#0" expanded="true" /> + <element signature="e#392#393#0" expanded="true" /> + <element signature="e#418#419#0" expanded="true" /> + <element signature="e#456#457#0" expanded="true" /> + <element signature="e#486#487#0" expanded="true" /> + <element signature="e#519#520#0" expanded="true" /> + <element signature="e#548#549#0" expanded="true" /> + <element signature="e#592#593#0" expanded="true" /> + <element signature="e#628#629#0" expanded="true" /> + <element signature="e#662#663#0" expanded="true" /> + <element signature="e#692#693#0" expanded="true" /> + <element signature="e#738#739#0" expanded="true" /> + <element signature="e#776#777#0" expanded="true" /> + <element signature="e#812#813#0" expanded="true" /> + <element signature="e#844#845#0" expanded="true" /> + <element signature="e#894#895#0" expanded="true" /> + <element signature="e#936#937#0" expanded="true" /> + <element signature="e#965#966#0" expanded="true" /> + <element signature="e#992#993#0" expanded="true" /> + <element signature="e#1030#1031#0" expanded="true" /> + <element signature="e#1062#1063#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="308"> + <caret line="101" column="39" lean-forward="false" selection-start-line="101" selection-start-column="39" selection-end-line="101" selection-end-column="39" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#3225#3234#0" expanded="true" /> + <element signature="e#4082#4097#0" expanded="true" /> + </folding> </state> </provider> </entry> </component> <component name="masterDetails"> <states> + <state key="ArtifactsStructureConfigurable.UI"> + <settings> + <artifact-editor /> + <last-edited>task:war</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + <option value="0.5" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="FacetStructureConfigurable.UI"> + <settings> + <last-edited>Spring</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="GlobalLibrariesConfigurable.UI"> + <settings> + <last-edited>scala-sdk-2.11.8</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="JdkListConfigurable.UI"> + <settings> + <last-edited>1.8</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> + <state key="ModuleStructureConfigurable.UI"> + <settings> + <last-edited>task</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.17633136" /> + <option value="0.6" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> <state key="ProjectJDKs.UI"> <settings> <last-edited>1.8</last-edited> @@ -718,6 +1305,18 @@ </splitter-proportions> </settings> </state> + <state key="ProjectLibrariesConfigurable.UI"> + <settings> + <last-edited>lib</last-edited> + <splitter-proportions> + <option name="proportions"> + <list> + <option value="0.2" /> + </list> + </option> + </splitter-proportions> + </settings> + </state> </states> </component> </project> \ No newline at end of file -- Gitblit v1.8.0