From 4253b8ce52930d3cca21fe76fd433170058788d0 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 25 Oct 2017 16:33:49 +0800
Subject: [PATCH] updates
---
.idea/workspace.xml | 150 ++++++++++++++++++++++++++++++++------------------
pom.xml | 11 +++
src/main/java/com/moral/monitor/listener/Listener.java | 2
3 files changed, 108 insertions(+), 55 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9c013a3..86b189e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="59bc3ffe-0657-438a-9fae-fbbdeee84a24" name="Default" comment="">
- <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_7_Final.xml" afterPath="" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_jsp_javax_servlet_jsp_api_2_3_1.xml" afterPath="" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/task_war.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/task_war.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/task_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/task_war_exploded.xml" />
<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/Listener.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.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/" />
@@ -27,21 +22,59 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="Listener.java" pinned="false" current-in-tab="false">
+ <file leaf-file-name="Listener.java" pinned="false" current-in-tab="true">
<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="35">
- <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
+ <state relative-caret-position="2888">
+ <caret line="230" column="47" lean-forward="false" selection-start-line="230" selection-start-column="47" selection-end-line="230" selection-end-column="47" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#2778#2796#0" expanded="true" />
+ <element signature="e#3024#3033#0" expanded="true" />
+ <element signature="e#6674#6690#0" expanded="true" />
+ <element signature="e#8171#8187#0" expanded="true" />
+ <element signature="e#8732#8748#0" expanded="true" />
+ <element signature="e#10372#10388#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Sensor.java" pinned="false" current-in-tab="false">
+ <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="102">
+ <caret line="11" column="25" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="quartz.xml" pinned="false" current-in-tab="true">
+ <file leaf-file-name="quartz.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/quartz.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="702">
- <caret line="75" column="21" lean-forward="true" selection-start-line="75" selection-start-column="21" selection-end-line="75" selection-end-column="21" />
+ <caret line="75" column="21" lean-forward="false" selection-start-line="75" selection-start-column="21" selection-end-line="75" selection-end-column="21" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="203">
+ <caret line="183" column="18" lean-forward="false" selection-start-line="183" selection-start-column="18" selection-end-line="183" selection-end-column="18" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="MonitorListener.java" pinned="false" current-in-tab="false">
+ <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="135">
+ <caret line="23" column="75" lean-forward="true" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
<folding />
</state>
</provider>
@@ -97,9 +130,9 @@
<option value="$PROJECT_DIR$/src/main/resources/database.xml" />
<option value="$PROJECT_DIR$/src/main/resources/mybatis.xml" />
<option value="$PROJECT_DIR$/src/main/resources/application.xml" />
- <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" />
- <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/resources/quartz.xml" />
+ <option value="$PROJECT_DIR$/pom.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" />
</list>
</option>
</component>
@@ -179,13 +212,6 @@
<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="resources" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -419,7 +445,7 @@
<workItem from="1508824129641" duration="250000" />
<workItem from="1508824729673" duration="781000" />
<workItem from="1508900264535" duration="3612000" />
- <workItem from="1508911116546" duration="3865000" />
+ <workItem from="1508911116546" duration="4151000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -505,11 +531,18 @@
<option name="project" value="LOCAL" />
<updated>1508902617619</updated>
</task>
- <option name="localTasksCounter" value="13" />
+ <task id="LOCAL-00013" summary="������������������">
+ <created>1508920155176</created>
+ <option name="number" value="00013" />
+ <option name="presentableId" value="LOCAL-00013" />
+ <option name="project" value="LOCAL" />
+ <updated>1508920155177</updated>
+ </task>
+ <option name="localTasksCounter" value="14" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="18622000" />
+ <option name="totallyTimeSpent" value="18908000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1404" height="877" extended-state="6" />
@@ -604,13 +637,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/VerificationCodeController.java">
- <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/java/com/moral/monitor/entity/apientity/ApiEquipment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
@@ -927,34 +953,10 @@
</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="135">
- <caret line="23" column="75" lean-forward="true" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
- <folding />
- </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="105">
<caret line="13" column="17" lean-forward="false" selection-start-line="13" selection-start-column="17" selection-end-line="13" selection-end-column="17" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="343">
- <caret line="179" column="16" lean-forward="false" selection-start-line="179" selection-start-column="16" selection-end-line="179" selection-end-column="16" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="35">
- <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -967,14 +969,54 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="203">
+ <caret line="183" column="18" lean-forward="false" selection-start-line="183" selection-start-column="18" selection-end-line="183" selection-end-column="18" />
+ <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="702">
- <caret line="75" column="21" lean-forward="true" selection-start-line="75" selection-start-column="21" selection-end-line="75" selection-end-column="21" />
+ <caret line="75" column="21" lean-forward="false" selection-start-line="75" selection-start-column="21" selection-end-line="75" selection-end-column="21" />
<folding />
</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="102">
+ <caret line="11" column="25" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="25" />
+ <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="135">
+ <caret line="23" column="75" lean-forward="true" selection-start-line="23" selection-start-column="75" selection-end-line="23" selection-end-column="75" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2888">
+ <caret line="230" column="47" lean-forward="false" selection-start-line="230" selection-start-column="47" selection-end-line="230" selection-end-column="47" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ <element signature="e#2778#2796#0" expanded="true" />
+ <element signature="e#3024#3033#0" expanded="true" />
+ <element signature="e#6674#6690#0" expanded="true" />
+ <element signature="e#8171#8187#0" expanded="true" />
+ <element signature="e#8732#8748#0" expanded="true" />
+ <element signature="e#10372#10388#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
diff --git a/pom.xml b/pom.xml
index 6b3180c..e3f235c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,18 @@
<version>4.1.7.Final</version>
</dependency>
+ <!-- Redis -->
+ <dependency>
+ <groupId>org.springframework.data</groupId>
+ <artifactId>spring-data-redis</artifactId>
+ <version>1.8.7.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>redis.clients</groupId>
+ <artifactId>jedis</artifactId>
+ <version>2.9.0</version>
+ </dependency>
</dependencies>
diff --git a/src/main/java/com/moral/monitor/listener/Listener.java b/src/main/java/com/moral/monitor/listener/Listener.java
index 0e00129..a8a7de0 100644
--- a/src/main/java/com/moral/monitor/listener/Listener.java
+++ b/src/main/java/com/moral/monitor/listener/Listener.java
@@ -228,7 +228,7 @@
List<Sensor> sensors = taskDao.selectFromsensorByver(ver);
Map<String, String> ex_sensorMap = new LinkedHashMap<String, String>();
for (Sensor sensor : sensors) {
- ex_sensorMap.put(sensor.getMac_key(), sensor.getSensor());
+ ex_sensorMap.put(sensor.getMacKey(), sensor.getSensor());
}
return ex_sensorMap;
}
--
Gitblit v1.8.0