task.git - Gitblit

parent: 052c104c | patch | commit | ignore whitespace

沈斌

2017-10-29 dcf702f19d816a427ff4bcb2c500251fef8cba3b

代码更新

3 files modified

	.idea/workspace.xml	391 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/moral/monitor/listener/TaskListener.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/rabbitmq.xml	30 ●●●●● patch \| view \| raw \| blame \| history

 .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="数据库更新数据">
    <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/controller/Dashboard.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java" />
      <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/mapper/JobDao.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" afterPath="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" />
    </list>
    <ignored path="$PROJECT_DIR$/out/" />
    <ignored path="$PROJECT_DIR$/target/" />
@@ -24,83 +21,22 @@
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
    <leaf>
      <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="308">
              <caret line="101" column="39" lean-forward="false" selection-start-line="101" selection-start-column="39" selection-end-line="101" selection-end-column="39" />
              <folding>
                <element signature="imports" expanded="true" />
                <element signature="e#3225#3234#0" expanded="true" />
                <element signature="e#4082#4097#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="History.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/History.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="270">
              <caret line="18" column="28" lean-forward="false" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
              <folding>
                <element signature="e#297#298#0" expanded="true" />
                <element signature="e#334#335#0" expanded="true" />
                <element signature="e#362#363#0" expanded="true" />
                <element signature="e#392#393#0" expanded="true" />
                <element signature="e#418#419#0" expanded="true" />
                <element signature="e#456#457#0" expanded="true" />
                <element signature="e#486#487#0" expanded="true" />
                <element signature="e#519#520#0" expanded="true" />
                <element signature="e#548#549#0" expanded="true" />
                <element signature="e#592#593#0" expanded="true" />
                <element signature="e#628#629#0" expanded="true" />
                <element signature="e#662#663#0" expanded="true" />
                <element signature="e#692#693#0" expanded="true" />
                <element signature="e#738#739#0" expanded="true" />
                <element signature="e#776#777#0" expanded="true" />
                <element signature="e#812#813#0" expanded="true" />
                <element signature="e#844#845#0" expanded="true" />
                <element signature="e#894#895#0" expanded="true" />
                <element signature="e#936#937#0" expanded="true" />
                <element signature="e#965#966#0" expanded="true" />
                <element signature="e#992#993#0" expanded="true" />
                <element signature="e#1030#1031#0" expanded="true" />
                <element signature="e#1062#1063#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="Dashboard.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="165">
              <caret line="359" column="33" lean-forward="true" selection-start-line="359" selection-start-column="33" selection-end-line="359" selection-end-column="33" />
            <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" />
              <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">
      <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="372">
              <caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
              <folding>
                <marker date="1509091122000" expanded="true" signature="504:736" ph="select c.mac... equipment" />
                <marker date="1509091122000" expanded="true" signature="795:841" ph="UPDATE equip... " />
              </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="165">
              <caret line="15" column="33" lean-forward="false" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="33" />
            <state relative-caret-position="147">
              <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
              <folding />
            </state>
          </provider>
@@ -167,15 +103,15 @@
        <option value="$PROJECT_DIR$/pom.xml" />
        <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/Test.java" />
        <option value="$PROJECT_DIR$/src/test/java/Test.java" />
        <option value="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" />
        <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/moral/monitor/dao/JobDao.java" />
        <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/java/com/moral/monitor/listener/TaskListener.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" />
      </list>
    </option>
  </component>
@@ -193,9 +129,9 @@
    <option name="CUSTOM_FILTER" />
  </component>
  <component name="ProjectFrameBounds" extendedState="6">
    <option name="x" value="-1619" />
    <option name="y" value="214" />
    <option name="width" value="1404" />
    <option name="x" value="682" />
    <option name="y" value="30" />
    <option name="width" value="1402" />
    <option name="height" value="877" />
  </component>
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -221,58 +157,14 @@
              <item name="task" type="b2602c69:ProjectViewProjectNode" />
              <item name="task" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="task" type="b2602c69:ProjectViewProjectNode" />
              <item name="task" type="462c0819:PsiDirectoryNode" />
              <item name="src" 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" />
            </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" />
            </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="java" type="462c0819:PsiDirectoryNode" />
              <item name="monitor" type="462c0819:PsiDirectoryNode" />
              <item name="controller" 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" />
              <item name="listener" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
      <pane id="Scratches" />
      <pane id="AndroidView" />
      <pane id="Scope" />
      <pane id="PackagesPane" />
      <pane id="Scratches" />
      <pane id="Scope" />
      <pane id="AndroidView" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -507,7 +399,9 @@
      <workItem from="1509030446574" duration="3006000" />
      <workItem from="1509056858319" duration="2984000" />
      <workItem from="1509068025499" duration="9340000" />
      <workItem from="1509085973276" duration="4377000" />
      <workItem from="1509085973276" duration="5136000" />
      <workItem from="1509095479339" duration="556000" />
      <workItem from="1509260666213" duration="2978000" />
    </task>
    <task id="LOCAL-00001" summary="updates">
      <created>1508484578874</created>
