From 6c07ccafd0f4488e70fabe3bff975629572b506f Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 15 Nov 2017 22:57:09 +0800
Subject: [PATCH] test
---
.idea/workspace.xml | 457 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 288 insertions(+), 169 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b6ea1f0..f6fbfa4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,13 +6,9 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
- <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sourceforge_jexcelapi_jxl_2_6_12.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/task_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/task_war_exploded.xml" />
+ <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/resources/spring/quartz.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/quartz.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/Test.java" afterPath="$PROJECT_DIR$/src/test/java/Test.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/task.iml" afterPath="$PROJECT_DIR$/task.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -25,11 +21,70 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="quartz.xml" pinned="false" current-in-tab="true">
+ <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="false">
+ <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="315">
+ <caret line="53" column="72" lean-forward="true" selection-start-line="53" selection-start-column="4" selection-end-line="53" selection-end-column="72" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="RedisServiceImpl.java" pinned="false" current-in-tab="false">
+ <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="386">
+ <caret line="97" column="27" lean-forward="false" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="27" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="StopStateCheck.java" pinned="false" current-in-tab="true">
+ <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="517">
+ <caret line="55" column="20" lean-forward="false" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </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="356">
+ <caret line="49" column="31" lean-forward="false" selection-start-line="49" selection-start-column="16" selection-end-line="49" selection-end-column="31" />
+ <folding>
+ <marker date="1510358902000" expanded="true" signature="910:1238" ph="select a.id,... equipment" />
+ <marker date="1510358902000" expanded="true" signature="1297:1343" ph="UPDATE equip... " />
+ <marker date="1510358902000" expanded="true" signature="2086:2111" ph="select mac f... equipment" />
+ <marker date="1510358902000" expanded="true" signature="2213:2279" ph="select time " />
+ </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/spring/rabbitmq.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="210">
+ <caret line="14" column="24" lean-forward="false" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
+ <folding>
+ <element signature="e#954#972#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="quartz.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="84">
- <caret line="73" column="57" lean-forward="false" selection-start-line="73" selection-start-column="43" selection-end-line="73" selection-end-column="57" />
+ <state relative-caret-position="130">
+ <caret line="70" column="85" lean-forward="false" selection-start-line="70" selection-start-column="71" selection-end-line="70" selection-end-column="85" />
<folding />
</state>
</provider>
@@ -47,8 +102,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>javax.servlet</find>
- <find>monitor</find>
<find>selectFromequipmentByinstaller</find>
<find>insertIntoequipment</find>
<find>updateFromequipmentBymac</find>
@@ -72,6 +125,13 @@
<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>setEquState</find>
+ <find>getAllEquipment</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -96,7 +156,6 @@
<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/main/java/com/moral/monitor/entity/Sensor.java" />
@@ -107,7 +166,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" />
@@ -118,17 +176,20 @@
<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/system/alarmLevels.json" />
<option value="$PROJECT_DIR$/src/main/resources/rabbitmq/rabbit-config.properties" />
<option value="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" />
<option value="$PROJECT_DIR$/src/main/resources/spring/application.xml" />
- <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/resources/mongodb/mongodb-config.properties" />
<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/java/com/moral/monitor/listener/TaskListener.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/quartz.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/redis/redis-config.properties" />
+ <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/listener/quartz/StopStateCheck.java" />
</list>
</option>
</component>
@@ -145,7 +206,8 @@
<option name="FILTER_DEBUG" value="true" />
<option name="CUSTOM_FILTER" />
</component>
- <component name="ProjectFrameBounds" extendedState="6">
+ <component name="ProjectFrameBounds">
+ <option name="x" value="33" />
<option name="y" value="23" />
<option name="width" value="1405" />
<option name="height" value="877" />
@@ -167,8 +229,9 @@
</navigator>
<panes>
<pane id="PackagesPane" />
- <pane id="Scratches" />
<pane id="AndroidView" />
+ <pane id="Scratches" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -215,13 +278,20 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="mapper" 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="spring" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -521,49 +591,15 @@
<workItem from="1510627531530" duration="208000" />
<workItem from="1510627773177" duration="2490000" />
<workItem from="1510646592713" duration="793000" />
- <workItem from="1510666571633" duration="199000" />
- </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>
+ <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="2007000" />
</task>
<task id="LOCAL-00022" summary="���������������������������">
<created>1509091232558</created>
@@ -866,44 +902,86 @@
<option name="project" value="LOCAL" />
<updated>1510492960788</updated>
</task>
- <option name="localTasksCounter" value="65" />
+ <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>
+ <option name="localTasksCounter" value="71" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="138330000" />
+ <option name="totallyTimeSpent" value="152009000" />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="23" width="1405" height="877" extended-state="6" />
+ <frame x="33" y="23" width="1405" 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.5639386" sideWeight="0.52643174" 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.49706313" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.51662403" sideWeight="0.4632893" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5639386" sideWeight="0.4735683" order="3" 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.23404256" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39897698" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.49706313" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
+ <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17519182" sideWeight="0.4632893" order="10" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5639386" sideWeight="0.4735683" order="3" 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.26192224" 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="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="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>
@@ -975,17 +1053,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <option name="time" value="1" />
+ <option name="time" value="2" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
- <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/resources/mapper/LoginDao.xml">
@@ -1038,24 +1110,10 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="15" column="16" lean-forward="false" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="16" />
- </state>
- </provider>
- </entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/1.6.3.RELEASE/spring-rabbit-1.6.3.RELEASE.jar!/org/springframework/amqp/rabbit/config/spring-rabbit-1.0.xsd">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
<caret line="149" column="4" lean-forward="false" selection-start-line="149" selection-start-column="4" selection-end-line="149" selection-end-column="4" />
- </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>
@@ -1115,31 +1173,10 @@
</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="210">
- <caret line="14" column="25" lean-forward="true" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="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>
<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="1117">
<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/resources/spring/rabbitmq.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="14" column="24" lean-forward="false" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
</state>
</provider>
</entry>
@@ -1192,31 +1229,10 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/system/alarmLevels.json">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="385">
- <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="file://$PROJECT_DIR$/src/main/resources/system/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/resources/rabbitmq/rabbit-config.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="15" lean-forward="false" selection-start-line="0" selection-start-column="15" selection-end-line="0" selection-end-column="15" />
- </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="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>
@@ -1231,15 +1247,6 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
- <folding />
- </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="90">
- <caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
- <folding />
</state>
</provider>
</entry>
@@ -1247,7 +1254,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="24" lean-forward="false" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
- <folding />
</state>
</provider>
</entry>
@@ -1255,7 +1261,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3285">
<caret line="219" column="20" lean-forward="false" selection-start-line="219" selection-start-column="20" selection-end-line="219" selection-end-column="20" />
- <folding />
</state>
</provider>
</entry>
@@ -1267,37 +1272,151 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java">
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/1.8.7.RELEASE/spring-data-redis-1.8.7.RELEASE.jar!/org/springframework/data/redis/core/RedisTemplate.class">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="78" column="50" lean-forward="false" selection-start-line="78" selection-start-column="50" selection-end-line="78" selection-end-column="50" />
- <folding>
- <element signature="e#3761#3770#0" expanded="true" />
- <element signature="e#4863#4881#0" expanded="true" />
- <element signature="e#5954#5970#0" expanded="true" />
- </folding>
+ <state relative-caret-position="439">
+ <caret line="537" column="18" lean-forward="false" selection-start-line="537" selection-start-column="18" selection-end-line="537" selection-end-column="18" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.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="-205">
- <caret line="38" column="27" lean-forward="false" selection-start-line="38" selection-start-column="27" selection-end-line="38" selection-end-column="27" />
- <folding>
- <element signature="e#1129#1130#0" expanded="true" />
- <element signature="e#1166#1167#0" expanded="true" />
- </folding>
+ <state relative-caret-position="150">
+ <caret line="15" column="76" lean-forward="false" selection-start-line="15" selection-start-column="73" selection-end-line="15" selection-end-column="76" />
+ </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="0">
+ <caret line="6" column="21" lean-forward="false" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
+ </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="225">
+ <caret line="22" column="18" lean-forward="false" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/system/sysConfig.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="120">
+ <caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/system/alarmLevels.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="315">
+ <caret line="21" column="22" lean-forward="false" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
+ </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="45">
+ <caret line="3" column="21" lean-forward="false" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="21" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/utils/HttpRequester.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="105">
+ <caret line="15" column="26" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="26" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ScreenController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="175">
+ <caret line="168" column="13" lean-forward="false" selection-start-line="168" selection-start-column="13" selection-end-line="168" selection-end-column="13" />
+ <folding />
+ </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="15">
+ <caret line="51" column="25" lean-forward="false" selection-start-line="51" selection-start-column="15" selection-end-line="51" selection-end-column="25" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/ReportServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="84">
- <caret line="73" column="57" lean-forward="false" selection-start-line="73" selection-start-column="43" selection-end-line="73" selection-end-column="57" />
+ <state relative-caret-position="130">
+ <caret line="70" column="85" lean-forward="false" selection-start-line="70" selection-start-column="71" selection-end-line="70" selection-end-column="85" />
<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="210">
+ <caret line="14" column="24" lean-forward="false" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
+ <folding>
+ <element signature="e#954#972#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="315">
+ <caret line="53" column="72" lean-forward="true" selection-start-line="53" selection-start-column="4" selection-end-line="53" selection-end-column="72" />
+ <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="386">
+ <caret line="97" column="27" lean-forward="false" selection-start-line="97" selection-start-column="16" selection-end-line="97" selection-end-column="27" />
+ <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="356">
+ <caret line="49" column="31" lean-forward="false" selection-start-line="49" selection-start-column="16" selection-end-line="49" selection-end-column="31" />
+ <folding>
+ <marker date="1510358902000" expanded="true" signature="910:1238" ph="select a.id,... equipment" />
+ <marker date="1510358902000" expanded="true" signature="1297:1343" ph="UPDATE equip... " />
+ <marker date="1510358902000" expanded="true" signature="2086:2111" ph="select mac f... equipment" />
+ <marker date="1510358902000" expanded="true" signature="2213:2279" ph="select time " />
+ </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="517">
+ <caret line="55" column="20" lean-forward="false" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
--
Gitblit v1.8.0