From d679e6f58bca0e03434109bd240268e90aa15e2b Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 07 Nov 2017 09:44:04 +0800
Subject: [PATCH] test
---
.idea/workspace.xml | 302 ++++++++++++++++++++++++++++---------------------
1 files changed, 171 insertions(+), 131 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1606a80..1b774b2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/system/alarmLevels.json" afterPath="$PROJECT_DIR$/src/main/resources/system/alarmLevels.json" />
+ <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" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -21,13 +20,26 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="alarmLevels.json" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/resources/system/alarmLevels.json">
+ <leaf>
+ <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="1440">
- <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 relative-caret-position="135">
+ <caret line="9" column="37" lean-forward="false" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="37" />
<folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <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="533">
+ <caret line="97" column="25" lean-forward="false" selection-start-line="97" selection-start-column="25" selection-end-line="97" selection-end-column="25" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <marker date="1510018984000" expanded="false" signature="5505:5523" ph="<~>" />
+ </folding>
</state>
</provider>
</entry>
@@ -112,7 +124,6 @@
<option value="$PROJECT_DIR$/src/main/resources/application.xml" />
<option value="$PROJECT_DIR$/src/main/resources/mongodb.xml" />
<option value="$PROJECT_DIR$/src/main/resources/redis.xml" />
- <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" />
<option value="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" />
<option value="$PROJECT_DIR$/src/main/resources/log4j.properties" />
<option value="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" />
@@ -120,6 +131,8 @@
<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/system/alarmLevels.json" />
+ <option value="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" />
</list>
</option>
</component>
@@ -137,8 +150,7 @@
<option name="CUSTOM_FILTER" />
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="-1404" />
- <option name="y" value="31" />
+ <option name="y" value="23" />
<option name="width" value="1404" />
<option name="height" value="877" />
</component>
@@ -158,9 +170,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="AndroidView" />
- <pane id="Scratches" />
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -184,7 +193,24 @@
<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="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" />
@@ -192,7 +218,6 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
- <item name="system" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="task" type="b2602c69:ProjectViewProjectNode" />
@@ -205,7 +230,10 @@
<select />
</subPane>
</pane>
+ <pane id="Scratches" />
+ <pane id="Scope" />
<pane id="PackagesPane" />
+ <pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -482,7 +510,13 @@
<workItem from="1509720997599" duration="669000" />
<workItem from="1509791348403" duration="5998000" />
<workItem from="1509805487051" duration="2556000" />
- <workItem from="1509851437762" duration="136000" />
+ <workItem from="1509851437762" duration="657000" />
+ <workItem from="1509938642246" duration="726000" />
+ <workItem from="1509946269191" duration="522000" />
+ <workItem from="1509957226710" duration="251000" />
+ <workItem from="1509957794827" duration="173000" />
+ <workItem from="1510014788172" duration="2297000" />
+ <workItem from="1510018622224" duration="319000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -778,14 +812,56 @@
<option name="project" value="LOCAL" />
<updated>1509613600724</updated>
</task>
- <option name="localTasksCounter" value="43" />
+ <task id="LOCAL-00043" summary="������������">
+ <created>1509851579748</created>
+ <option name="number" value="00043" />
+ <option name="presentableId" value="LOCAL-00043" />
+ <option name="project" value="LOCAL" />
+ <updated>1509851579748</updated>
+ </task>
+ <task id="LOCAL-00044" summary="������������">
+ <created>1509946762076</created>
+ <option name="number" value="00044" />
+ <option name="presentableId" value="LOCAL-00044" />
+ <option name="project" value="LOCAL" />
+ <updated>1509946762076</updated>
+ </task>
+ <task id="LOCAL-00045" summary="������MQ������������">
+ <created>1509957305739</created>
+ <option name="number" value="00045" />
+ <option name="presentableId" value="LOCAL-00045" />
+ <option name="project" value="LOCAL" />
+ <updated>1509957305739</updated>
+ </task>
+ <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>
+ <option name="localTasksCounter" value="49" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="110599000" />
+ <option name="totallyTimeSpent" value="115408000" />
</component>
<component name="ToolWindowManager">
- <frame x="-1404" y="31" width="1404" height="877" extended-state="0" />
+ <frame x="0" y="23" width="1404" 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" />
@@ -797,12 +873,12 @@
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32893288" sideWeight="0.49706313" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40537083" sideWeight="0.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.23788546" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24816446" 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" />
@@ -819,39 +895,6 @@
<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>
- <layout-to-restore>
- <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="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="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="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="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="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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" 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="false" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2290749" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32992327" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
- </layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
@@ -912,7 +955,10 @@
<MESSAGE value="updates" />
<MESSAGE value="������log" />
<MESSAGE value="������������" />
- <option name="LAST_COMMIT_MESSAGE" value="������������" />
+ <MESSAGE value="������MQ������������" />
+ <MESSAGE value="test ack flag" />
+ <MESSAGE value="insert hostory data to mongo" />
+ <option name="LAST_COMMIT_MESSAGE" value="insert hostory data to mongo" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -921,41 +967,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/MessageNotice.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-242">
- <caret line="20" column="60" lean-forward="false" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="60" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/EquipmentCheck.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="34" column="25" lean-forward="true" selection-start-line="34" selection-start-column="4" selection-end-line="34" selection-end-column="25" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaskDao.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="59">
- <caret line="4" column="30" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="30" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/QueryHelper.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Equipment.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="60">
- <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/EquDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
@@ -1096,7 +1107,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -1114,13 +1124,6 @@
</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="150">
- <caret line="16" column="24" lean-forward="false" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="24" />
- </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="120">
@@ -1132,7 +1135,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -1164,14 +1166,6 @@
</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="-1">
- <caret line="9" column="1" lean-forward="false" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
- <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="60">
@@ -1183,25 +1177,6 @@
<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" />
- <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="255">
- <caret line="17" column="48" lean-forward="false" selection-start-line="17" selection-start-column="48" selection-end-line="17" selection-end-column="48" />
- <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="285">
- <caret line="50" column="41" lean-forward="false" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="41" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
</state>
</provider>
</entry>
@@ -1209,26 +1184,91 @@
<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" />
- <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/alarmLevels.json">
+ <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="615">
- <caret line="41" column="10" lean-forward="true" selection-start-line="41" selection-start-column="10" selection-end-line="41" selection-end-column="10" />
+ <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" />
<folding />
</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="1440">
+ <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="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" />
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.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="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/1.6.3.RELEASE/spring-rabbit-1.6.3.RELEASE.jar!/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="78">
+ <caret line="56" column="13" lean-forward="false" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
+ <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="135">
+ <caret line="9" column="37" lean-forward="false" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="37" />
+ <folding />
+ </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/MessageProperties.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-129">
+ <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+ <folding />
+ </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="135">
+ <caret line="15" column="27" lean-forward="true" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/1.6.3.RELEASE/spring-rabbit-1.6.3.RELEASE.jar!/org/springframework/amqp/rabbit/core/RabbitTemplate.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="246">
+ <caret line="368" column="58" lean-forward="true" selection-start-line="368" selection-start-column="58" selection-end-line="368" selection-end-column="58" />
+ <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="533">
+ <caret line="97" column="25" lean-forward="false" selection-start-line="97" selection-start-column="25" selection-end-line="97" selection-end-column="25" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <marker date="1510018984000" expanded="false" signature="5505:5523" ph="<~>" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
--
Gitblit v1.8.0