@@ -656,14 +550,21 @@
      <option name="project" value="LOCAL" />
      <updated>1509088852950</updated>
    </task>
    <option name="localTasksCounter" value="22" />
    <task id="LOCAL-00022" summary="批量更新，提升性能">
      <created>1509091232558</created>
      <option name="number" value="00022" />
      <option name="presentableId" value="LOCAL-00022" />
      <option name="project" value="LOCAL" />
      <updated>1509091232558</updated>
    </task>
    <option name="localTasksCounter" value="23" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="66781000" />
    <option name="totallyTimeSpent" value="71074000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="-1920" y="23" width="1920" height="1057" extended-state="6" />
    <frame x="3" y="23" width="1402" 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.7378517" sideWeight="0.51468426" order="8" side_tool="true" content_ui="tabs" />
@@ -672,7 +573,7 @@
      <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="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.2496329" sideWeight="0.5" order="1" 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="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" />
@@ -682,11 +583,11 @@
      <window_info id="Image Layers" 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="7" side_tool="false" content_ui="tabs" />
      <window_info id="Java Enterprise" 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="13" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Analysis" 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="6" side_tool="false" content_ui="tabs" />
      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.6912682" sideWeight="0.4853157" 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.32992327" sideWeight="0.48237884" 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="true" show_stripe_button="true" weight="0.60358053" sideWeight="0.4853157" order="3" 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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14589989" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22132353" 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="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" />
@@ -750,7 +651,8 @@
    <MESSAGE value="RabbitMQ &amp; Redis 操作" />
    <MESSAGE value="页面测试" />
    <MESSAGE value="数据库更新数据" />
    <option name="LAST_COMMIT_MESSAGE" value="数据库更新数据" />
    <MESSAGE value="批量更新，提升性能" />
    <option name="LAST_COMMIT_MESSAGE" value="批量更新，提升性能" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
@@ -759,20 +661,6 @@
    <watches-manager />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/LoginFilter.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="120">
          <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/JsonData.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="135">
          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/log4j.properties">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="0">
