From dcfb00147652281100f1012c8f5e01a63add8b3e Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Thu, 02 Nov 2017 09:05:03 +0800 Subject: [PATCH] 关闭log --- .idea/workspace.xml | 1045 +++++++++++++++++++++++++++------------------------------ 1 files changed, 502 insertions(+), 543 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8bddd0c..f295661 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,10 +8,7 @@ <component name="ChangeListManager"> <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$/src/main/java/com/moral/monitor/entity/Sensor.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.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/log4j.properties" afterPath="$PROJECT_DIR$/src/main/resources/log4j.properties" /> </list> <ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/target/" /> @@ -23,159 +20,12 @@ <option name="LAST_RESOLUTION" value="IGNORE" /> </component> <component name="FileEditorManager"> - <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="15"> - <caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="51" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="true" /> - <element signature="e#3639#3654#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Sensor.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java"> + <leaf> + <file leaf-file-name="log4j.properties" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties"> <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> - </file> - <file leaf-file-name="Listener.java" pinned="false" current-in-tab="false"> - <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> - </file> - <file leaf-file-name="MonitorListener.java" pinned="false" current-in-tab="false"> - <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="388"> - <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> - </file> - <file leaf-file-name="TaskDao.java" pinned="false" current-in-tab="false"> - <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> - </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="360"> - <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" /> - <folding> - <marker date="1509088442000" expanded="true" signature="504:736" ph="select c.mac... equipment" /> - <marker date="1509088442000" expanded="true" signature="795:841" ph="UPDATE equip... " /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="TaskDao.xml" pinned="false" current-in-tab="false"> - <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> - </file> - <file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="false"> - <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" /> + <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="28" selection-end-column="38" /> <folding /> </state> </provider> @@ -207,8 +57,17 @@ <find>updateequipmentstate</find> <find>insertTostate</find> <find>selectFromsensorByver</find> - <find>logger</find> <find>insertTologger</find> + <find>logger</find> + <find>MethodInvokingJobDetailFactoryBean</find> + <find>getLoggerByMac</find> + <find>findAdjustByMac</find> + <find>RedisUtil</find> + <find>adjust_key</find> + <find>mongo-client</find> + <find>mongo</find> + <find>monitors_storage_data2</find> + <find>System.out</find> </findStrings> </component> <component name="Git.Settings"> @@ -229,26 +88,34 @@ <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/java/com/moral/monitor/dao/JobDao.java" /> - <option value="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" /> - <option value="$PROJECT_DIR$/src/main/resources/mapper/JobDao.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/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/quartz/StateCheck.java" /> + <option value="$PROJECT_DIR$/src/main/resources/quartz.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java" /> + <option value="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" /> + <option value="$PROJECT_DIR$/src/main/resources/alarmLevles.json" /> + <option value="$PROJECT_DIR$/pom.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/mongodb-config.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/application.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/mongodb.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/redis.xml" /> <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" /> + <option value="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/log4j.properties" /> </list> </option> </component> @@ -265,7 +132,7 @@ <option name="FILTER_DEBUG" value="true" /> <option name="CUSTOM_FILTER" /> </component> - <component name="ProjectFrameBounds"> + <component name="ProjectFrameBounds" extendedState="6"> <option name="y" value="23" /> <option name="width" value="1404" /> <option name="height" value="877" /> @@ -286,6 +153,10 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="Scratches" /> + <pane id="Scope" /> + <pane id="AndroidView" /> + <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <expand> @@ -293,14 +164,28 @@ <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="resources" 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"> @@ -535,7 +420,29 @@ <workItem from="1509030446574" duration="3006000" /> <workItem from="1509056858319" duration="2984000" /> <workItem from="1509068025499" duration="9340000" /> - <workItem from="1509085973276" duration="2841000" /> + <workItem from="1509085973276" duration="5136000" /> + <workItem from="1509095479339" duration="556000" /> + <workItem from="1509260666213" duration="7007000" /> + <workItem from="1509323536772" duration="246000" /> + <workItem from="1509324410295" duration="1870000" /> + <workItem from="1509333094656" duration="2064000" /> + <workItem from="1509340273222" duration="289000" /> + <workItem from="1509342471423" duration="606000" /> + <workItem from="1509345416231" duration="1279000" /> + <workItem from="1509347613575" duration="862000" /> + <workItem from="1509350802361" duration="22000" /> + <workItem from="1509354408888" duration="659000" /> + <workItem from="1509413389170" duration="529000" /> + <workItem from="1509419050523" duration="504000" /> + <workItem from="1509419662964" duration="551000" /> + <workItem from="1509421142471" duration="5126000" /> + <workItem from="1509503776436" duration="416000" /> + <workItem from="1509507731791" duration="3149000" /> + <workItem from="1509542138760" duration="1615000" /> + <workItem from="1509568770062" duration="2165000" /> + <workItem from="1509578672500" duration="448000" /> + <workItem from="1509583522110" duration="175000" /> + <workItem from="1509584069292" duration="531000" /> </task> <task id="LOCAL-00001" summary="updates"> <created>1508484578874</created> @@ -677,46 +584,172 @@ <option name="project" value="LOCAL" /> <updated>1509084804781</updated> </task> - <option name="localTasksCounter" value="21" /> + <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> + <task id="LOCAL-00022" summary="���������������������������"> + <created>1509091232558</created> + <option name="number" value="00022" /> + <option name="presentableId" value="LOCAL-00022" /> + <option name="project" value="LOCAL" /> + <updated>1509091232558</updated> + </task> + <task id="LOCAL-00023" summary="������������"> + <created>1509265063354</created> + <option name="number" value="00023" /> + <option name="presentableId" value="LOCAL-00023" /> + <option name="project" value="LOCAL" /> + <updated>1509265063354</updated> + </task> + <task id="LOCAL-00024" summary="������������"> + <created>1509265555027</created> + <option name="number" value="00024" /> + <option name="presentableId" value="LOCAL-00024" /> + <option name="project" value="LOCAL" /> + <updated>1509265555027</updated> + </task> + <task id="LOCAL-00025" summary="������������"> + <created>1509265660083</created> + <option name="number" value="00025" /> + <option name="presentableId" value="LOCAL-00025" /> + <option name="project" value="LOCAL" /> + <updated>1509265660083</updated> + </task> + <task id="LOCAL-00026" summary="������������"> + <created>1509265945799</created> + <option name="number" value="00026" /> + <option name="presentableId" value="LOCAL-00026" /> + <option name="project" value="LOCAL" /> + <updated>1509265945799</updated> + </task> + <task id="LOCAL-00027" summary="������������"> + <created>1509269196884</created> + <option name="number" value="00027" /> + <option name="presentableId" value="LOCAL-00027" /> + <option name="project" value="LOCAL" /> + <updated>1509269196884</updated> + </task> + <task id="LOCAL-00028" summary="������������"> + <created>1509343407506</created> + <option name="number" value="00028" /> + <option name="presentableId" value="LOCAL-00028" /> + <option name="project" value="LOCAL" /> + <updated>1509343407506</updated> + </task> + <task id="LOCAL-00029" summary="������������"> + <created>1509346782831</created> + <option name="number" value="00029" /> + <option name="presentableId" value="LOCAL-00029" /> + <option name="project" value="LOCAL" /> + <updated>1509346782831</updated> + </task> + <task id="LOCAL-00030" summary="������������"> + <created>1509347681702</created> + <option name="number" value="00030" /> + <option name="presentableId" value="LOCAL-00030" /> + <option name="project" value="LOCAL" /> + <updated>1509347681702</updated> + </task> + <task id="LOCAL-00031" summary="������������"> + <created>1509347817107</created> + <option name="number" value="00031" /> + <option name="presentableId" value="LOCAL-00031" /> + <option name="project" value="LOCAL" /> + <updated>1509347817107</updated> + </task> + <task id="LOCAL-00032" summary="������������������������"> + <created>1509503829871</created> + <option name="number" value="00032" /> + <option name="presentableId" value="LOCAL-00032" /> + <option name="project" value="LOCAL" /> + <updated>1509503829871</updated> + </task> + <task id="LOCAL-00033" summary="������������������"> + <created>1509507788985</created> + <option name="number" value="00033" /> + <option name="presentableId" value="LOCAL-00033" /> + <option name="project" value="LOCAL" /> + <updated>1509507788985</updated> + </task> + <task id="LOCAL-00034" summary="������������������"> + <created>1509517348407</created> + <option name="number" value="00034" /> + <option name="presentableId" value="LOCAL-00034" /> + <option name="project" value="LOCAL" /> + <updated>1509517348407</updated> + </task> + <task id="LOCAL-00035" summary="���������������������mongodb"> + <created>1509570832801</created> + <option name="number" value="00035" /> + <option name="presentableId" value="LOCAL-00035" /> + <option name="project" value="LOCAL" /> + <updated>1509570832801</updated> + </task> + <task id="LOCAL-00036" summary="updates"> + <created>1509578813467</created> + <option name="number" value="00036" /> + <option name="presentableId" value="LOCAL-00036" /> + <option name="project" value="LOCAL" /> + <updated>1509578813467</updated> + </task> + <task id="LOCAL-00037" summary="updates"> + <created>1509579020352</created> + <option name="number" value="00037" /> + <option name="presentableId" value="LOCAL-00037" /> + <option name="project" value="LOCAL" /> + <updated>1509579020352</updated> + </task> + <task id="LOCAL-00038" summary="������log"> + <created>1509583681609</created> + <option name="number" value="00038" /> + <option name="presentableId" value="LOCAL-00038" /> + <option name="project" value="LOCAL" /> + <updated>1509583681610</updated> + </task> + <option name="localTasksCounter" value="39" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="65245000" /> + <option name="totallyTimeSpent" value="98209000" /> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1404" height="877" extended-state="0" /> + <frame x="0" y="23" width="1404" height="877" 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="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.51615274" 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="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.0" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3375959" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.54092073" sideWeight="0.48235294" 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.40537083" sideWeight="0.4838473" 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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20117474" 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.23274596" 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="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" /> <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="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.32992327" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="TypeScriptGeneratedFilesManager"> @@ -766,12 +799,18 @@ <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="���������������������" /> + <MESSAGE value="���������������������������" /> + <MESSAGE value="������������" /> + <MESSAGE value="������������������������" /> + <MESSAGE value="������������������" /> + <MESSAGE value="������������������" /> + <MESSAGE value="���������������������mongodb" /> + <MESSAGE value="updates" /> + <MESSAGE value="������log" /> + <option name="LAST_COMMIT_MESSAGE" value="������log" /> </component> <component name="XDebuggerManager"> <breakpoint-manager> @@ -780,209 +819,6 @@ <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/DateConvert.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="105"> - <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> - </provider> - </entry> - <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="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/util/JsonData.java"> - <provider selected="true" editor-type-id="text-editor"> - <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> - <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties"> - <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/mybatis.xml"> - <provider selected="true" editor-type-id="text-editor"> - <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> - <entry file="file://$PROJECT_DIR$/src/main/resources/sysConfig.properties"> - <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/impl/MonitorpointServiceImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <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/main/java/com/moral/monitor/entity/MonitorPoint.java"> - <provider selected="true" editor-type-id="text-editor"> - <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/main/java/com/moral/monitor/service/MgrService.java"> - <provider selected="true" editor-type-id="text-editor"> - <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/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/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="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/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="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/listener/message/Captcha.java"> - <provider selected="true" editor-type-id="text-editor"> - <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/resources/redis-config.properties"> - <provider selected="true" editor-type-id="text-editor"> - <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/resources/redis.xml"> - <provider selected="true" editor-type-id="text-editor"> - <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/Dashboard.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="135"> - <caret line="22" column="24" lean-forward="true" selection-start-line="22" selection-start-column="24" selection-end-line="22" selection-end-column="24" /> - </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="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="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="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="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="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"> @@ -1002,38 +838,14 @@ <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="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> @@ -1044,38 +856,10 @@ </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="135"> - <caret line="12" column="32" lean-forward="false" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" /> - </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> @@ -1083,7 +867,6 @@ <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> @@ -1091,102 +874,6 @@ <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/java/com/moral/monitor/listener/MonitorListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="388"> - <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/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/resources/mapper/JobDao.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="360"> - <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" /> - <folding> - <marker date="1509088442000" expanded="true" signature="504:736" ph="select c.mac... equipment" /> - <marker date="1509088442000" expanded="true" signature="795:841" ph="UPDATE equip... " /> - </folding> </state> </provider> </entry> @@ -1194,7 +881,6 @@ <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> @@ -1202,24 +888,297 @@ <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/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" /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/src.zip!/java/lang/String.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="311"> + <caret line="110" column="19" lean-forward="false" selection-start-line="110" selection-start-column="19" selection-end-line="110" selection-end-column="19" /> + </state> + </provider> + </entry> + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/1.6.3.RELEASE/spring-rabbit-1.6.3.RELEASE.jar!/org/springframework/amqp/rabbit/core/RabbitTemplate.class"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="246"> + <caret line="424" column="32" lean-forward="false" selection-start-line="424" selection-start-column="32" selection-end-line="424" selection-end-column="32" /> + </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="-242"> + <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="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/EquipmentCheck.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="135"> + <caret line="34" column="25" lean-forward="true" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="25" /> + </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="59"> + <caret line="4" column="30" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="30" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/QueryHelper.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/entity/Equipment.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/EquDao.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" /> + </state> + </provider> + </entry> + <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/src.zip!/java/util/Calendar.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="251"> + <caret line="1753" column="22" lean-forward="false" selection-start-line="1753" selection-start-column="22" selection-end-line="1753" selection-end-column="22" /> + </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="120"> + <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/resources/mapper/EquDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="420"> + <caret line="28" column="41" lean-forward="false" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="41" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Logger.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="11" column="16" lean-forward="false" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="16" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/utils/HttpRequester.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="105"> + <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/utils/HttpRespons.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="120"> + <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> + </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="691"> + <caret line="94" column="55" lean-forward="true" selection-start-line="94" selection-start-column="55" selection-end-line="94" selection-end-column="55" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="225"> + <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" /> + </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="105"> + <caret line="13" column="65" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="65" /> + </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="120"> + <caret line="8" column="62" lean-forward="false" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" /> + </state> + </provider> + </entry> + <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="150"> + <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/alarmLevles.json"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-711"> + <caret line="23" column="20" lean-forward="false" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" /> + </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" /> + </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="210"> + <caret line="14" column="26" lean-forward="false" selection-start-line="14" selection-start-column="26" selection-end-line="14" selection-end-column="26" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/ScreenServiceImpl.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/resources/mapper/HistoryEntityMapper.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="176"> + <caret line="219" column="18" lean-forward="true" selection-start-line="219" selection-start-column="18" selection-end-line="219" selection-end-column="18" /> + </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="307"> + <caret line="88" column="14" lean-forward="false" selection-start-line="88" selection-start-column="14" selection-end-line="88" selection-end-column="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/EquipmentServiceImpl.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$/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="115"> + <caret line="220" column="24" lean-forward="false" selection-start-line="220" selection-start-column="21" selection-end-line="220" selection-end-column="24" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.0.RELEASE/spring-data-mongodb-2.0.0.RELEASE.jar!/org/springframework/data/mongodb/config/spring-mongo-2.0.xsd"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="225"> + <caret line="15" column="35" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="35" /> + </state> + </provider> + </entry> + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.0.RELEASE/spring-data-mongodb-2.0.0.RELEASE.jar!/org/springframework/data/mongodb/core/MongoTemplate.class"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="463"> + <caret line="166" column="69" lean-forward="false" selection-start-line="166" selection-start-column="57" selection-end-line="166" selection-end-column="69" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="11" column="84" lean-forward="false" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="84" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/redis-config.properties"> + <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/mongodb-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="15"> + <caret line="1" column="10" lean-forward="false" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" /> </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="15"> - <caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="51" selection-end-column="0" /> + <state relative-caret-position="122"> + <caret line="70" column="9" lean-forward="false" selection-start-line="68" selection-start-column="65" selection-end-line="70" selection-end-column="9" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-141"> + <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="9" selection-end-column="88" /> <folding> - <element signature="imports" expanded="true" /> - <element signature="e#3639#3654#0" expanded="true" /> + <element signature="e#804#822#0" expanded="true" /> + <element signature="e#871#889#0" expanded="true" /> + <element signature="e#937#960#0" expanded="true" /> + <element signature="e#1116#1131#0" expanded="true" /> + <element signature="e#1139#1154#0" expanded="true" /> + <element signature="e#1166#1181#0" expanded="true" /> </folding> </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="604"> + <caret line="80" column="51" lean-forward="false" selection-start-line="80" selection-start-column="49" selection-end-line="80" selection-end-column="51" /> + <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="132"> + <caret line="19" column="12" lean-forward="false" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" /> + <folding /> + </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="-3"> + <caret line="22" column="58" lean-forward="false" selection-start-line="22" selection-start-column="58" selection-end-line="22" selection-end-column="58" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="360"> + <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="28" selection-end-column="38" /> + <folding /> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states> -- Gitblit v1.8.0