From f0aa3d758d72891edb08f8e3ac14ffcd95fbb30c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 07 Nov 2017 09:47:56 +0800
Subject: [PATCH] test
---
.idea/workspace.xml | 56 ++++++++++++++++-----------
src/main/java/com/moral/monitor/listener/TaskListener.java | 4 +-
src/main/resources/spring/rabbitmq.xml | 4 +-
3 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1b774b2..8605633 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,6 +9,7 @@
<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/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/spring/rabbitmq.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -21,24 +22,24 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="false">
+ <file leaf-file-name="rabbitmq.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="9" column="37" lean-forward="false" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="37" />
+ <state relative-caret-position="495">
+ <caret line="33" column="93" lean-forward="false" selection-start-line="33" selection-start-column="93" selection-end-line="33" selection-end-column="93" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="TaskListener.java" pinned="false" current-in-tab="true">
+ <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="533">
- <caret line="97" column="25" lean-forward="false" selection-start-line="97" selection-start-column="25" selection-end-line="97" selection-end-column="25" />
+ <caret line="97" column="2" lean-forward="false" selection-start-line="97" selection-start-column="2" selection-end-line="97" selection-end-column="2" />
<folding>
<element signature="imports" expanded="true" />
- <marker date="1510018984000" expanded="false" signature="5505:5523" ph="<~>" />
+ <marker date="1510019181000" expanded="false" signature="5505:5523" ph="<~>" />
</folding>
</state>
</provider>
@@ -131,8 +132,8 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
<option value="$PROJECT_DIR$/src/main/resources/mybatis/mybatis.xml" />
<option value="$PROJECT_DIR$/src/main/resources/system/alarmLevels.json" />
- <option value="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" />
<option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/TaskListener.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml" />
</list>
</option>
</component>
@@ -516,7 +517,7 @@
<workItem from="1509957226710" duration="251000" />
<workItem from="1509957794827" duration="173000" />
<workItem from="1510014788172" duration="2297000" />
- <workItem from="1510018622224" duration="319000" />
+ <workItem from="1510018622224" duration="553000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -854,11 +855,18 @@
<option name="project" value="LOCAL" />
<updated>1510016141890</updated>
</task>
- <option name="localTasksCounter" value="49" />
+ <task id="LOCAL-00049" summary="test">
+ <created>1510019044081</created>
+ <option name="number" value="00049" />
+ <option name="presentableId" value="LOCAL-00049" />
+ <option name="project" value="LOCAL" />
+ <updated>1510019044081</updated>
+ </task>
+ <option name="localTasksCounter" value="50" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="115408000" />
+ <option name="totallyTimeSpent" value="115642000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1404" height="877" extended-state="0" />
@@ -958,7 +966,8 @@
<MESSAGE value="������MQ������������" />
<MESSAGE value="test ack flag" />
<MESSAGE value="insert hostory data to mongo" />
- <option name="LAST_COMMIT_MESSAGE" value="insert hostory data to mongo" />
+ <MESSAGE value="test" />
+ <option name="LAST_COMMIT_MESSAGE" value="test" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -1215,6 +1224,7 @@
<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" />
+ <folding />
</state>
</provider>
</entry>
@@ -1222,14 +1232,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="56" column="13" lean-forward="false" selection-start-line="56" selection-start-column="13" selection-end-line="56" selection-end-column="13" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="9" column="37" lean-forward="false" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="37" />
<folding />
</state>
</provider>
@@ -1252,8 +1254,8 @@
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/1.6.3.RELEASE/spring-rabbit-1.6.3.RELEASE.jar!/org/springframework/amqp/rabbit/core/RabbitTemplate.class">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="246">
- <caret line="368" column="58" lean-forward="true" selection-start-line="368" selection-start-column="58" selection-end-line="368" selection-end-column="58" />
+ <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" />
<folding />
</state>
</provider>
@@ -1261,14 +1263,22 @@
<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="533">
- <caret line="97" column="25" lean-forward="false" selection-start-line="97" selection-start-column="25" selection-end-line="97" selection-end-column="25" />
+ <caret line="97" column="2" lean-forward="false" selection-start-line="97" selection-start-column="2" selection-end-line="97" selection-end-column="2" />
<folding>
<element signature="imports" expanded="true" />
- <marker date="1510018984000" expanded="false" signature="5505:5523" ph="<~>" />
+ <marker date="1510019181000" expanded="false" signature="5505:5523" ph="<~>" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/spring/rabbitmq.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="495">
+ <caret line="33" column="93" lean-forward="false" selection-start-line="33" selection-start-column="93" selection-end-line="33" selection-end-column="93" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index 4f7c552..b269e0a 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -94,8 +94,8 @@
// System.out.println(message);
// System.out.println(JSON.toJSONString(msgData));
-// rabbitTemplate.convertAndSend("monitors_data2", "", JSON.toJSONString(msgData).getBytes());
- rabbitTemplate.send("monitors_data2", "", new Message(JSON.toJSONString(msgData).getBytes(), new MessageProperties()));
+ rabbitTemplate.convertAndSend("monitors_data2", "", JSON.toJSONString(msgData).getBytes());
+// rabbitTemplate.send("monitors_data2", "", new Message(JSON.toJSONString(msgData).getBytes(), new MessageProperties()));
// int state = (new Random()).nextInt(4) % 5; //TODO
int state = detEquState(msgData);
diff --git a/src/main/resources/spring/rabbitmq.xml b/src/main/resources/spring/rabbitmq.xml
index 9836b64..6d411da 100644
--- a/src/main/resources/spring/rabbitmq.xml
+++ b/src/main/resources/spring/rabbitmq.xml
@@ -27,11 +27,11 @@
</rabbit:bindings>
</rabbit:fanout-exchange>
- <rabbit:queue name="devices_storage_data" durable="false" auto-delete="true" exclusive="false"/>
+ <rabbit:queue name="devices_storage_data" durable="false" auto-delete="true" exclusive="true"/>
<bean id="amqpMsgListener" class="com.moral.monitor.listener.TaskListener"/>
- <rabbit:listener-container connection-factory="rabbitConnectionFactory" acknowledge="none" >
+ <rabbit:listener-container connection-factory="rabbitConnectionFactory" acknowledge="auto" >
<rabbit:listener queues="devices_storage_data" ref="amqpMsgListener" />
</rabbit:listener-container>
--
Gitblit v1.8.0