From 03cdc1111aa07041d635840eb30433cbb980accf Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Wed, 28 Feb 2018 16:44:48 +0800 Subject: [PATCH] test --- .idea/workspace.xml | 1514 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 866 insertions(+), 648 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8bddd0c..3924e51 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,12 +6,10 @@ </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="test"> <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/spring/rabbitmq.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" /> </list> <ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/target/" /> @@ -27,155 +25,31 @@ <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" /> + <state relative-caret-position="405"> + <caret line="128" column="12" lean-forward="false" selection-start-line="128" selection-start-column="12" selection-end-line="128" selection-end-column="12" /> <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"> - <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" /> + <marker date="1511823786459" expanded="false" signature="6186:6204" ph="<~>" /> + <marker date="1511823786459" expanded="false" signature="7663:7679" ph="<~>" /> </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"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/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" /> + <state relative-caret-position="765"> + <caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="redis-config.properties" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/resources/redis/redis-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="15"> + <caret line="1" column="23" lean-forward="true" selection-start-line="1" selection-start-column="11" selection-end-line="1" selection-end-column="23" /> <folding /> </state> </provider> @@ -193,10 +67,6 @@ </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> @@ -207,8 +77,26 @@ <find>updateequipmentstate</find> <find>insertTostate</find> <find>selectFromsensorByver</find> - <find>logger</find> <find>insertTologger</find> + <find>logger</find> + <find>MethodInvokingJobDetailFactoryBean</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> + <find>getLoggerByMac</find> + <find>getEquStateKey</find> + <find>alarmLevels.json</find> + <find>sysConfig</find> + <find>setAlarmLevles</find> + <find>detEquState</find> + <find>getAllEquipment</find> + <find>setEquState</find> + <find>findEquWithAdjustsByMac</find> + <find>47.96.171.62</find> </findStrings> </component> <component name="Git.Settings"> @@ -224,30 +112,50 @@ <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/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/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/resources/rabbitmq.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/log4j.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/mybatis/mybatis.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/application.xml" /> + <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java" /> + <option value="$PROJECT_DIR$/src/test/java/Test.java" /> + <option value="$PROJECT_DIR$/src/main/resources/system/alarmLevels.json" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ScreenController.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/quartz.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/mongodb.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" /> + <option value="$PROJECT_DIR$/src/main/resources/mongodb/mongodb-config.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/rabbitmq/rabbit-config.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/redis/redis-config.properties" /> + <option value="$PROJECT_DIR$/src/main/resources/spring/database.xml" /> <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" /> </list> </option> @@ -267,7 +175,7 @@ </component> <component name="ProjectFrameBounds"> <option name="y" value="23" /> - <option name="width" value="1404" /> + <option name="width" value="1406" /> <option name="height" value="877" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> @@ -286,6 +194,8 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="AndroidView" /> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <expand> @@ -293,14 +203,62 @@ <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="listener" 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> + <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" /> + <item name="redis" type="462c0819:PsiDirectoryNode" /> + </path> </expand> <select /> </subPane> </pane> - <pane id="Scratches" /> - <pane id="AndroidView" /> - <pane id="Scope" /> <pane id="PackagesPane" /> + <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> @@ -310,6 +268,7 @@ <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" /> + <property name="settings.editor.selected.configurable" value="configurable.group.editor" /> </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> @@ -505,6 +464,16 @@ </list> </recent_temporary> </component> + <component name="SbtLocalSettings"> + <option name="modificationStamps"> + <map> + <entry key="$USER_HOME$/IdeaProjects/play2" value="1478179325000" /> + </map> + </option> + <option name="externalProjectsViewState"> + <projects_view /> + </option> + </component> <component name="ShelveChangesManager" show_recycled="false"> <option name="remove_strategy" value="false" /> </component> @@ -535,179 +504,482 @@ <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="553000" /> + <workItem from="1509592515461" duration="995000" /> + <workItem from="1509613222546" duration="807000" /> + <workItem from="1509623854080" duration="601000" /> + <workItem from="1509673349569" duration="600000" /> + <workItem from="1509719493079" duration="6000" /> + <workItem from="1509720997599" duration="669000" /> + <workItem from="1509791348403" duration="5998000" /> + <workItem from="1509805487051" duration="2556000" /> + <workItem from="1509851437762" duration="657000" /> + <workItem from="1509938642246" duration="726000" /> + <workItem from="1509946269191" duration="522000" /> + <workItem from="1509957226710" duration="251000" /> + <workItem from="1509957794827" duration="173000" /> + <workItem from="1510014788172" duration="2297000" /> + <workItem from="1510018622224" duration="6054000" /> + <workItem from="1510038694334" duration="1652000" /> + <workItem from="1510054681942" duration="14000" /> + <workItem from="1510054700592" duration="54000" /> + <workItem from="1510055174810" duration="971000" /> + <workItem from="1510356986240" duration="1056000" /> + <workItem from="1510363585918" duration="933000" /> + <workItem from="1510377433075" duration="1355000" /> + <workItem from="1510382937212" duration="1021000" /> + <workItem from="1510386169863" duration="182000" /> + <workItem from="1510486709328" duration="2035000" /> + <workItem from="1510539375498" duration="756000" /> + <workItem from="1510581822672" duration="239000" /> + <workItem from="1510585111681" duration="3229000" /> + <workItem from="1510627531530" duration="208000" /> + <workItem from="1510627773177" duration="2490000" /> + <workItem from="1510646592713" duration="793000" /> + <workItem from="1510666571633" duration="425000" /> + <workItem from="1510672132218" duration="3163000" /> + <workItem from="1510675574562" duration="286000" /> + <workItem from="1510676496066" duration="178000" /> + <workItem from="1510699262988" duration="857000" /> + <workItem from="1510700803433" duration="454000" /> + <workItem from="1510705763364" duration="3849000" /> + <workItem from="1510726840192" duration="2659000" /> + <workItem from="1510754613409" duration="2630000" /> + <workItem from="1510794824346" duration="614000" /> + <workItem from="1510822653893" duration="248000" /> + <workItem from="1510823493365" duration="884000" /> + <workItem from="1510844683201" duration="944000" /> + <workItem from="1510890176891" duration="1154000" /> + <workItem from="1510898440875" duration="5299000" /> + <workItem from="1510968780568" duration="298000" /> + <workItem from="1511011596133" duration="682000" /> + <workItem from="1511146341390" duration="1604000" /> + <workItem from="1511193300540" duration="211000" /> + <workItem from="1511277768228" duration="1928000" /> + <workItem from="1511305802999" duration="640000" /> + <workItem from="1511316811454" duration="335000" /> + <workItem from="1511422805600" duration="24000" /> + <workItem from="1511424509789" duration="3000" /> + <workItem from="1511446704507" duration="554000" /> + <workItem from="1511503116140" duration="1046000" /> + <workItem from="1511568690181" duration="1006000" /> + <workItem from="1511617949269" duration="3557000" /> + <workItem from="1511652670098" duration="3838000" /> + <workItem from="1511668390906" duration="361000" /> + <workItem from="1511670013521" duration="814000" /> + <workItem from="1511675331985" duration="113000" /> + <workItem from="1511675782359" duration="207000" /> + <workItem from="1511750156694" duration="8000" /> + <workItem from="1511787903160" duration="1736000" /> + <workItem from="1511802046145" duration="1014000" /> + <workItem from="1511821626992" duration="488000" /> + <workItem from="1511822418618" duration="999000" /> </task> - <task id="LOCAL-00001" summary="updates"> - <created>1508484578874</created> - <option name="number" value="00001" /> - <option name="presentableId" value="LOCAL-00001" /> + <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>1508484578874</updated> + <updated>1509265945799</updated> </task> - <task id="LOCAL-00002" summary="������task������������"> - <created>1508485049474</created> - <option name="number" value="00002" /> - <option name="presentableId" value="LOCAL-00002" /> + <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>1508485049474</updated> + <updated>1509269196884</updated> </task> - <task id="LOCAL-00003" summary="������app������������������"> - <created>1508490813600</created> - <option name="number" value="00003" /> - <option name="presentableId" value="LOCAL-00003" /> + <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>1508490813600</updated> + <updated>1509343407506</updated> </task> - <task id="LOCAL-00004" summary="updates"> - <created>1508811869390</created> - <option name="number" value="00004" /> - <option name="presentableId" value="LOCAL-00004" /> + <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>1508811869390</updated> + <updated>1509346782831</updated> </task> - <task id="LOCAL-00005" summary="updates"> - <created>1508812121965</created> - <option name="number" value="00005" /> - <option name="presentableId" value="LOCAL-00005" /> + <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>1508812121965</updated> + <updated>1509347681702</updated> </task> - <task id="LOCAL-00006" summary="updates"> - <created>1508814407295</created> - <option name="number" value="00006" /> - <option name="presentableId" value="LOCAL-00006" /> + <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>1508814407295</updated> + <updated>1509347817107</updated> </task> - <task id="LOCAL-00007" summary="updates"> - <created>1508814992465</created> - <option name="number" value="00007" /> - <option name="presentableId" value="LOCAL-00007" /> + <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>1508814992465</updated> + <updated>1509503829871</updated> </task> - <task id="LOCAL-00008" summary="updates"> - <created>1508815251640</created> - <option name="number" value="00008" /> - <option name="presentableId" value="LOCAL-00008" /> + <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>1508815251640</updated> + <updated>1509507788985</updated> </task> - <task id="LOCAL-00009" summary="updates"> - <created>1508815333934</created> - <option name="number" value="00009" /> - <option name="presentableId" value="LOCAL-00009" /> + <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>1508815333934</updated> + <updated>1509517348407</updated> </task> - <task id="LOCAL-00010" summary="updates"> - <created>1508816385719</created> - <option name="number" value="00010" /> - <option name="presentableId" value="LOCAL-00010" /> + <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>1508816385719</updated> + <updated>1509570832801</updated> </task> - <task id="LOCAL-00011" summary="BUG-058"> - <created>1508825226306</created> - <option name="number" value="00011" /> - <option name="presentableId" value="LOCAL-00011" /> + <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>1508825226306</updated> + <updated>1509578813467</updated> </task> - <task id="LOCAL-00012" summary="������������������"> - <created>1508902617619</created> - <option name="number" value="00012" /> - <option name="presentableId" value="LOCAL-00012" /> + <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>1508902617619</updated> + <updated>1509579020352</updated> </task> - <task id="LOCAL-00013" summary="������������������"> - <created>1508920155176</created> - <option name="number" value="00013" /> - <option name="presentableId" value="LOCAL-00013" /> + <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>1508920155177</updated> + <updated>1509583681610</updated> </task> - <task id="LOCAL-00014" summary="updates"> - <created>1508920429528</created> - <option name="number" value="00014" /> - <option name="presentableId" value="LOCAL-00014" /> + <task id="LOCAL-00039" summary="������log"> + <created>1509584703267</created> + <option name="number" value="00039" /> + <option name="presentableId" value="LOCAL-00039" /> <option name="project" value="LOCAL" /> - <updated>1508920429528</updated> + <updated>1509584703267</updated> </task> - <task id="LOCAL-00015" summary="������������"> - <created>1508920850416</created> - <option name="number" value="00015" /> - <option name="presentableId" value="LOCAL-00015" /> + <task id="LOCAL-00040" summary="������������"> + <created>1509593022986</created> + <option name="number" value="00040" /> + <option name="presentableId" value="LOCAL-00040" /> <option name="project" value="LOCAL" /> - <updated>1508920850416</updated> + <updated>1509593022986</updated> </task> - <task id="LOCAL-00016" summary="������������"> - <created>1508987038075</created> - <option name="number" value="00016" /> - <option name="presentableId" value="LOCAL-00016" /> + <task id="LOCAL-00041" summary="������������"> + <created>1509613556708</created> + <option name="number" value="00041" /> + <option name="presentableId" value="LOCAL-00041" /> <option name="project" value="LOCAL" /> - <updated>1508987038075</updated> + <updated>1509613556708</updated> </task> - <task id="LOCAL-00017" summary="RabbitMQ & Redis ������"> - <created>1509061963499</created> - <option name="number" value="00017" /> - <option name="presentableId" value="LOCAL-00017" /> + <task id="LOCAL-00042" summary="������������"> + <created>1509613600724</created> + <option name="number" value="00042" /> + <option name="presentableId" value="LOCAL-00042" /> <option name="project" value="LOCAL" /> - <updated>1509061963500</updated> + <updated>1509613600724</updated> </task> - <task id="LOCAL-00018" summary="���������������������"> - <created>1509071255017</created> - <option name="number" value="00018" /> - <option name="presentableId" value="LOCAL-00018" /> + <task id="LOCAL-00043" summary="������������"> + <created>1509851579748</created> + <option name="number" value="00043" /> + <option name="presentableId" value="LOCAL-00043" /> <option name="project" value="LOCAL" /> - <updated>1509071255017</updated> + <updated>1509851579748</updated> </task> - <task id="LOCAL-00019" summary="���������������������"> - <created>1509083891003</created> - <option name="number" value="00019" /> - <option name="presentableId" value="LOCAL-00019" /> + <task id="LOCAL-00044" summary="������������"> + <created>1509946762076</created> + <option name="number" value="00044" /> + <option name="presentableId" value="LOCAL-00044" /> <option name="project" value="LOCAL" /> - <updated>1509083891003</updated> + <updated>1509946762076</updated> </task> - <task id="LOCAL-00020" summary="���������������������"> - <created>1509084804781</created> - <option name="number" value="00020" /> - <option name="presentableId" value="LOCAL-00020" /> + <task id="LOCAL-00045" summary="������MQ������������"> + <created>1509957305739</created> + <option name="number" value="00045" /> + <option name="presentableId" value="LOCAL-00045" /> <option name="project" value="LOCAL" /> - <updated>1509084804781</updated> + <updated>1509957305739</updated> </task> - <option name="localTasksCounter" value="21" /> + <task id="LOCAL-00046" summary="test ack flag"> + <created>1509957820879</created> + <option name="number" value="00046" /> + <option name="presentableId" value="LOCAL-00046" /> + <option name="project" value="LOCAL" /> + <updated>1509957820879</updated> + </task> + <task id="LOCAL-00047" summary="insert hostory data to mongo"> + <created>1510015691670</created> + <option name="number" value="00047" /> + <option name="presentableId" value="LOCAL-00047" /> + <option name="project" value="LOCAL" /> + <updated>1510015691671</updated> + </task> + <task id="LOCAL-00048" summary="insert hostory data to mongo"> + <created>1510016141890</created> + <option name="number" value="00048" /> + <option name="presentableId" value="LOCAL-00048" /> + <option name="project" value="LOCAL" /> + <updated>1510016141890</updated> + </task> + <task id="LOCAL-00049" summary="test"> + <created>1510019044081</created> + <option name="number" value="00049" /> + <option name="presentableId" value="LOCAL-00049" /> + <option name="project" value="LOCAL" /> + <updated>1510019044081</updated> + </task> + <task id="LOCAL-00050" summary="test"> + <created>1510019276270</created> + <option name="number" value="00050" /> + <option name="presentableId" value="LOCAL-00050" /> + <option name="project" value="LOCAL" /> + <updated>1510019276271</updated> + </task> + <task id="LOCAL-00051" summary="test"> + <created>1510021702176</created> + <option name="number" value="00051" /> + <option name="presentableId" value="LOCAL-00051" /> + <option name="project" value="LOCAL" /> + <updated>1510021702176</updated> + </task> + <task id="LOCAL-00052" summary="test"> + <created>1510022297677</created> + <option name="number" value="00052" /> + <option name="presentableId" value="LOCAL-00052" /> + <option name="project" value="LOCAL" /> + <updated>1510022297677</updated> + </task> + <task id="LOCAL-00053" summary="test"> + <created>1510025258846</created> + <option name="number" value="00053" /> + <option name="presentableId" value="LOCAL-00053" /> + <option name="project" value="LOCAL" /> + <updated>1510025258846</updated> + </task> + <task id="LOCAL-00054" summary="test"> + <created>1510029566919</created> + <option name="number" value="00054" /> + <option name="presentableId" value="LOCAL-00054" /> + <option name="project" value="LOCAL" /> + <updated>1510029566919</updated> + </task> + <task id="LOCAL-00055" summary="test"> + <created>1510039215409</created> + <option name="number" value="00055" /> + <option name="presentableId" value="LOCAL-00055" /> + <option name="project" value="LOCAL" /> + <updated>1510039215409</updated> + </task> + <task id="LOCAL-00056" summary="test"> + <created>1510041490410</created> + <option name="number" value="00056" /> + <option name="presentableId" value="LOCAL-00056" /> + <option name="project" value="LOCAL" /> + <updated>1510041490411</updated> + </task> + <task id="LOCAL-00057" summary="test"> + <created>1510063453289</created> + <option name="number" value="00057" /> + <option name="presentableId" value="LOCAL-00057" /> + <option name="project" value="LOCAL" /> + <updated>1510063453290</updated> + </task> + <task id="LOCAL-00058" summary="test"> + <created>1510357064207</created> + <option name="number" value="00058" /> + <option name="presentableId" value="LOCAL-00058" /> + <option name="project" value="LOCAL" /> + <updated>1510357064208</updated> + </task> + <task id="LOCAL-00059" summary="test"> + <created>1510358637727</created> + <option name="number" value="00059" /> + <option name="presentableId" value="LOCAL-00059" /> + <option name="project" value="LOCAL" /> + <updated>1510358637728</updated> + </task> + <task id="LOCAL-00060" summary="test"> + <created>1510377149731</created> + <option name="number" value="00060" /> + <option name="presentableId" value="LOCAL-00060" /> + <option name="project" value="LOCAL" /> + <updated>1510377149732</updated> + </task> + <task id="LOCAL-00061" summary="test"> + <created>1510382975797</created> + <option name="number" value="00061" /> + <option name="presentableId" value="LOCAL-00061" /> + <option name="project" value="LOCAL" /> + <updated>1510382975798</updated> + </task> + <task id="LOCAL-00062" summary="test"> + <created>1510386227263</created> + <option name="number" value="00062" /> + <option name="presentableId" value="LOCAL-00062" /> + <option name="project" value="LOCAL" /> + <updated>1510386227264</updated> + </task> + <task id="LOCAL-00063" summary="test"> + <created>1510487538140</created> + <option name="number" value="00063" /> + <option name="presentableId" value="LOCAL-00063" /> + <option name="project" value="LOCAL" /> + <updated>1510487538141</updated> + </task> + <task id="LOCAL-00064" summary="test"> + <created>1510492960788</created> + <option name="number" value="00064" /> + <option name="presentableId" value="LOCAL-00064" /> + <option name="project" value="LOCAL" /> + <updated>1510492960788</updated> + </task> + <task id="LOCAL-00065" summary="test"> + <created>1510666790661</created> + <option name="number" value="00065" /> + <option name="presentableId" value="LOCAL-00065" /> + <option name="project" value="LOCAL" /> + <updated>1510666790662</updated> + </task> + <task id="LOCAL-00066" summary="test"> + <created>1510675632206</created> + <option name="number" value="00066" /> + <option name="presentableId" value="LOCAL-00066" /> + <option name="project" value="LOCAL" /> + <updated>1510675632207</updated> + </task> + <task id="LOCAL-00067" summary="test"> + <created>1510728536875</created> + <option name="number" value="00067" /> + <option name="presentableId" value="LOCAL-00067" /> + <option name="project" value="LOCAL" /> + <updated>1510728536876</updated> + </task> + <task id="LOCAL-00068" summary="test"> + <created>1510729131836</created> + <option name="number" value="00068" /> + <option name="presentableId" value="LOCAL-00068" /> + <option name="project" value="LOCAL" /> + <updated>1510729131836</updated> + </task> + <task id="LOCAL-00069" summary="test"> + <created>1510754750467</created> + <option name="number" value="00069" /> + <option name="presentableId" value="LOCAL-00069" /> + <option name="project" value="LOCAL" /> + <updated>1510754750468</updated> + </task> + <task id="LOCAL-00070" summary="test"> + <created>1510757487933</created> + <option name="number" value="00070" /> + <option name="presentableId" value="LOCAL-00070" /> + <option name="project" value="LOCAL" /> + <updated>1510757487933</updated> + </task> + <task id="LOCAL-00071" summary="test"> + <created>1510757829759</created> + <option name="number" value="00071" /> + <option name="presentableId" value="LOCAL-00071" /> + <option name="project" value="LOCAL" /> + <updated>1510757829759</updated> + </task> + <task id="LOCAL-00072" summary="test"> + <created>1510758484524</created> + <option name="number" value="00072" /> + <option name="presentableId" value="LOCAL-00072" /> + <option name="project" value="LOCAL" /> + <updated>1510758484524</updated> + </task> + <task id="LOCAL-00073" summary="test"> + <created>1511153345415</created> + <option name="number" value="00073" /> + <option name="presentableId" value="LOCAL-00073" /> + <option name="project" value="LOCAL" /> + <updated>1511153345416</updated> + </task> + <task id="LOCAL-00074" summary="test"> + <created>1511821838306</created> + <option name="number" value="00074" /> + <option name="presentableId" value="LOCAL-00074" /> + <option name="project" value="LOCAL" /> + <updated>1511821838307</updated> + </task> + <option name="localTasksCounter" value="75" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="65245000" /> + <option name="totallyTimeSpent" value="183241000" /> + </component> + <component name="TodoView"> + <todo-panel id="selected-file"> + <is-autoscroll-to-source value="true" /> + </todo-panel> + <todo-panel id="all"> + <are-packages-shown value="true" /> + <is-autoscroll-to-source value="true" /> + </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1404" height="877" extended-state="0" /> + <frame x="0" y="23" width="1406" height="877" extended-state="0" /> <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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3286445" sideWeight="0.51466274" 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.3286445" sideWeight="0.48533726" 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="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49120235" 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="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49706745" 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="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="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.09335038" sideWeight="0.4735683" 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.37340152" sideWeight="0.45674488" 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.32992327" sideWeight="0.49120235" 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.32992327" sideWeight="0.4941349" order="12" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29252198" 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="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" /> @@ -766,456 +1038,402 @@ <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" /> + <MESSAGE value="������������" /> + <MESSAGE value="������MQ������������" /> + <MESSAGE value="test ack flag" /> + <MESSAGE value="insert hostory data to mongo" /> + <MESSAGE value="test" /> + <option name="LAST_COMMIT_MESSAGE" value="test" /> </component> <component name="XDebuggerManager"> <breakpoint-manager> - <option name="time" value="1" /> + <option name="time" value="3" /> </breakpoint-manager> <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/DateConvert.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/RedisService.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 relative-caret-position="225"> + <caret line="15" column="29" lean-forward="false" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/LoginFilter.java"> + <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="14" column="53" lean-forward="false" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="53" /> + </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="240"> + <caret line="20" column="25" lean-forward="false" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="25" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.html"> + <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="-1299"> + <caret line="4" column="20" lean-forward="true" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/EquipmentMapper.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-5015"> + <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/resources/mapper/MgrDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-325"> + <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/OrganizationMapper.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-4017"> + <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/ScreenApiDao.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="351"> + <caret line="40" column="20" lean-forward="true" selection-start-line="33" selection-start-column="12" selection-end-line="40" selection-end-column="20" /> + </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="105"> + <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/MgrDao.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="270"> + <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="26" selection-end-column="1" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/LoggerMapper.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="285"> + <caret line="22" column="39" lean-forward="false" selection-start-line="22" selection-start-column="34" selection-end-line="22" selection-end-column="39" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MonitorPointDao.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/resources/mapper/TaskDao.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/resources/mapper/SqlDao.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/resources/mapper/UserDao.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/resources/mapper/WeChatDao.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/resources/mapper/HistoryEntityMapper.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="2415"> + <caret line="161" column="10" lean-forward="false" selection-start-line="161" selection-start-column="10" selection-end-line="161" selection-end-column="10" /> + </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="1694"> + <caret line="155" column="0" lean-forward="true" selection-start-line="155" selection-start-column="0" selection-end-line="155" selection-end-column="0" /> + </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="208"> + <caret line="22" column="25" lean-forward="false" selection-start-line="22" selection-start-column="16" selection-end-line="22" selection-end-column="25" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/AccountEntityMapper.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="5" column="17" lean-forward="false" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/BaseDao.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/DashboardDao.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="120"> + <caret line="11" column="17" lean-forward="false" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" /> + </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="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/EquipmentMapper.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" /> + </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="320"> + <caret line="55" column="13" lean-forward="true" selection-start-line="53" selection-start-column="4" selection-end-line="55" selection-end-column="13" /> + </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="240"> + <caret line="23" column="23" lean-forward="false" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" /> + <folding> + <element signature="e#854#855#0" expanded="false" /> + <element signature="e#893#894#0" expanded="false" /> + </folding> + </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="702"> + <caret line="72" column="0" lean-forward="false" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/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> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/application.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/log4j/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/mapper/AccountEntityMapper.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/controller/Go.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" /> + <caret line="27" column="13" lean-forward="false" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/MonitorPoint.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/MgrController.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 relative-caret-position="210"> + <caret line="25" column="17" lean-forward="false" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="17" /> </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" /> + <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> </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"> + <state relative-caret-position="120"> <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"> - <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="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 relative-caret-position="330"> + <caret line="27" column="69" lean-forward="false" selection-start-line="27" selection-start-column="55" selection-end-line="27" selection-end-column="69" /> </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/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" /> + <caret line="48" column="13" lean-forward="false" selection-start-line="48" selection-start-column="13" selection-end-line="48" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ApiDao.xml"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/redis.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" /> + <state relative-caret-position="0"> + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Critical.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml"> <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 relative-caret-position="167"> + <caret line="78" column="35" lean-forward="false" selection-start-line="78" selection-start-column="14" selection-end-line="78" selection-end-column="35" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/mongodb.xml"> <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" /> + <state relative-caret-position="210"> + <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaskDao.xml"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/database.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> - <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" /> + <state relative-caret-position="90"> + <caret line="6" column="61" lean-forward="false" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq/rabbit-config.properties"> <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 relative-caret-position="0"> + <caret line="0" column="26" lean-forward="false" selection-start-line="0" selection-start-column="14" selection-end-line="0" selection-end-column="26" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb/mongodb-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="15"> + <caret line="1" column="23" lean-forward="false" selection-start-line="1" selection-start-column="23" selection-end-line="1" selection-end-column="23" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="268"> + <caret line="62" column="21" lean-forward="false" selection-start-line="62" selection-start-column="21" selection-end-line="62" selection-end-column="21" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="765"> + <caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/resources/redis/redis-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="15"> + <caret line="1" column="23" lean-forward="true" selection-start-line="1" selection-start-column="11" selection-end-line="1" selection-end-column="23" /> + <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="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="405"> + <caret line="128" column="12" lean-forward="false" selection-start-line="128" selection-start-column="12" selection-end-line="128" selection-end-column="12" /> <folding> - <element signature="imports" expanded="true" /> - <element signature="e#3639#3654#0" expanded="true" /> + <marker date="1511823786459" expanded="false" signature="6186:6204" ph="<~>" /> + <marker date="1511823786459" expanded="false" signature="7663:7679" ph="<~>" /> </folding> </state> </provider> -- Gitblit v1.8.0