From a1e38684318f65b148e4f470a440e91ef8a1b66c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 15 Nov 2017 00:07:12 +0800
Subject: [PATCH] test
---
src/main/resources/spring/quartz.xml | 1
.idea/workspace.xml | 265 +++++++++++++++++++++++++++++--------------
src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java | 57 +++++++-
3 files changed, 226 insertions(+), 97 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b6ea1f0..ecea5c4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,13 +6,10 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
- <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sourceforge_jexcelapi_jxl_2_6_12.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/task_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/task_war_exploded.xml" />
+ <list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="test">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/quartz.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/quartz.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/Test.java" afterPath="$PROJECT_DIR$/src/test/java/Test.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/task.iml" afterPath="$PROJECT_DIR$/task.iml" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -25,12 +22,97 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="47" column="4" lean-forward="false" selection-start-line="47" selection-start-column="4" selection-end-line="48" selection-end-column="48" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="RedisServiceImpl.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1335">
+ <caret line="106" column="116" lean-forward="false" selection-start-line="106" selection-start-column="8" selection-end-line="106" selection-end-column="116" />
+ <folding>
+ <element signature="e#1129#1130#0" expanded="true" />
+ <element signature="e#1166#1167#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="RedisUtil.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="180">
+ <caret line="15" column="76" lean-forward="false" selection-start-line="15" selection-start-column="73" selection-end-line="15" selection-end-column="76" />
+ <folding>
+ <element signature="e#261#262#0" expanded="true" />
+ <element signature="e#301#302#0" expanded="true" />
+ <element signature="e#524#525#0" expanded="true" />
+ <element signature="e#575#576#0" expanded="true" />
+ <element signature="e#854#855#0" expanded="true" />
+ <element signature="e#893#894#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <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="75">
+ <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
<file leaf-file-name="quartz.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="84">
- <caret line="73" column="57" lean-forward="false" selection-start-line="73" selection-start-column="43" selection-end-line="73" selection-end-column="57" />
+ <state relative-caret-position="642">
+ <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
<folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Test.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/test/java/Test.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="105">
+ <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <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="225">
+ <caret line="22" column="18" lean-forward="false" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="JobDao.xml" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="570">
+ <caret line="38" column="60" lean-forward="false" selection-start-line="38" selection-start-column="60" selection-end-line="38" selection-end-column="60" />
+ <folding>
+ <marker date="1510358902000" expanded="true" signature="910:1238" ph="select a.id,... equipment" />
+ <marker date="1510358902000" expanded="true" signature="1297:1343" ph="UPDATE equip... " />
+ <marker date="1510358902000" expanded="true" signature="2086:2111" ph="select mac f... equipment" />
+ <marker date="1510358902000" expanded="true" signature="2213:2279" ph="select time " />
+ </folding>
</state>
</provider>
</entry>
@@ -72,6 +154,7 @@
<find>monitors_storage_data2</find>
<find>System.out</find>
<find>getLoggerByMac</find>
+ <find>getEquStateKey</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -96,7 +179,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisManager.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/TestController.java" />
<option value="$PROJECT_DIR$/src/main/resources/redis-config.properties" />
- <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/job/Adjust.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/Test.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java" />
@@ -107,7 +189,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StateCheck.java" />
<option value="$PROJECT_DIR$/src/main/resources/quartz.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java" />
- <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" />
<option value="$PROJECT_DIR$/src/main/resources/alarmLevles.json" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/resources/mongodb-config.properties" />
@@ -126,8 +207,10 @@
<option value="$PROJECT_DIR$/src/main/resources/spring/database.xml" />
<option value="$PROJECT_DIR$/src/main/resources/mongodb/mongodb-config.properties" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
- <option value="$PROJECT_DIR$/src/test/java/Test.java" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java" />
+ <option value="$PROJECT_DIR$/src/test/java/Test.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java" />
<option value="$PROJECT_DIR$/src/main/resources/spring/quartz.xml" />
</list>
</option>
@@ -145,7 +228,7 @@
<option name="FILTER_DEBUG" value="true" />
<option name="CUSTOM_FILTER" />
</component>
- <component name="ProjectFrameBounds" extendedState="6">
+ <component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1405" />
<option name="height" value="877" />
@@ -166,9 +249,10 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="PackagesPane" />
- <pane id="Scratches" />
<pane id="AndroidView" />
+ <pane id="Scope" />
+ <pane id="Scratches" />
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -192,21 +276,6 @@
<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="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
@@ -221,7 +290,6 @@
<select />
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -521,14 +589,9 @@
<workItem from="1510627531530" duration="208000" />
<workItem from="1510627773177" duration="2490000" />
<workItem from="1510646592713" duration="793000" />
- <workItem from="1510666571633" duration="199000" />
- </task>
- <task id="LOCAL-00016" summary="������������">
- <created>1508987038075</created>
- <option name="number" value="00016" />
- <option name="presentableId" value="LOCAL-00016" />
- <option name="project" value="LOCAL" />
- <updated>1508987038075</updated>
+ <workItem from="1510666571633" duration="425000" />
+ <workItem from="1510672132218" duration="3163000" />
+ <workItem from="1510675574562" duration="21000" />
</task>
<task id="LOCAL-00017" summary="RabbitMQ & Redis ������">
<created>1509061963499</created>
@@ -866,14 +929,21 @@
<option name="project" value="LOCAL" />
<updated>1510492960788</updated>
</task>
- <option name="localTasksCounter" value="65" />
+ <task id="LOCAL-00065" summary="test">
+ <created>1510666790661</created>
+ <option name="number" value="00065" />
+ <option name="presentableId" value="LOCAL-00065" />
+ <option name="project" value="LOCAL" />
+ <updated>1510666790662</updated>
+ </task>
+ <option name="localTasksCounter" value="66" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="138330000" />
+ <option name="totallyTimeSpent" value="141740000" />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="23" width="1405" height="877" extended-state="6" />
+ <frame x="0" y="23" width="1405" height="877" extended-state="0" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -884,21 +954,21 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5639386" sideWeight="0.52643174" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3286445" sideWeight="0.49706313" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.51662403" sideWeight="0.4632893" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5639386" sideWeight="0.4735683" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.51662403" sideWeight="0.4632893" 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.23404256" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23991196" 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="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39897698" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="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" />
@@ -975,13 +1045,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <option name="time" value="1" />
+ <option name="time" value="2" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/resources/mongodb.xml" />
- <entry file="file://$PROJECT_DIR$/src/main/resources/redis-config.properties" />
<entry file="file://$PROJECT_DIR$/src/main/resources/mongodb-config.properties" />
<entry file="file://$PROJECT_DIR$/src/main/resources/redis.xml" />
<entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml" />
@@ -1035,13 +1103,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="432" column="16" lean-forward="false" selection-start-line="432" selection-start-column="16" selection-end-line="432" selection-end-column="16" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="15" column="16" lean-forward="false" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="16" />
</state>
</provider>
</entry>
@@ -1112,20 +1173,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="14" column="25" lean-forward="true" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="22" column="49" lean-forward="false" selection-start-line="22" selection-start-column="35" selection-end-line="22" selection-end-column="49" />
</state>
</provider>
</entry>
@@ -1231,15 +1278,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="29" lean-forward="false" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/test/java/Test.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
- <folding />
</state>
</provider>
</entry>
@@ -1247,7 +1285,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="24" lean-forward="false" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
- <folding />
</state>
</provider>
</entry>
@@ -1267,22 +1304,62 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="22" column="18" lean-forward="false" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
+ <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="570">
+ <caret line="38" column="60" lean-forward="false" selection-start-line="38" selection-start-column="60" selection-end-line="38" selection-end-column="60" />
+ <folding>
+ <marker date="1510358902000" expanded="true" signature="910:1238" ph="select a.id,... equipment" />
+ <marker date="1510358902000" expanded="true" signature="1297:1343" ph="UPDATE equip... " />
+ <marker date="1510358902000" expanded="true" signature="2086:2111" ph="select mac f... equipment" />
+ <marker date="1510358902000" expanded="true" signature="2213:2279" ph="select time " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/data/spring-data-redis/1.8.7.RELEASE/spring-data-redis-1.8.7.RELEASE.jar!/org/springframework/data/redis/core/RedisTemplate.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="439">
+ <caret line="537" column="18" lean-forward="false" selection-start-line="537" selection-start-column="18" selection-end-line="537" selection-end-column="18" />
+ <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="75">
- <caret line="78" column="50" lean-forward="false" selection-start-line="78" selection-start-column="50" selection-end-line="78" selection-end-column="50" />
+ <state relative-caret-position="225">
+ <caret line="47" column="4" lean-forward="false" selection-start-line="47" selection-start-column="4" selection-end-line="48" selection-end-column="48" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/RedisUtil.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="180">
+ <caret line="15" column="76" lean-forward="false" selection-start-line="15" selection-start-column="73" selection-end-line="15" selection-end-column="76" />
<folding>
- <element signature="e#3761#3770#0" expanded="true" />
- <element signature="e#4863#4881#0" expanded="true" />
- <element signature="e#5954#5970#0" expanded="true" />
+ <element signature="e#261#262#0" expanded="true" />
+ <element signature="e#301#302#0" expanded="true" />
+ <element signature="e#524#525#0" expanded="true" />
+ <element signature="e#575#576#0" expanded="true" />
+ <element signature="e#854#855#0" expanded="true" />
+ <element signature="e#893#894#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/service/impl/RedisServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-205">
- <caret line="38" column="27" lean-forward="false" selection-start-line="38" selection-start-column="27" selection-end-line="38" selection-end-column="27" />
+ <state relative-caret-position="1335">
+ <caret line="106" column="116" lean-forward="false" selection-start-line="106" selection-start-column="8" selection-end-line="106" selection-end-column="116" />
<folding>
<element signature="e#1129#1130#0" expanded="true" />
<element signature="e#1166#1167#0" expanded="true" />
@@ -1290,10 +1367,26 @@
</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="105">
+ <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/quartz.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="84">
- <caret line="73" column="57" lean-forward="false" selection-start-line="73" selection-start-column="43" selection-end-line="73" selection-end-column="57" />
+ <state relative-caret-position="642">
+ <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
<folding />
</state>
</provider>
diff --git a/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java b/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
index 434f45b..9d600ba 100644
--- a/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
+++ b/src/main/java/com/moral/monitor/listener/quartz/StopStateCheck.java
@@ -1,18 +1,25 @@
package com.moral.monitor.listener.quartz;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
import com.moral.monitor.dao.JobDao;
import com.moral.monitor.entity.Equipment;
import com.moral.monitor.entity.Logger;
+import com.moral.monitor.util.RedisUtil;
+import org.springframework.data.redis.core.RedisTemplate;
import javax.annotation.Resource;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
public class StopStateCheck {
@Resource
JobDao jobDao;
+
+ @Resource
+ RedisTemplate<String, String> redisTemplate;
+
+ private int waits = 10000;
public void check() {
@@ -20,19 +27,47 @@
for (int i = 0; i < equipmentList.size(); i++) {
Equipment equipment = equipmentList.get(i);
String mac = equipment.getMac();
- Logger logger = jobDao.getLoggerByMac(mac);
- if(logger != null) {
- Date time = logger.getTime();
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(time);
- calendar.add(Calendar.MINUTE, 10);
- Date date = new Date();
- if(calendar.getTime().getTime() < date.getTime()) {
+
+ String static_equ_json = RedisUtil.get(redisTemplate, "static_equ_" + mac);
+ Map<String,String> seJSON = JSON.parseObject(static_equ_json,new TypeReference<Map<String,String>>() {});
+ if(!seJSON.isEmpty()) {
+ String orgId = seJSON.get("orgId");
+ String areaCode = seJSON.get("areaCode");
+ String monitorpointId = seJSON.get("monitorpointId");
+
+ String key = "state_" + orgId + "_" + areaCode + "_" + monitorpointId + "_" + mac;
+ String state_json = RedisUtil.get(redisTemplate, key);
+ Map<String,String> stateJSON = JSON.parseObject(state_json,new TypeReference<Map<String,String>>() {});
+ if(!stateJSON.isEmpty()) {
+ Long time = Long.parseLong(stateJSON.get("time"));
+ if(time + waits < new Date().getTime()) {
+ jobDao.updateStateByMac(mac, 4);
+ }
+ } else {
jobDao.updateStateByMac(mac, 4);
}
} else {
jobDao.updateStateByMac(mac, 4);
}
}
+
+// List<Equipment> equipmentList = jobDao.getAllEquipment();
+// for (int i = 0; i < equipmentList.size(); i++) {
+// Equipment equipment = equipmentList.get(i);
+// String mac = equipment.getMac();
+// Logger logger = jobDao.getLoggerByMac(mac);
+// if(logger != null) {
+// Date time = logger.getTime();
+// Calendar calendar = Calendar.getInstance();
+// calendar.setTime(time);
+// calendar.add(Calendar.MINUTE, 10);
+// Date date = new Date();
+// if(calendar.getTime().getTime() < date.getTime()) {
+// jobDao.updateStateByMac(mac, 4);
+// }
+// } else {
+// jobDao.updateStateByMac(mac, 4);
+// }
+// }
}
}
diff --git a/src/main/resources/spring/quartz.xml b/src/main/resources/spring/quartz.xml
index 7397382..68585b3 100644
--- a/src/main/resources/spring/quartz.xml
+++ b/src/main/resources/spring/quartz.xml
@@ -88,6 +88,7 @@
<!--<ref bean="tokenJobsimpleTrigger" />-->
<!--<ref bean="checkJobsimpleTrigger"/>-->
<!--<ref bean="noticeJobsimpleTrigger"/>-->
+
<ref bean="stateJobsimpleTrigger" />
</list>
</property>
--
Gitblit v1.8.0