From de1c0c35d6c5c7f85789ebedc6290864114b479d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 02 Nov 2017 13:25:50 +0800
Subject: [PATCH] 更新 设备与组织的关系
---
.idea/workspace.xml | 337 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 209 insertions(+), 128 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1470887..6a75fa0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,19 +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__org_mongodb_mongo_java_driver_3_5_0.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_0_RELEASE.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_0_RELEASE.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/mongodb-config.properties" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/mongodb.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="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.xml" afterPath="$PROJECT_DIR$/src/main/resources/application.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/redis.xml" afterPath="$PROJECT_DIR$/src/main/resources/redis.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/task.iml" afterPath="$PROJECT_DIR$/task.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -31,31 +21,37 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <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">
+ <file leaf-file-name="StopStateCheck.java" pinned="false" current-in-tab="false">
+ <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="662">
- <caret line="106" column="58" lean-forward="false" selection-start-line="106" selection-start-column="58" selection-end-line="106" selection-end-column="58" />
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="JobDao.xml" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="238">
+ <caret line="26" column="80" lean-forward="false" selection-start-line="26" selection-start-column="75" selection-end-line="26" selection-end-column="80" />
<folding>
- <element signature="imports" expanded="true" />
+ <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>
</file>
- <file leaf-file-name="redis.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml">
+ <file leaf-file-name="JobDao.java" pinned="false" current-in-tab="false">
+ <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="-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>
- <element signature="e#804#822#0" expanded="true" />
- <element signature="e#871#889#0" expanded="true" />
- <element signature="e#937#960#0" expanded="true" />
- <element signature="e#1116#1131#0" expanded="true" />
- <element signature="e#1139#1154#0" expanded="true" />
- <element signature="e#1166#1181#0" expanded="true" />
- </folding>
+ <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" />
+ <folding />
</state>
</provider>
</entry>
@@ -95,6 +91,8 @@
<find>adjust_key</find>
<find>mongo-client</find>
<find>mongo</find>
+ <find>monitors_storage_data2</find>
+ <find>System.out</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -129,11 +127,9 @@
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java" />
- <option value="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StateCheck.java" />
<option value="$PROJECT_DIR$/src/main/resources/quartz.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java" />
- <option value="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" />
<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" />
@@ -142,6 +138,9 @@
<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" />
</list>
</option>
</component>
@@ -179,9 +178,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scratches" />
- <pane id="AndroidView" />
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -205,13 +201,58 @@
<item name="task" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="task" type="b2602c69:ProjectViewProjectNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="monitor" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="task" type="b2602c69:ProjectViewProjectNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="monitor" type="462c0819:PsiDirectoryNode" />
+ <item name="listener" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="task" type="b2602c69:ProjectViewProjectNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="monitor" type="462c0819:PsiDirectoryNode" />
+ <item name="listener" type="462c0819:PsiDirectoryNode" />
+ <item name="quartz" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="task" type="b2602c69:ProjectViewProjectNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="task" type="b2602c69:ProjectViewProjectNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="mapper" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
+ <pane id="AndroidView" />
+ <pane id="Scratches" />
+ <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -465,7 +506,11 @@
<workItem from="1509503776436" duration="416000" />
<workItem from="1509507731791" duration="3149000" />
<workItem from="1509542138760" duration="1615000" />
- <workItem from="1509568770062" duration="2015000" />
+ <workItem from="1509568770062" duration="2165000" />
+ <workItem from="1509578672500" duration="448000" />
+ <workItem from="1509583522110" duration="175000" />
+ <workItem from="1509584069292" duration="553000" />
+ <workItem from="1509592515461" duration="222000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -705,44 +750,79 @@
<option name="project" value="LOCAL" />
<updated>1509517348407</updated>
</task>
- <option name="localTasksCounter" value="35" />
+ <task id="LOCAL-00035" summary="���������������������mongodb">
+ <created>1509570832801</created>
+ <option name="number" value="00035" />
+ <option name="presentableId" value="LOCAL-00035" />
+ <option name="project" value="LOCAL" />
+ <updated>1509570832801</updated>
+ </task>
+ <task id="LOCAL-00036" summary="updates">
+ <created>1509578813467</created>
+ <option name="number" value="00036" />
+ <option name="presentableId" value="LOCAL-00036" />
+ <option name="project" value="LOCAL" />
+ <updated>1509578813467</updated>
+ </task>
+ <task id="LOCAL-00037" summary="updates">
+ <created>1509579020352</created>
+ <option name="number" value="00037" />
+ <option name="presentableId" value="LOCAL-00037" />
+ <option name="project" value="LOCAL" />
+ <updated>1509579020352</updated>
+ </task>
+ <task id="LOCAL-00038" summary="������log">
+ <created>1509583681609</created>
+ <option name="number" value="00038" />
+ <option name="presentableId" value="LOCAL-00038" />
+ <option name="project" value="LOCAL" />
+ <updated>1509583681610</updated>
+ </task>
+ <task id="LOCAL-00039" summary="������log">
+ <created>1509584703267</created>
+ <option name="number" value="00039" />
+ <option name="presentableId" value="LOCAL-00039" />
+ <option name="project" value="LOCAL" />
+ <updated>1509584703267</updated>
+ </task>
+ <option name="localTasksCounter" value="40" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="96905000" />
+ <option name="totallyTimeSpent" value="98453000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1404" height="877" extended-state="6" />
<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.32992327" sideWeight="0.51615274" 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.32992327" sideWeight="0.51615274" 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.48235294" 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.4838473" 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="true" show_stripe_button="true" weight="0.54092073" sideWeight="0.48235294" 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.23348017" 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.22613803" 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>
@@ -794,7 +874,6 @@
<MESSAGE value="������app������������������" />
<MESSAGE value="BUG-058" />
<MESSAGE value="������������������" />
- <MESSAGE value="updates" />
<MESSAGE value="RabbitMQ & Redis ������" />
<MESSAGE value="������������" />
<MESSAGE value="���������������������" />
@@ -803,7 +882,10 @@
<MESSAGE value="������������������������" />
<MESSAGE value="������������������" />
<MESSAGE value="������������������" />
- <option name="LAST_COMMIT_MESSAGE" value="������������������" />
+ <MESSAGE value="���������������������mongodb" />
+ <MESSAGE value="updates" />
+ <MESSAGE value="������log" />
+ <option name="LAST_COMMIT_MESSAGE" value="������log" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -812,13 +894,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/apientity/Report.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="5" column="19" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="19" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
@@ -958,7 +1033,6 @@
<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" />
- <folding />
</state>
</provider>
</entry>
@@ -990,47 +1064,10 @@
</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="438">
- <caret line="80" column="51" lean-forward="false" selection-start-line="80" selection-start-column="49" selection-end-line="80" selection-end-column="51" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="691">
<caret line="94" column="55" lean-forward="true" selection-start-line="94" selection-start-column="55" selection-end-line="94" selection-end-column="55" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
- </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="255">
- <caret line="17" column="4" lean-forward="false" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="64" />
- <folding />
- </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="105">
- <caret line="13" column="65" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="65" />
- </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="120">
- <caret line="8" column="62" lean-forward="false" selection-start-line="8" selection-start-column="62" selection-end-line="8" selection-end-column="62" />
</state>
</provider>
</entry>
@@ -1076,13 +1113,6 @@
</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="90">
- <caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
- </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">
@@ -1105,6 +1135,48 @@
</state>
</provider>
</entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.0.RELEASE/spring-data-mongodb-2.0.0.RELEASE.jar!/org/springframework/data/mongodb/config/spring-mongo-2.0.xsd">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="15" column="35" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="35" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.0.RELEASE/spring-data-mongodb-2.0.0.RELEASE.jar!/org/springframework/data/mongodb/core/MongoTemplate.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="463">
+ <caret line="166" column="69" lean-forward="false" selection-start-line="166" selection-start-column="57" selection-end-line="166" selection-end-column="69" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb.xml">
+ <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">
@@ -1120,39 +1192,53 @@
</state>
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.0.RELEASE/spring-data-mongodb-2.0.0.RELEASE.jar!/org/springframework/data/mongodb/config/spring-mongo-2.0.xsd">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="15" column="35" lean-forward="false" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="35" />
+ <state 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="60">
+ <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" />
- <folding />
</state>
</provider>
</entry>
- <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-mongodb/2.0.0.RELEASE/spring-data-mongodb-2.0.0.RELEASE.jar!/org/springframework/data/mongodb/core/MongoTemplate.class">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="463">
- <caret line="166" column="69" lean-forward="false" selection-start-line="166" selection-start-column="57" selection-end-line="166" selection-end-column="69" />
+ <state 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" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb.xml">
+ <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="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 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" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/redis-config.properties">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="22" column="49" lean-forward="false" selection-start-line="22" selection-start-column="35" selection-end-line="22" selection-end-column="49" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/LoginDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -1160,20 +1246,15 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb-config.properties">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml">
<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" />
- <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="662">
- <caret line="106" column="58" lean-forward="false" selection-start-line="106" selection-start-column="58" selection-end-line="106" selection-end-column="58" />
+ <state relative-caret-position="238">
+ <caret line="26" column="80" lean-forward="false" selection-start-line="26" selection-start-column="75" selection-end-line="26" selection-end-column="80" />
<folding>
- <element signature="imports" expanded="true" />
+ <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>
--
Gitblit v1.8.0