From c3e285c9b9e162006da2446e3bed116e4546e8af Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sun, 29 Oct 2017 16:32:25 +0800
Subject: [PATCH] 代码更新
---
.idea/workspace.xml | 47 +++++++++++++++++++++++++++--------------------
src/main/java/com/moral/monitor/listener/TaskListener.java | 5 +++++
2 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a6583e3..a25cf73 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,7 @@
<component name="ChangeListManager">
<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$/src/main/resources/rabbitmq.xml" afterPath="$PROJECT_DIR$/src/main/resources/rabbitmq.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" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -21,21 +21,21 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="false">
+ <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="211">
- <caret line="77" column="53" lean-forward="false" selection-start-line="77" selection-start-column="39" selection-end-line="77" selection-end-column="53" />
+ <state relative-caret-position="27">
+ <caret line="81" column="0" lean-forward="true" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="true">
+ <file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="502">
- <caret line="34" column="80" lean-forward="true" selection-start-line="34" selection-start-column="80" selection-end-line="34" selection-end-column="80" />
+ <state relative-caret-position="187">
+ <caret line="13" column="11" lean-forward="true" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
<folding />
</state>
</provider>
@@ -109,8 +109,8 @@
<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/mapper/JobDao.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/java/com/moral/monitor/listener/TaskListener.java" />
</list>
</option>
</component>
@@ -128,8 +128,8 @@
<option name="CUSTOM_FILTER" />
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="-1445" />
- <option name="y" value="36" />
+ <option name="x" value="-1422" />
+ <option name="y" value="23" />
<option name="width" value="1920" />
<option name="height" value="1057" />
</component>
@@ -400,7 +400,7 @@
<workItem from="1509068025499" duration="9340000" />
<workItem from="1509085973276" duration="5136000" />
<workItem from="1509095479339" duration="556000" />
- <workItem from="1509260666213" duration="3567000" />
+ <workItem from="1509260666213" duration="3847000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -570,14 +570,21 @@
<option name="project" value="LOCAL" />
<updated>1509265555027</updated>
</task>
- <option name="localTasksCounter" value="25" />
+ <task id="LOCAL-00025" summary="������������">
+ <created>1509265660083</created>
+ <option name="number" value="00025" />
+ <option name="presentableId" value="LOCAL-00025" />
+ <option name="project" value="LOCAL" />
+ <updated>1509265660083</updated>
+ </task>
+ <option name="localTasksCounter" value="26" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="71663000" />
+ <option name="totallyTimeSpent" value="71943000" />
</component>
<component name="ToolWindowManager">
- <frame x="-1445" y="36" width="1920" height="1057" extended-state="0" />
+ <frame x="-1422" y="23" width="1920" height="1057" 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.6023018" sideWeight="0.5176471" order="8" side_tool="true" content_ui="tabs" />
@@ -999,18 +1006,18 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="211">
- <caret line="77" column="53" lean-forward="false" selection-start-line="77" selection-start-column="39" selection-end-line="77" selection-end-column="53" />
+ <state relative-caret-position="187">
+ <caret line="13" column="11" lean-forward="true" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml">
+ <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="502">
- <caret line="34" column="80" lean-forward="true" selection-start-line="34" selection-start-column="80" selection-end-line="34" selection-end-column="80" />
+ <state relative-caret-position="27">
+ <caret line="81" column="0" lean-forward="true" selection-start-line="81" selection-start-column="0" selection-end-line="81" selection-end-column="0" />
<folding />
</state>
</provider>
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index 1460079..69c101c 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -16,6 +16,7 @@
import org.springframework.amqp.rabbit.connection.Connection;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
@@ -53,6 +54,10 @@
String mac = msgData.get("mac");
String ver = msgData.get("ver");
+ if(StringUtils.isEmpty(ver) || StringUtils.isEmpty(mac)) {
+ return;
+ }
+
Map<String, Float> adjustMap;
if(RedisUtil.hasKey(redisTemplate, mac)) {
adjustMap = JSON.parseObject(RedisUtil.get(redisTemplate, mac), new TypeReference<Map<String, Float>>() {});
--
Gitblit v1.8.0