@@ -784,7 +672,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="60">
          <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -967,7 +854,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="173">
          <caret line="211" column="6" lean-forward="false" selection-start-line="211" selection-start-column="6" selection-end-line="211" selection-end-column="6" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -976,7 +862,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="75">
          <caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -984,7 +869,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="261">
          <caret line="203" column="38" lean-forward="false" selection-start-line="203" selection-start-column="38" selection-end-line="203" selection-end-column="38" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -1013,27 +897,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="164">
          <caret line="39" column="13" lean-forward="true" selection-start-line="37" selection-start-column="4" selection-end-line="39" selection-end-column="13" />
          <folding>
            <marker date="1507622125000" expanded="true" signature="339:380" ph="select * fro... equipment" />
            <marker date="1507622125000" expanded="true" signature="449:562" ph="UPDATE equip... " />
            <marker date="1507622125000" expanded="true" signature="627:769" ph="INSERT INTO equipment... " />
            <marker date="1507622125000" expanded="true" signature="908:969" ph="SELECT * fro... user" />
            <marker date="1507622125000" expanded="true" signature="1107:1162" ph="SELECT * fro... user" />
            <marker date="1507622125000" expanded="true" signature="1224:1271" ph="UPDATE `user... " />
            <marker date="1507622125000" expanded="true" signature="1430:1473" ph="select * fro... user" />
            <marker date="1507622125000" expanded="true" signature="1550:1596" ph="UPDATE `user... " />
            <marker date="1507622125000" expanded="true" signature="1745:1807" ph="select * fro... equipment" />
            <marker date="1507622125000" expanded="true" signature="2793:2831" ph="select * fro... equipment" />
            <marker date="1507622125000" expanded="true" signature="2958:2991" ph="select * fro... user" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="345">
          <caret line="23" column="50" lean-forward="false" selection-start-line="23" selection-start-column="50" selection-end-line="23" selection-end-column="50" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -1041,7 +904,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="75">
          <caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -1049,47 +911,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="360">
          <caret line="24" column="28" lean-forward="false" selection-start-line="24" selection-start-column="28" selection-end-line="24" selection-end-column="28" />
          <folding>
            <element signature="e#385#386#0" expanded="true" />
            <element signature="e#422#423#0" expanded="true" />
            <element signature="e#450#451#0" expanded="true" />
            <element signature="e#481#482#0" expanded="true" />
            <element signature="e#508#509#0" expanded="true" />
            <element signature="e#548#549#0" expanded="true" />
            <element signature="e#580#581#0" expanded="true" />
            <element signature="e#613#614#0" expanded="true" />
            <element signature="e#642#643#0" expanded="true" />
            <element signature="e#686#687#0" expanded="true" />
            <element signature="e#722#723#0" expanded="true" />
            <element signature="e#760#761#0" expanded="true" />
            <element signature="e#794#795#0" expanded="true" />
            <element signature="e#848#849#0" expanded="true" />
            <element signature="e#894#895#0" expanded="true" />
            <element signature="e#928#929#0" expanded="true" />
            <element signature="e#958#959#0" expanded="true" />
            <element signature="e#1004#1005#0" expanded="true" />
            <element signature="e#1042#1043#0" expanded="true" />
            <element signature="e#1074#1075#0" expanded="true" />
            <element signature="e#1102#1103#0" expanded="true" />
            <element signature="e#1144#1145#0" expanded="true" />
            <element signature="e#1178#1179#0" expanded="true" />
            <element signature="e#1210#1211#0" expanded="true" />
            <element signature="e#1238#1239#0" expanded="true" />
            <element signature="e#1280#1281#0" expanded="true" />
            <element signature="e#1314#1315#0" expanded="true" />
            <element signature="e#1346#1347#0" expanded="true" />
            <element signature="e#1374#1375#0" expanded="true" />
            <element signature="e#1416#1417#0" expanded="true" />
            <element signature="e#1450#1451#0" expanded="true" />
            <element signature="e#1483#1484#0" expanded="true" />
            <element signature="e#1511#1512#0" expanded="true" />
            <element signature="e#1554#1555#0" expanded="true" />
            <element signature="e#1588#1589#0" expanded="true" />
            <element signature="e#1618#1619#0" expanded="true" />
            <element signature="e#1644#1645#0" expanded="true" />
            <element signature="e#1682#1683#0" expanded="true" />
            <element signature="e#1712#1713#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
@@ -1097,35 +918,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="60">
          <caret line="4" column="30" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="30" />
          <folding>
            <marker date="1507622125000" expanded="true" signature="241:300" ph="insert into logger... " />
            <marker date="1507622125000" expanded="true" signature="356:450" ph="insert into history... " />
            <marker date="1507622125000" expanded="true" signature="552:603" ph="select * fro... state" />
            <marker date="1507622125000" expanded="true" signature="675:736" ph="DELETE FROM " />
            <marker date="1507622125000" expanded="true" signature="838:934" ph="insert into state... " />
            <marker date="1507622125000" expanded="true" signature="1031:1105" ph="update state... " />
            <marker date="1507622125000" expanded="true" signature="1218:1628" ph="select mac.*... mac" />
            <marker date="1507622125000" expanded="true" signature="1756:2026" ph="select user.... notice" />
            <marker date="1507622125000" expanded="true" signature="2158:2195" ph="select * fro... sensor" />
            <marker date="1507622125000" expanded="true" signature="2328:2368" ph="select * fro... equipment" />
            <marker date="1507622125000" expanded="true" signature="2428:2621" ph="insert into alarmlog... " />
            <marker date="1507622125000" expanded="true" signature="2681:2902" ph="insert into noticelog... " />
            <marker date="1507622125000" expanded="true" signature="2965:3011" ph="update equip... " />
            <marker date="1507622125000" expanded="true" signature="3142:3216" ph="select * fro... alarmlog" />
            <marker date="1507622125000" expanded="true" signature="3327:3360" ph="SELECT * fro... state" />
            <marker date="1507622125000" expanded="true" signature="3449:3511" ph="select logge... logger" />
            <marker date="1507622125000" expanded="true" signature="3638:3737" ph="SELECT * fro... noticelog" />
            <marker date="1507622125000" expanded="true" signature="3799:3907" ph="insert into offlinelog... " />
            <marker date="1507622125000" expanded="true" signature="4041:4075" ph="select * fro... mac" />
            <marker date="1507622125000" expanded="true" signature="4195:4297" ph="select * fro... alarmlog" />
            <marker date="1507622125000" expanded="true" signature="4379:4444" ph="update alarm... " />
            <marker date="1507622125000" expanded="true" signature="4558:4624" ph="select * fro... noticelog" />
            <marker date="1507622125000" expanded="true" signature="4744:4778" ph="select * fro... user" />
            <marker date="1507622125000" expanded="true" signature="4861:4914" ph="UPDATE notic... " />
            <marker date="1507622125000" expanded="true" signature="5070:5107" ph="SELECT * fro... state" />
            <marker date="1507622125000" expanded="true" signature="5227:5261" ph="select * fro... mac" />
            <marker date="1507622125000" expanded="true" signature="5364:5386" ph="select * fro... critical" />
          </folding>
        </state>
      </provider>
    </entry>
