From 052c104cbc2ccc13d83cd912e3b2bbf12c0d56bc Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 16:00:32 +0800
Subject: [PATCH] 批量更新，提升性能
---
src/main/java/com/moral/monitor/controller/Dashboard.java | 2
src/main/java/com/moral/monitor/entity/History.java | 25 +-
.idea/workspace.xml | 357 ++++++++++++++++++++++++++-------------------------
src/main/resources/mapper/JobDao.xml | 18 ++
src/main/java/com/moral/monitor/dao/JobDao.java | 3
src/main/java/com/moral/monitor/listener/TaskListener.java | 11 +
6 files changed, 227 insertions(+), 189 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8bddd0c..37d3780 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,12 +6,13 @@
</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/entity/Sensor.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java" />
- <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$/src/main/java/com/moral/monitor/listener/MonitorListener.java" afterPath="$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/MonitorListener.java" />
+ <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" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -27,94 +28,56 @@
<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="15">
- <caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="51" selection-end-column="0" />
+ <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#3639#3654#0" 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="Sensor.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/entity/Sensor.java">
+ <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="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" />
+ <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#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#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#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#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#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" />
+ <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="Listener.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/listener/Listener.java">
+ <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="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>
- </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="388">
- <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>
- </file>
- <file leaf-file-name="TaskDao.java" pinned="false" current-in-tab="false">
- <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="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" />
+ <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>
@@ -123,59 +86,21 @@
<file leaf-file-name="JobDao.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/JobDao.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="360">
- <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+ <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="1509088442000" expanded="true" signature="504:736" ph="select c.mac... equipment" />
- <marker date="1509088442000" expanded="true" signature="795:841" ph="UPDATE equip... " />
+ <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="TaskDao.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/TaskDao.xml">
+ <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="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>
- </file>
- <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="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" />
+ <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>
@@ -207,8 +132,8 @@
<find>updateequipmentstate</find>
<find>insertTostate</find>
<find>selectFromsensorByver</find>
- <find>logger</find>
<find>insertTologger</find>
+ <find>logger</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -242,13 +167,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/java/com/moral/monitor/dao/JobDao.java" />
<option value="$PROJECT_DIR$/src/main/resources/rabbitmq.xml" />
- <option value="$PROJECT_DIR$/src/main/resources/mapper/JobDao.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" />
</list>
</option>
</component>
@@ -265,8 +192,9 @@
<option name="FILTER_DEBUG" value="true" />
<option name="CUSTOM_FILTER" />
</component>
- <component name="ProjectFrameBounds">
- <option name="y" value="23" />
+ <component name="ProjectFrameBounds" extendedState="6">
+ <option name="x" value="-1619" />
+ <option name="y" value="214" />
<option name="width" value="1404" />
<option name="height" value="877" />
</component>
@@ -292,6 +220,50 @@
<path>
<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 />
@@ -535,7 +507,7 @@
<workItem from="1509030446574" duration="3006000" />
<workItem from="1509056858319" duration="2984000" />
<workItem from="1509068025499" duration="9340000" />
- <workItem from="1509085973276" duration="2841000" />
+ <workItem from="1509085973276" duration="4377000" />
</task>
<task id="LOCAL-00001" summary="updates">
<created>1508484578874</created>
@@ -677,14 +649,21 @@
<option name="project" value="LOCAL" />
<updated>1509084804781</updated>
</task>
- <option name="localTasksCounter" value="21" />
+ <task id="LOCAL-00021" summary="���������������������">
+ <created>1509088852950</created>
+ <option name="number" value="00021" />
+ <option name="presentableId" value="LOCAL-00021" />
+ <option name="project" value="LOCAL" />
+ <updated>1509088852950</updated>
+ </task>
+ <option name="localTasksCounter" value="22" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="65245000" />
+ <option name="totallyTimeSpent" value="66781000" />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="23" width="1404" height="877" extended-state="0" />
+ <frame x="-1920" y="23" width="1920" height="1057" 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" />
@@ -703,11 +682,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="false" show_stripe_button="true" weight="0.3375959" sideWeight="0.4853157" order="3" 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="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.20117474" 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.14589989" 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" />
@@ -780,13 +759,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/util/DateConvert.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
- </state>
- </provider>
- </entry>
<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">
@@ -933,13 +905,6 @@
</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="135">
- <caret line="22" column="24" lean-forward="true" selection-start-line="22" selection-start-column="24" selection-end-line="22" selection-end-column="24" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/moral/monitor/controller/EquController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="61">
@@ -1044,13 +1009,6 @@
</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="135">
- <caret line="12" column="32" lean-forward="false" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ApiDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
@@ -1135,14 +1093,6 @@
</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="388">
- <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/resources/mapper/TaskDao.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
@@ -1179,17 +1129,6 @@
</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="360">
- <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
- <folding>
- <marker date="1509088442000" expanded="true" signature="504:736" ph="select c.mac... equipment" />
- <marker date="1509088442000" expanded="true" signature="795:841" ph="UPDATE equip... " />
- </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="164">
@@ -1209,13 +1148,81 @@
</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="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>
+ <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>
<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="15">
- <caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="51" selection-end-column="0" />
+ <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#3639#3654#0" expanded="true" />
+ <element signature="e#3225#3234#0" expanded="true" />
+ <element signature="e#4082#4097#0" expanded="true" />
</folding>
</state>
</provider>
diff --git a/src/main/java/com/moral/monitor/controller/Dashboard.java b/src/main/java/com/moral/monitor/controller/Dashboard.java
index 024b9e6..eff59a3 100644
--- a/src/main/java/com/moral/monitor/controller/Dashboard.java
+++ b/src/main/java/com/moral/monitor/controller/Dashboard.java
@@ -357,7 +357,7 @@
for (History a:historys){
String format = sdf.format(a.getTime());
xtime.add(format);
- yvalue.add(a.getMacValue());
+ yvalue.add(a.getMac_value());
}
s.put("xtime",xtime);
s.put("yvalue",yvalue);
diff --git a/src/main/java/com/moral/monitor/dao/JobDao.java b/src/main/java/com/moral/monitor/dao/JobDao.java
index 176ba04..9dda52c 100644
--- a/src/main/java/com/moral/monitor/dao/JobDao.java
+++ b/src/main/java/com/moral/monitor/dao/JobDao.java
@@ -1,5 +1,6 @@
package com.moral.monitor.dao;
+import com.moral.monitor.entity.History;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -11,4 +12,6 @@
public List<Map<String, String>> findAdjustByMac(String mac);
public void updateStateByMac(String mac, int state);
+
+ public int batchInsertHistory(List<History> historyList);
}
diff --git a/src/main/java/com/moral/monitor/entity/History.java b/src/main/java/com/moral/monitor/entity/History.java
index b0ae9d5..4b8af56 100644
--- a/src/main/java/com/moral/monitor/entity/History.java
+++ b/src/main/java/com/moral/monitor/entity/History.java
@@ -3,15 +3,16 @@
import java.util.Date;
public class History {
+
private Integer id;
private String mac;
private String sensor;
- private String macKey;
+ private String mac_key;
- private Double macValue;
+ private Double mac_value;
private Date time;
@@ -28,7 +29,7 @@
}
public void setMac(String mac) {
- this.mac = mac == null ? null : mac.trim();
+ this.mac = mac;
}
public String getSensor() {
@@ -36,23 +37,23 @@
}
public void setSensor(String sensor) {
- this.sensor = sensor == null ? null : sensor.trim();
+ this.sensor = sensor;
}
- public String getMacKey() {
- return macKey;
+ public String getMac_key() {
+ return mac_key;
}
- public void setMacKey(String macKey) {
- this.macKey = macKey == null ? null : macKey.trim();
+ public void setMac_key(String mac_key) {
+ this.mac_key = mac_key;
}
- public Double getMacValue() {
- return macValue;
+ public Double getMac_value() {
+ return mac_value;
}
- public void setMacValue(Double macValue) {
- this.macValue = macValue;
+ public void setMac_value(Double mac_value) {
+ this.mac_value = mac_value;
}
public Date getTime() {
diff --git a/src/main/java/com/moral/monitor/listener/TaskListener.java b/src/main/java/com/moral/monitor/listener/TaskListener.java
index 046f0c0..35a1ea3 100644
--- a/src/main/java/com/moral/monitor/listener/TaskListener.java
+++ b/src/main/java/com/moral/monitor/listener/TaskListener.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.TypeReference;
import com.moral.monitor.dao.JobDao;
import com.moral.monitor.dao.TaskDao;
+import com.moral.monitor.entity.History;
import com.moral.monitor.entity.Sensor;
import com.moral.monitor.util.RedisUtil;
import org.slf4j.Logger;
@@ -87,13 +88,21 @@
taskDao.insertTologger(mac, message, getDate());
//������������������
+ List<History> histories = new ArrayList<History>();
List<Sensor> sensorList = taskDao.selectFromsensorByver(ver);
for (Sensor sensor : sensorList) {
String key = sensor.getMac_key();
if(msgData.containsKey(key)) {
- taskDao.insertTohistory(mac, sensor.getSensor(), key, msgData.get(key));
+ //taskDao.insertTohistory(mac, sensor.getSensor(), key, msgData.get(key));
+ History history = new History();
+ history.setMac(mac);
+ history.setMac_key(key);
+ history.setSensor(sensor.getSensor());
+ history.setMac_value(Double.valueOf(msgData.get(key)));
+ histories.add(history);
}
}
+ jobDao.batchInsertHistory(histories);
}
private Map<String, Float> getAdjustData(String mac) {
diff --git a/src/main/resources/mapper/JobDao.xml b/src/main/resources/mapper/JobDao.xml
index 9bd84af..a2ff267 100644
--- a/src/main/resources/mapper/JobDao.xml
+++ b/src/main/resources/mapper/JobDao.xml
@@ -23,4 +23,22 @@
UPDATE equipment SET state=#{1} WHERE mac=#{0}
</update>
+ <insert id="batchInsertHistory" parameterType="java.util.List" >
+ <selectKey resultType ="java.lang.Integer" keyProperty="id" order="AFTER">
+ SELECT LAST_INSERT_ID()
+ </selectKey >
+ insert into history
+ (mac, sensor, mac_key, mac_value, time)
+ values
+ <foreach collection="list" item="item" index="index" separator=",">
+ (
+ #{item.mac},
+ #{item.sensor},
+ #{item.mac_key},
+ #{item.mac_value},
+ #{item.time}
+ )
+ </foreach>
+ </insert>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0