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 | 1101 +++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 675 insertions(+), 426 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3b43021..3924e51 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,8 +6,9 @@ </artifacts-to-build> </component> <component name="ChangeListManager"> - <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="������MQ������������"> + <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/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/" /> @@ -21,23 +22,34 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="false"> + <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="990"> - <caret line="66" column="24" lean-forward="false" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" /> + <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" /> + <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="true"> + <file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="495"> - <caret line="33" column="93" lean-forward="false" selection-start-line="33" selection-start-column="93" selection-end-line="33" selection-end-column="93" /> + <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> @@ -55,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> @@ -80,6 +88,15 @@ <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"> @@ -104,10 +121,8 @@ <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisManager.java" /> <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java" /> <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$/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/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" /> @@ -116,7 +131,6 @@ <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/java/com/moral/monitor/listener/quartz/StopStateCheck.java" /> <option value="$PROJECT_DIR$/src/main/resources/alarmLevles.json" /> <option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/src/main/resources/mongodb-config.properties" /> @@ -126,12 +140,23 @@ <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/spring/database.xml" /> - <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.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/listener/TaskListener.java" /> + <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> </component> @@ -150,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" /> @@ -169,6 +194,7 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> + <pane id="AndroidView" /> <pane id="Scope" /> <pane id="ProjectPane"> <subPane> @@ -177,13 +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="PackagesPane" /> <pane id="Scratches" /> - <pane id="AndroidView" /> </panes> </component> <component name="PropertiesComponent"> @@ -464,182 +539,63 @@ <workItem from="1509938642246" duration="726000" /> <workItem from="1509946269191" duration="522000" /> <workItem from="1509957226710" duration="251000" /> - <workItem from="1509957794827" duration="14000" /> - </task> - <task id="LOCAL-00001" summary="updates"> - <created>1508484578874</created> - <option name="number" value="00001" /> - <option name="presentableId" value="LOCAL-00001" /> - <option name="project" value="LOCAL" /> - <updated>1508484578874</updated> - </task> - <task id="LOCAL-00002" summary="������task������������"> - <created>1508485049474</created> - <option name="number" value="00002" /> - <option name="presentableId" value="LOCAL-00002" /> - <option name="project" value="LOCAL" /> - <updated>1508485049474</updated> - </task> - <task id="LOCAL-00003" summary="������app������������������"> - <created>1508490813600</created> - <option name="number" value="00003" /> - <option name="presentableId" value="LOCAL-00003" /> - <option name="project" value="LOCAL" /> - <updated>1508490813600</updated> - </task> - <task id="LOCAL-00004" summary="updates"> - <created>1508811869390</created> - <option name="number" value="00004" /> - <option name="presentableId" value="LOCAL-00004" /> - <option name="project" value="LOCAL" /> - <updated>1508811869390</updated> - </task> - <task id="LOCAL-00005" summary="updates"> - <created>1508812121965</created> - <option name="number" value="00005" /> - <option name="presentableId" value="LOCAL-00005" /> - <option name="project" value="LOCAL" /> - <updated>1508812121965</updated> - </task> - <task id="LOCAL-00006" summary="updates"> - <created>1508814407295</created> - <option name="number" value="00006" /> - <option name="presentableId" value="LOCAL-00006" /> - <option name="project" value="LOCAL" /> - <updated>1508814407295</updated> - </task> - <task id="LOCAL-00007" summary="updates"> - <created>1508814992465</created> - <option name="number" value="00007" /> - <option name="presentableId" value="LOCAL-00007" /> - <option name="project" value="LOCAL" /> - <updated>1508814992465</updated> - </task> - <task id="LOCAL-00008" summary="updates"> - <created>1508815251640</created> - <option name="number" value="00008" /> - <option name="presentableId" value="LOCAL-00008" /> - <option name="project" value="LOCAL" /> - <updated>1508815251640</updated> - </task> - <task id="LOCAL-00009" summary="updates"> - <created>1508815333934</created> - <option name="number" value="00009" /> - <option name="presentableId" value="LOCAL-00009" /> - <option name="project" value="LOCAL" /> - <updated>1508815333934</updated> - </task> - <task id="LOCAL-00010" summary="updates"> - <created>1508816385719</created> - <option name="number" value="00010" /> - <option name="presentableId" value="LOCAL-00010" /> - <option name="project" value="LOCAL" /> - <updated>1508816385719</updated> - </task> - <task id="LOCAL-00011" summary="BUG-058"> - <created>1508825226306</created> - <option name="number" value="00011" /> - <option name="presentableId" value="LOCAL-00011" /> - <option name="project" value="LOCAL" /> - <updated>1508825226306</updated> - </task> - <task id="LOCAL-00012" summary="������������������"> - <created>1508902617619</created> - <option name="number" value="00012" /> - <option name="presentableId" value="LOCAL-00012" /> - <option name="project" value="LOCAL" /> - <updated>1508902617619</updated> - </task> - <task id="LOCAL-00013" summary="������������������"> - <created>1508920155176</created> - <option name="number" value="00013" /> - <option name="presentableId" value="LOCAL-00013" /> - <option name="project" value="LOCAL" /> - <updated>1508920155177</updated> - </task> - <task id="LOCAL-00014" summary="updates"> - <created>1508920429528</created> - <option name="number" value="00014" /> - <option name="presentableId" value="LOCAL-00014" /> - <option name="project" value="LOCAL" /> - <updated>1508920429528</updated> - </task> - <task id="LOCAL-00015" summary="������������"> - <created>1508920850416</created> - <option name="number" value="00015" /> - <option name="presentableId" value="LOCAL-00015" /> - <option name="project" value="LOCAL" /> - <updated>1508920850416</updated> - </task> - <task id="LOCAL-00016" summary="������������"> - <created>1508987038075</created> - <option name="number" value="00016" /> - <option name="presentableId" value="LOCAL-00016" /> - <option name="project" value="LOCAL" /> - <updated>1508987038075</updated> - </task> - <task id="LOCAL-00017" summary="RabbitMQ & Redis ������"> - <created>1509061963499</created> - <option name="number" value="00017" /> - <option name="presentableId" value="LOCAL-00017" /> - <option name="project" value="LOCAL" /> - <updated>1509061963500</updated> - </task> - <task id="LOCAL-00018" summary="���������������������"> - <created>1509071255017</created> - <option name="number" value="00018" /> - <option name="presentableId" value="LOCAL-00018" /> - <option name="project" value="LOCAL" /> - <updated>1509071255017</updated> - </task> - <task id="LOCAL-00019" summary="���������������������"> - <created>1509083891003</created> - <option name="number" value="00019" /> - <option name="presentableId" value="LOCAL-00019" /> - <option name="project" value="LOCAL" /> - <updated>1509083891003</updated> - </task> - <task id="LOCAL-00020" summary="���������������������"> - <created>1509084804781</created> - <option name="number" value="00020" /> - <option name="presentableId" value="LOCAL-00020" /> - <option name="project" value="LOCAL" /> - <updated>1509084804781</updated> - </task> - <task id="LOCAL-00021" summary="���������������������"> - <created>1509088852950</created> - <option name="number" value="00021" /> - <option name="presentableId" value="LOCAL-00021" /> - <option name="project" value="LOCAL" /> - <updated>1509088852950</updated> - </task> - <task id="LOCAL-00022" summary="���������������������������"> - <created>1509091232558</created> - <option name="number" value="00022" /> - <option name="presentableId" value="LOCAL-00022" /> - <option name="project" value="LOCAL" /> - <updated>1509091232558</updated> - </task> - <task id="LOCAL-00023" summary="������������"> - <created>1509265063354</created> - <option name="number" value="00023" /> - <option name="presentableId" value="LOCAL-00023" /> - <option name="project" value="LOCAL" /> - <updated>1509265063354</updated> - </task> - <task id="LOCAL-00024" summary="������������"> - <created>1509265555027</created> - <option name="number" value="00024" /> - <option name="presentableId" value="LOCAL-00024" /> - <option name="project" value="LOCAL" /> - <updated>1509265555027</updated> - </task> - <task id="LOCAL-00025" summary="������������"> - <created>1509265660083</created> - <option name="number" value="00025" /> - <option name="presentableId" value="LOCAL-00025" /> - <option name="project" value="LOCAL" /> - <updated>1509265660083</updated> + <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-00026" summary="������������"> <created>1509265945799</created> @@ -781,44 +737,256 @@ <option name="project" value="LOCAL" /> <updated>1509957305739</updated> </task> - <option name="localTasksCounter" value="46" /> + <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="112633000" /> + <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="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="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> - <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> - <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.54092073" sideWeight="0.520558" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.54092073" sideWeight="0.479442" 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="true" show_stripe_button="true" weight="0.40537083" sideWeight="0.48091042" order="10" side_tool="false" content_ui="tabs" /> - <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2444934" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.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="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.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.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.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="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" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49706313" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> @@ -883,169 +1051,57 @@ <MESSAGE value="������log" /> <MESSAGE value="������������" /> <MESSAGE value="������MQ������������" /> - <option name="LAST_COMMIT_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/listener/quartz/EquipmentCheck.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="135"> - <caret line="34" column="25" lean-forward="true" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="25" /> + <state 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/resources/mapper/TaskDao.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="59"> - <caret line="4" column="30" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="30" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/QueryHelper.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="75"> - <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Equipment.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="60"> - <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/EquDao.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="120"> - <caret line="14" column="17" lean-forward="false" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" /> - </state> - </provider> - </entry> - <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/src.zip!/java/util/Calendar.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="251"> - <caret line="1753" column="22" lean-forward="false" selection-start-line="1753" selection-start-column="22" selection-end-line="1753" selection-end-column="22" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/database.xml" /> - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/EquDao.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="420"> - <caret line="28" column="41" lean-forward="false" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="41" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Logger.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="165"> - <caret line="11" column="16" lean-forward="false" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="16" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/utils/HttpRequester.java"> + <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="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> + <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/listener/utils/HttpRespons.java"> + <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="120"> - <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> + <state 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/java/com/moral/monitor/listener/MonitorListener.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="691"> - <caret line="94" column="55" lean-forward="true" selection-start-line="94" selection-start-column="55" selection-end-line="94" selection-end-column="55" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="150"> - <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/alarmLevles.json" /> - <entry file="file://$PROJECT_DIR$/.idea/compiler.xml"> + <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/java/com/moral/monitor/entity/History.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ApiDao.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="210"> - <caret line="14" column="26" lean-forward="false" selection-start-line="14" selection-start-column="26" selection-end-line="14" selection-end-column="26" /> + <state 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/java/com/moral/monitor/service/impl/ScreenServiceImpl.java"> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/EquipmentMapper.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> + <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/HistoryEntityMapper.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="176"> - <caret line="219" column="18" lean-forward="true" selection-start-line="219" selection-start-column="18" selection-end-line="219" selection-end-column="18" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/EquipmentServiceImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="115"> - <caret line="220" column="24" lean-forward="false" selection-start-line="220" selection-start-column="21" selection-end-line="220" selection-end-column="24" /> - </state> - </provider> - </entry> - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.0.RELEASE/spring-data-mongodb-2.0.0.RELEASE.jar!/org/springframework/data/mongodb/config/spring-mongo-2.0.xsd"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="225"> - <caret line="15" column="35" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="35" /> - </state> - </provider> - </entry> - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.0.RELEASE/spring-data-mongodb-2.0.0.RELEASE.jar!/org/springframework/data/mongodb/core/MongoTemplate.class"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="463"> - <caret line="166" column="69" lean-forward="false" selection-start-line="166" selection-start-column="57" selection-end-line="166" selection-end-column="69" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb.xml" /> - <entry file="file://$PROJECT_DIR$/src/main/resources/redis-config.properties" /> - <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb-config.properties" /> - <entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml" /> - <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml" /> - <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml" /> - <entry file="file://$PROJECT_DIR$/src/main/resources/application.xml" /> - <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties" /> - <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="225"> - <caret line="22" column="49" lean-forward="false" selection-start-line="22" selection-start-column="35" selection-end-line="22" selection-end-column="49" /> </state> </provider> </entry> @@ -1056,10 +1112,183 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml"> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MgrDao.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="619"> - <caret line="85" column="25" lean-forward="false" selection-start-line="78" selection-start-column="8" selection-end-line="85" selection-end-column="25" /> + <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> @@ -1070,122 +1299,142 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/spring/application.xml"> + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/AccountEntityMapper.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="900"> - <caret line="60" column="22" lean-forward="false" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" /> + <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/mybatis.xml"> + <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="8" column="20" lean-forward="false" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="57" /> + <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/resources/spring/database.xml"> + <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="510"> - <caret line="34" column="66" lean-forward="false" selection-start-line="34" selection-start-column="43" selection-end-line="34" selection-end-column="66" /> + <state relative-caret-position="135"> + <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/controller/MgrController.java"> + <provider selected="true" editor-type-id="text-editor"> + <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="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="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="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java"> + <provider selected="true" editor-type-id="text-editor"> + <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="180"> - <caret line="51" column="25" lean-forward="false" selection-start-line="51" selection-start-column="15" selection-end-line="51" selection-end-column="25" /> - </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="120"> - <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> - </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="240"> - <caret line="16" column="34" lean-forward="false" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" /> - </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="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/resources/redis/redis-config.properties"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="60"> - <caret line="4" column="10" lean-forward="false" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" /> + <state relative-caret-position="135"> + <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/spring/redis.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="300"> - <caret line="20" column="107" lean-forward="false" selection-start-line="20" selection-start-column="86" selection-end-line="20" selection-end-column="107" /> - </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="75"> - <caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="6" selection-end-line="5" selection-end-column="24" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/resources/alarmLevels.json" /> - <entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="499"> - <caret line="80" column="8" lean-forward="false" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="74" /> + <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/system/alarmLevels.json"> + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="642"> - <caret line="96" column="1" lean-forward="false" selection-start-line="96" selection-start-column="1" selection-end-line="96" selection-end-column="1" /> - </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/Message.class"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="90"> - <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> + <state relative-caret-position="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/resources/spring/mongodb.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="270"> - <caret line="18" column="46" lean-forward="false" selection-start-line="18" selection-start-column="46" selection-end-line="18" selection-end-column="46" /> + <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/spring/database.xml"> + <provider selected="true" editor-type-id="text-editor"> + <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/resources/rabbitmq/rabbit-config.properties"> + <provider selected="true" editor-type-id="text-editor"> + <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="990"> - <caret line="66" column="24" lean-forward="false" selection-start-line="66" selection-start-column="24" selection-end-line="66" selection-end-column="24" /> + <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" /> + <marker date="1511823786459" expanded="false" signature="6186:6204" ph="<~>" /> + <marker date="1511823786459" expanded="false" signature="7663:7679" ph="<~>" /> </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="495"> - <caret line="33" column="93" lean-forward="false" selection-start-line="33" selection-start-column="93" selection-end-line="33" selection-end-column="93" /> - <folding /> </state> </provider> </entry> -- Gitblit v1.8.0