@@ -1133,7 +925,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="164">
          <caret line="26" column="21" lean-forward="true" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -1141,10 +932,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="289">
          <caret line="137" column="5" lean-forward="true" selection-start-line="133" selection-start-column="4" selection-end-line="137" selection-end-column="5" />
          <folding>
            <element signature="imports" expanded="true" />
            <element signature="e#2778#2796#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
@@ -1152,34 +939,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="410">
          <caret line="260" column="48" lean-forward="false" selection-start-line="260" selection-start-column="48" selection-end-line="260" selection-end-column="48" />
          <folding />
        </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="165">
          <caret line="15" column="33" lean-forward="false" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="33" />
          <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="372">
          <caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
          <folding>
            <marker date="1509091122000" expanded="true" signature="504:736" ph="select c.mac... equipment" />
            <marker date="1509091122000" expanded="true" signature="795:841" ph="UPDATE equip... " />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="165">
          <caret line="359" column="33" lean-forward="true" selection-start-line="359" selection-start-column="33" selection-end-line="359" selection-end-column="33" />
          <folding />
        </state>
      </provider>
    </entry>
@@ -1187,43 +946,59 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="270">
          <caret line="18" column="28" lean-forward="false" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
          <folding>
            <element signature="e#297#298#0" expanded="true" />
            <element signature="e#334#335#0" expanded="true" />
            <element signature="e#362#363#0" expanded="true" />
            <element signature="e#392#393#0" expanded="true" />
            <element signature="e#418#419#0" expanded="true" />
            <element signature="e#456#457#0" expanded="true" />
            <element signature="e#486#487#0" expanded="true" />
            <element signature="e#519#520#0" expanded="true" />
            <element signature="e#548#549#0" expanded="true" />
            <element signature="e#592#593#0" expanded="true" />
            <element signature="e#628#629#0" expanded="true" />
            <element signature="e#662#663#0" expanded="true" />
            <element signature="e#692#693#0" expanded="true" />
            <element signature="e#738#739#0" expanded="true" />
            <element signature="e#776#777#0" expanded="true" />
            <element signature="e#812#813#0" expanded="true" />
            <element signature="e#844#845#0" expanded="true" />
            <element signature="e#894#895#0" expanded="true" />
            <element signature="e#936#937#0" expanded="true" />
            <element signature="e#965#966#0" expanded="true" />
            <element signature="e#992#993#0" expanded="true" />
            <element signature="e#1030#1031#0" expanded="true" />
            <element signature="e#1062#1063#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/Dashboard.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="165">
          <caret line="359" column="33" lean-forward="true" selection-start-line="359" selection-start-column="33" selection-end-line="359" selection-end-column="33" />
        </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="372">
          <caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
        </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="165">
          <caret line="15" column="33" lean-forward="false" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="33" />
        </state>
      </provider>
    </entry>
    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/src.zip!/java/lang/String.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="311">
          <caret line="110" column="19" lean-forward="false" selection-start-line="110" selection-start-column="19" selection-end-line="110" selection-end-column="19" />
          <folding />
        </state>
      </provider>
    </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="424" column="32" lean-forward="false" selection-start-line="424" selection-start-column="32" selection-end-line="424" selection-end-column="32" />
          <folding />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/rabbitmq.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="147">
          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
          <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="308">
          <caret line="101" column="39" lean-forward="false" selection-start-line="101" selection-start-column="39" selection-end-line="101" selection-end-column="39" />
          <folding>
            <element signature="imports" expanded="true" />
            <element signature="e#3225#3234#0" expanded="true" />
            <element signature="e#4082#4097#0" expanded="true" />
          </folding>
        <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" />
          <folding />
        </state>
      </provider>
    </entry>

 src/main/java/com/moral/monitor/listener/TaskListener.java

@@ -75,7 +75,7 @@
//        System.out.println(message);
//        System.out.println(JSON.toJSONString(msgData));

//        rabbitTemplate.convertAndSend("monitors_data", "", JSON.toJSONString(msgData).getBytes());
        rabbitTemplate.convertAndSend("monitors_data2", "", JSON.toJSONString(msgData).getBytes());
