From d7dc62f727cb8579dfac2065df30ae390e4d1eff Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 14:13:24 +0800
Subject: [PATCH] 数据库更新数据
---
.idea/workspace.xml | 53 +++++++++++++++-----------
src/main/java/com/moral/monitor/listener/TaskListener.java | 4 +-
src/main/resources/rabbitmq.xml | 24 ++++-------
3 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ef7ebdc..0df124e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,11 +22,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <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="-6">
- <caret line="45" column="9" lean-forward="true" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
+ <state relative-caret-position="262">
+ <caret line="69" column="0" lean-forward="false" selection-start-line="69" selection-start-column="2" selection-end-line="70" selection-end-column="57" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -34,11 +34,11 @@
</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="419">
- <caret line="41" column="47" lean-forward="false" selection-start-line="41" selection-start-column="34" selection-end-line="41" selection-end-column="47" />
+ <state relative-caret-position="192">
+ <caret line="23" column="50" lean-forward="true" selection-start-line="23" selection-start-column="50" selection-end-line="23" selection-end-column="50" />
<folding />
</state>
</provider>
@@ -120,9 +120,9 @@
<option name="FILTER_DEBUG" value="true" />
<option name="CUSTOM_FILTER" />
</component>
- <component name="ProjectFrameBounds">
- <option name="x" value="-1546" />
- <option name="y" value="55" />
+ <component name="ProjectFrameBounds" extendedState="6">
+ <option name="x" value="-14" />
+ <option name="y" value="23" />
<option name="width" value="1404" />
<option name="height" value="877" />
</component>
@@ -432,7 +432,7 @@
<workItem from="1509026048007" duration="2710000" />
<workItem from="1509030446574" duration="3006000" />
<workItem from="1509056858319" duration="2984000" />
- <workItem from="1509068025499" duration="7858000" />
+ <workItem from="1509068025499" duration="8768000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -560,14 +560,21 @@
<option name="project" value="LOCAL" />
<updated>1509071255017</updated>
</task>
- <option name="localTasksCounter" value="19" />
+ <task id="LOCAL-00019" summary="���������������������">
+ <created>1509083891003</created>
+ <option name="number" value="00019" />
+ <option name="presentableId" value="LOCAL-00019" />
+ <option name="project" value="LOCAL" />
+ <updated>1509083891003</updated>
+ </task>
+ <option name="localTasksCounter" value="20" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="60922000" />
+ <option name="totallyTimeSpent" value="61832000" />
</component>
<component name="ToolWindowManager">
- <frame x="-1546" y="55" width="1404" height="877" extended-state="0" />
+ <frame x="6" 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.68414325" sideWeight="0.5117474" order="8" side_tool="true" content_ui="tabs" />
@@ -1015,21 +1022,21 @@
</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="-6">
- <caret line="45" column="9" lean-forward="true" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state relative-caret-position="192">
+ <caret line="23" column="50" lean-forward="true" selection-start-line="23" selection-start-column="50" selection-end-line="23" selection-end-column="50" />
+ <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="419">
- <caret line="41" column="47" lean-forward="false" selection-start-line="41" selection-start-column="34" selection-end-line="41" selection-end-column="47" />
- <folding />
+ <state relative-caret-position="262">
+ <caret line="69" column="0" lean-forward="false" selection-start-line="69" selection-start-column="2" selection-end-line="70" selection-end-column="57" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index a600c9c..aa6399e 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -70,11 +70,11 @@
// System.out.println(message);
// System.out.println(JSON.toJSONString(msgData));
- rabbitTemplate.convertAndSend("monitors_data", "", JSON.toJSONString(msgData).getBytes());
+// rabbitTemplate.convertAndSend("monitors_data", "", JSON.toJSONString(msgData).getBytes());
// rabbitTemplate.send("monitors_data_3", "", new Message(JSON.toJSONString(msgData).getBytes(), new MessageProperties()));
int state = (new Random()).nextInt(4) % 5;
- rabbitTemplate.convertAndSend("monitors_alarm", "", "{\"mac\": \"" + mac + "\", \"state\": " + state + "}");
+// rabbitTemplate.convertAndSend("monitors_alarm", "", "{\"mac\": \"" + mac + "\", \"state\": " + state + "}");
jobDao.updateStateByMac(mac, state);
}
diff --git a/src/main/resources/rabbitmq.xml b/src/main/resources/rabbitmq.xml
index 6279b11..fb5c2dc 100644
--- a/src/main/resources/rabbitmq.xml
+++ b/src/main/resources/rabbitmq.xml
@@ -21,29 +21,23 @@
<constructor-arg ref="rabbitConnectionFactory"></constructor-arg>
</bean>
- <rabbit:queue name="devices_storage_data" durable="true" exclusive="false" auto-delete="false"/>
-
- <rabbit:fanout-exchange name="devices_data" durable="true" auto-delete="false">
- <rabbit:bindings>
- <rabbit:binding queue="devices_storage_data"></rabbit:binding>
- </rabbit:bindings>
- </rabbit:fanout-exchange>
+ <rabbit:queue name="monitors_storage_data" durable="false" exclusive="false" auto-delete="true"/>
<!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.MonitorListener"/>-->
<!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.Listener"/>-->
<bean id="amqpMsgListener" class="com.moral.monitor.listener.TaskListener"/>
<rabbit:listener-container connection-factory="rabbitConnectionFactory" acknowledge="auto" >
- <rabbit:listener queues="devices_storage_data" ref="amqpMsgListener" />
+ <rabbit:listener queues="monitors_storage_data" ref="amqpMsgListener" />
</rabbit:listener-container>
- <rabbit:queue name="monitors_storage_data" durable="false" auto-delete="true" exclusive="false" />
+ <!--<rabbit:queue name="monitors_storage_data_2" durable="true" auto-delete="false" exclusive="false" />-->
- <rabbit:fanout-exchange name="monitors_data" durable="false" auto-delete="true">
- <rabbit:bindings>
- <rabbit:binding queue="monitors_storage_data"></rabbit:binding>
- </rabbit:bindings>
- </rabbit:fanout-exchange>
+ <!--<rabbit:fanout-exchange name="monitors_data_2" durable="true" auto-delete="false">-->
+ <!--<rabbit:bindings>-->
+ <!--<rabbit:binding queue="monitors_storage_data_2"></rabbit:binding>-->
+ <!--</rabbit:bindings>-->
+ <!--</rabbit:fanout-exchange>-->
<!--http://blog.csdn.net/u012204058/article/details/54292888-->
<!--http://blog.csdn.net/itmrchen/article/details/53285648-->
@@ -56,5 +50,5 @@
<!--</rabbit:bindings>-->
<!--</rabbit:fanout-exchange>-->
- <rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false" />
+ <!--<rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false" />-->
</beans>
\ No newline at end of file
--
Gitblit v1.8.0