From 8cb437529dcb91681aeeed59d5045f1a8de30a03 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sun, 05 Nov 2017 11:12:59 +0800
Subject: [PATCH] 代码发布
---
.idea/workspace.xml | 469 ++++++++++++++++++++--------------------------
.idea/misc.xml | 10 -
src/main/resources/system/alarmLevels.json | 114 +++++-----
3 files changed, 266 insertions(+), 327 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 879940b..5b6a5c4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,14 +13,4 @@
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
- <component name="SbtLocalSettings">
- <option name="modificationStamps">
- <map>
- <entry key="$USER_HOME$/IdeaProjects/play2" value="1478179325000" />
- </map>
- </option>
- <option name="externalProjectsViewState">
- <projects_view />
- </option>
- </component>
</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5d68632..1606a80 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,9 @@
</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/spring/database.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/database.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/system/alarmLevels.json" afterPath="$PROJECT_DIR$/src/main/resources/system/alarmLevels.json" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -21,42 +21,12 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="web.xml" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="570">
- <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>
- </file>
- <file leaf-file-name="application.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/spring/application.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="643">
- <caret line="60" column="22" lean-forward="true" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="mybatis.xml" pinned="false" current-in-tab="false">
- <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" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="database.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/spring/database.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="375">
- <caret line="25" column="65" lean-forward="false" selection-start-line="25" selection-start-column="65" selection-end-line="25" selection-end-column="65" />
+ <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" />
<folding />
</state>
</provider>
@@ -148,6 +118,8 @@
<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/system/alarmLevels.json" />
</list>
</option>
</component>
@@ -165,7 +137,8 @@
<option name="CUSTOM_FILTER" />
</component>
<component name="ProjectFrameBounds">
- <option name="y" value="23" />
+ <option name="x" value="-1404" />
+ <option name="y" value="31" />
<option name="width" value="1404" />
<option name="height" value="877" />
</component>
@@ -186,7 +159,6 @@
</navigator>
<panes>
<pane id="AndroidView" />
- <pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
@@ -220,12 +192,20 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
- <item name="spring" type="462c0819:PsiDirectoryNode" />
+ <item name="system" 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="webapp" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
+ <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -235,6 +215,7 @@
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.0" />
+ <property name="settings.editor.selected.configurable" value="configurable.group.editor" />
</component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
@@ -430,6 +411,16 @@
</list>
</recent_temporary>
</component>
+ <component name="SbtLocalSettings">
+ <option name="modificationStamps">
+ <map>
+ <entry key="$USER_HOME$/IdeaProjects/play2" value="1478179325000" />
+ </map>
+ </option>
+ <option name="externalProjectsViewState">
+ <projects_view />
+ </option>
+ </component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
@@ -484,7 +475,14 @@
<workItem from="1509583522110" duration="175000" />
<workItem from="1509584069292" duration="553000" />
<workItem from="1509592515461" duration="995000" />
- <workItem from="1509613222546" duration="324000" />
+ <workItem from="1509613222546" duration="807000" />
+ <workItem from="1509623854080" duration="601000" />
+ <workItem from="1509673349569" duration="600000" />
+ <workItem from="1509719493079" duration="6000" />
+ <workItem from="1509720997599" duration="669000" />
+ <workItem from="1509791348403" duration="5998000" />
+ <workItem from="1509805487051" duration="2556000" />
+ <workItem from="1509851437762" duration="136000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -766,44 +764,58 @@
<option name="project" value="LOCAL" />
<updated>1509593022986</updated>
</task>
- <option name="localTasksCounter" value="41" />
+ <task id="LOCAL-00041" summary="������������">
+ <created>1509613556708</created>
+ <option name="number" value="00041" />
+ <option name="presentableId" value="LOCAL-00041" />
+ <option name="project" value="LOCAL" />
+ <updated>1509613556708</updated>
+ </task>
+ <task id="LOCAL-00042" summary="������������">
+ <created>1509613600724</created>
+ <option name="number" value="00042" />
+ <option name="presentableId" value="LOCAL-00042" />
+ <option name="project" value="LOCAL" />
+ <updated>1509613600724</updated>
+ </task>
+ <option name="localTasksCounter" value="43" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="99550000" />
+ <option name="totallyTimeSpent" value="110599000" />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="23" width="1404" height="877" extended-state="0" />
+ <frame x="-1404" y="31" 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="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="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="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="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="false" 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="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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2290749" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <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="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="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>
@@ -909,76 +921,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/message/Tomq.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="345">
- <caret line="29" column="106" lean-forward="false" selection-start-line="29" selection-start-column="50" selection-end-line="29" selection-end-column="106" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/Test.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="30">
- <caret line="8" column="19" lean-forward="false" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ApiDao.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="164">
- <caret line="39" column="13" lean-forward="true" selection-start-line="37" selection-start-column="4" selection-end-line="39" selection-end-column="13" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Critical.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/Sensor.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="360">
- <caret line="24" column="28" lean-forward="false" selection-start-line="24" selection-start-column="28" selection-end-line="24" selection-end-column="28" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/TaskDao.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="164">
- <caret line="26" column="21" lean-forward="true" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
- </state>
- </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="289">
- <caret line="137" column="5" lean-forward="true" selection-start-line="133" selection-start-column="4" selection-end-line="137" selection-end-column="5" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="359" column="33" lean-forward="true" selection-start-line="359" selection-start-column="33" selection-end-line="359" selection-end-column="33" />
- </state>
- </provider>
- </entry>
- <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/src.zip!/java/lang/String.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="311">
- <caret line="110" column="19" lean-forward="false" selection-start-line="110" selection-start-column="19" selection-end-line="110" selection-end-column="19" />
- </state>
- </provider>
- </entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/1.6.3.RELEASE/spring-rabbit-1.6.3.RELEASE.jar!/org/springframework/amqp/rabbit/core/RabbitTemplate.class">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="246">
- <caret line="424" column="32" lean-forward="false" selection-start-line="424" selection-start-column="32" selection-end-line="424" selection-end-column="32" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/MessageNotice.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-242">
@@ -1028,13 +970,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/database.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="120">
- <caret line="8" column="57" lean-forward="false" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="57" />
- </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">
@@ -1077,13 +1013,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/alarmLevles.json">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-711">
- <caret line="23" column="20" lean-forward="false" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
- </state>
- </provider>
- </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/alarmLevles.json" />
<entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1112,13 +1042,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/ApiController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="307">
- <caret line="88" column="14" lean-forward="false" selection-start-line="88" selection-start-column="14" selection-end-line="88" selection-end-column="14" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/EquipmentServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1130,7 +1053,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="220" column="24" lean-forward="false" selection-start-line="220" selection-start-column="21" selection-end-line="220" selection-end-column="24" />
- <folding />
</state>
</provider>
</entry>
@@ -1148,78 +1070,14 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="11" column="84" lean-forward="false" selection-start-line="11" selection-start-column="83" selection-end-line="11" selection-end-column="84" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/redis-config.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb-config.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="15">
- <caret line="1" column="10" lean-forward="false" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="122">
- <caret line="70" column="9" lean-forward="false" selection-start-line="68" selection-start-column="65" selection-end-line="70" selection-end-column="9" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-141">
- <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="9" selection-end-column="88" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="604">
- <caret line="80" column="51" lean-forward="false" selection-start-line="80" selection-start-column="49" selection-end-line="80" selection-end-column="51" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="132">
- <caret line="19" column="12" lean-forward="false" selection-start-line="19" selection-start-column="12" selection-end-line="19" selection-end-column="12" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-3">
- <caret line="22" column="58" lean-forward="false" selection-start-line="22" selection-start-column="58" selection-end-line="22" selection-end-column="58" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="360">
- <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="28" selection-end-column="38" />
- </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="195">
- <caret line="19" column="42" lean-forward="false" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="42" />
- </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">
@@ -1231,55 +1089,146 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="88">
- <caret line="16" column="34" lean-forward="false" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
- <folding>
- <marker date="1509592583000" expanded="true" signature="504:736" ph="select c.mac... equipment" />
- <marker date="1509592583000" expanded="true" signature="795:841" ph="UPDATE equip... " />
- <marker date="1509592583000" expanded="true" signature="1584:1609" ph="select mac f... equipment" />
- <marker date="1509592583000" expanded="true" signature="1711:1777" ph="select time " />
- </folding>
- </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="643">
- <caret line="60" column="22" lean-forward="true" selection-start-line="60" selection-start-column="22" selection-end-line="60" selection-end-column="22" />
- <folding />
- </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" />
- <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="375">
- <caret line="25" column="65" lean-forward="false" selection-start-line="25" selection-start-column="65" selection-end-line="25" selection-end-column="65" />
- <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="570">
+ <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>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/log4j/log4j.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/spring/application.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>
+ </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">
+ <caret line="8" column="20" lean-forward="false" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="57" />
+ </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="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>
+ <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/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">
+ <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>
+ </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" />
+ <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>
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/alarmLevels.json">
+ <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" />
+ <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">
+ <caret line="96" column="1" lean-forward="false" selection-start-line="96" selection-start-column="1" selection-end-line="96" selection-end-column="1" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
diff --git a/src/main/resources/system/alarmLevels.json b/src/main/resources/system/alarmLevels.json
index 5ff876f..27e824a 100644
--- a/src/main/resources/system/alarmLevels.json
+++ b/src/main/resources/system/alarmLevels.json
@@ -1,97 +1,97 @@
{
"e1":{
- "level1":35,
- "level2":115,
- "level3":250
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e2":{
- "level1":50,
- "level2":250,
- "level3":420
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e3":{
- "level1":2000,
- "level2":5000,
- "level3":8000
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e4":{
- "level1":10,
- "level2":30,
- "level3":60
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e5":{
- "level1":0.01,
- "level2":0.02,
- "level3":0.05
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e6":{
- "level1":60,
- "level2":100,
- "level3":160
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e7":{
- "level1":35,
- "level2":30,
- "level3":40
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e8":{
- "level1":30,
- "level2":40,
- "level3":50
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e9":{
- "level1":0.01,
- "level2":0.02,
- "level3":0.03
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e10":{
- "level1":2,
- "level2":14,
- "level3":36
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e11":{
- "level1":0.05,
- "level2":0.475,
- "level3":1.6
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e12":{
- "level1":10000,
- "level2":15000,
- "level3":25000
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e13":{
- "level1":30,
- "level2":50,
- "level3":90
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e14":{
- "level1":2,
- "level2":4,
- "level3":6
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e15":{
- "level1":0.16,
- "level2":0.3,
- "level3":0.8
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e16":{
- "level1":0.04,
- "level2":0.18,
- "level3":0.565
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e17":{
- "level1":1,
- "level2":2,
- "level3":5
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e18":{
- "level1":5,
- "level2":6,
- "level3":8
+ "level1":0,
+ "level2":0,
+ "level3":0
},
"e19":{
- "level1":480,
- "level2":580,
- "level3":680
+ "level1":0,
+ "level2":0,
+ "level3":0
}
}
\ No newline at end of file
--
Gitblit v1.8.0