//        rabbitTemplate.send("monitors_data_3", "", new Message(JSON.toJSONString(msgData).getBytes(), new MessageProperties()));

        int state = (new Random()).nextInt(4) % 5; //TODO

 src/main/resources/rabbitmq.xml

@@ -21,34 +21,32 @@
        <constructor-arg ref="rabbitConnectionFactory"></constructor-arg>

    </bean>



    <rabbit:queue  name="monitors_storage_data" durable="false" exclusive="false" auto-delete="true"/>

    <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>



    <!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.MonitorListener"/>-->

    <!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.Listener"/>-->

    <rabbit:queue name="devices_storage_data" durable="true" auto-delete="false" exclusive="false"/>



    <bean id="amqpMsgListener" class="com.moral.monitor.listener.TaskListener"/>



    <rabbit:listener-container connection-factory="rabbitConnectionFactory" acknowledge="auto" >

        <rabbit:listener  queues="monitors_storage_data" ref="amqpMsgListener" />

        <rabbit:listener  queues="devices_storage_data" ref="amqpMsgListener" />

    </rabbit:listener-container>



    <!--<rabbit:queue name="monitors_storage_data_2" durable="true" auto-delete="false" exclusive="false" />-->

    <rabbit:fanout-exchange name="monitors_data2" durable="true" auto-delete="true">

        <rabbit:bindings>

            <rabbit:binding queue="monitors_storage_data2"></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>-->

    <rabbit:queue name="monitors_storage_data2" durable="true" auto-delete="true" exclusive="false" />



    <!--http://blog.csdn.net/u012204058/article/details/54292888-->

    <!--http://blog.csdn.net/itmrchen/article/details/53285648-->



    <!--<rabbit:queue name="monitors_storage_alarm" durable="true" auto-delete="false" exclusive="false" />-->



    <!--<rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false">-->

        <!--<rabbit:bindings>-->

            <!--<rabbit:binding queue="monitors_storage_alarm"></rabbit:binding>-->

        <!--</rabbit:bindings>-->

    <!--</rabbit:fanout-exchange>-->



    <!--<rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false" />-->

</beans>

			@@ -75,7 +75,7 @@
			// System.out.println(message);
			// System.out.println(JSON.toJSONString(msgData));

			// rabbitTemplate.convertAndSend("monitors_data", "", JSON.toJSONString(msgData).getBytes());
			rabbitTemplate.convertAndSend("monitors_data2", "", JSON.toJSONString(msgData).getBytes());
			// rabbitTemplate.send("monitors_data_3", "", new Message(JSON.toJSONString(msgData).getBytes(), new MessageProperties()));

			int state = (new Random()).nextInt(4) % 5; //TODO

			@@ -21,34 +21,32 @@
			<constructor-arg ref="rabbitConnectionFactory"></constructor-arg>
			</bean>

			<rabbit:queue name="monitors_storage_data" durable="false" exclusive="false" auto-delete="true"/>
			<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>

			<!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.MonitorListener"/>-->
			<!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.Listener"/>-->
			<rabbit:queue name="devices_storage_data" durable="true" auto-delete="false" exclusive="false"/>

			<bean id="amqpMsgListener" class="com.moral.monitor.listener.TaskListener"/>

			<rabbit:listener-container connection-factory="rabbitConnectionFactory" acknowledge="auto" >
			<rabbit:listener queues="monitors_storage_data" ref="amqpMsgListener" />
			<rabbit:listener queues="devices_storage_data" ref="amqpMsgListener" />
			</rabbit:listener-container>

			<!--<rabbit:queue name="monitors_storage_data_2" durable="true" auto-delete="false" exclusive="false" />-->
			<rabbit:fanout-exchange name="monitors_data2" durable="true" auto-delete="true">
			<rabbit:bindings>
			<rabbit:binding queue="monitors_storage_data2"></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>-->
			<rabbit:queue name="monitors_storage_data2" durable="true" auto-delete="true" exclusive="false" />

			<!--http://blog.csdn.net/u012204058/article/details/54292888-->
			<!--http://blog.csdn.net/itmrchen/article/details/53285648-->

			<!--<rabbit:queue name="monitors_storage_alarm" durable="true" auto-delete="false" exclusive="false" />-->

			<!--<rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false">-->
			<!--<rabbit:bindings>-->
			<!--<rabbit:binding queue="monitors_storage_alarm"></rabbit:binding>-->
			<!--</rabbit:bindings>-->
			<!--</rabbit:fanout-exchange>-->

			<!--<rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false" />-->
			</beans>